From 936bb39145eee86530f61d3345f8125ddd778225 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 16:35:07 +0800
Subject: [PATCH] 冲突修正
---
src/app/routes/users/installer/installer.component.ts | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index f59a364..5d5bcd4 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -3,8 +3,8 @@
import {ModalHelper} from '@delon/theme';
import {HttpClient} from '@angular/common/http';
import {UserInstallerEditComponent} from './edit/edit.component';
-import {environment} from '../../../../environments/environment';
-import {DateService} from '../../../core/services/date.service';
+import {environment} from 'environments/environment';
+import {DateService} from '@business/services/util/date.service';
@Component({
selector: 'app-installer',
@@ -28,7 +28,7 @@
allChecked = false;
indeterminate = false;
sortMap: any = {};
- loading: boolean = true;
+ loading = true;
constructor(
public http: HttpClient,
@@ -87,7 +87,7 @@
checkAll(value: boolean) {
this.curRows.forEach(i => {
- if (i.isDelete == '1') {
+ if (i.isDelete === '1') {
i.checked = false;
} else {
i.checked = value;
--
Gitblit v1.8.0