From 36c5eeab117846d64aa632ca30ef7ac15ef20a27 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 19 Mar 2018 16:44:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/users/alarm-user/alarm-user.component.ts | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/users/alarm-user/alarm-user.component.ts b/src/app/routes/users/alarm-user/alarm-user.component.ts
index 1c0996f..c1342f7 100644
--- a/src/app/routes/users/alarm-user/alarm-user.component.ts
+++ b/src/app/routes/users/alarm-user/alarm-user.component.ts
@@ -3,7 +3,7 @@
import {ModalHelper} from '@delon/theme';
import {HttpClient} from '@angular/common/http';
import {environment} from '../../../../environments/environment';
-import {DateService} from '../../../core/services/date.service';
+import {DateService} from '@business/services/util/date.service';
import {AlarmUserEditComponent} from './alarm-user-edit/alarm-user-edit.component';
@Component({
@@ -30,7 +30,7 @@
allChecked = false;
indeterminate = false;
sortMap: string[] = [];
- loading: boolean = true;
+ loading = true;
constructor(
public http: HttpClient,
@@ -64,7 +64,7 @@
alarmUser = {};
}
this.modalHelper.static(AlarmUserEditComponent, {alarmUser}).subscribe((res: any) => {
- if (res.code == 0) {
+ if (res.code === 0) {
this.msgSrv.error(res.message);
} else {
this.msgSrv.success('���������������������');
@@ -101,7 +101,7 @@
checkAll(value: boolean) {
this.data.forEach(i => {
- if (i.isDelete == '1') {
+ if (i.isDelete === '1') {
i.checked = false;
} else {
i.checked = value;
@@ -129,7 +129,7 @@
if (value) {
this.sortMap.push(`${field} ${value}`);
}
- this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(",") : '';
+ this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(',') : '';
this.load(true);
}
--
Gitblit v1.8.0