From e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 16:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/operation/device-maintenance/device-maintenance.component.ts | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/operation/device-maintenance/device-maintenance.component.ts b/src/app/routes/operation/device-maintenance/device-maintenance.component.ts
index e4b58d0..96e1fff 100644
--- a/src/app/routes/operation/device-maintenance/device-maintenance.component.ts
+++ b/src/app/routes/operation/device-maintenance/device-maintenance.component.ts
@@ -7,8 +7,8 @@
import { Component, OnInit, ElementRef, ViewChild } from '@angular/core';
import { SimpleTableColumn, SimpleTableComponent } from '@delon/abc';
import { Subject } from 'rxjs/Subject';
-import { CoordinatesPickerComponent } from 'app/routes/map/coordinates-picker/coordinates-picker.component';
-import { CoorPickerService } from 'app/routes/map/coordinates-picker/coordinates-picker.service';
+import { CoordinatesPickerComponent } from '../../map/coordinates-picker/coordinates-picker.component';
+import { CoorPickerService } from '../../map/coordinates-picker/coordinates-picker.service';
import { OrganizationService } from '@business/services/http/organization.service';
import { ExampleService, Criteria } from '@business/services/util/example.service';
import { AdjustConfigComponent } from '../../devices/basic-info/adjust-config/adjust-config.component';
@@ -22,7 +22,7 @@
columns: SimpleTableColumn[] = [
{ title: '������', index: 'id', type: 'checkbox' },
{ title: '������', index: 'name' },
- { title: 'mac', index: 'mac' },
+ { title: 'sim', index: 'mac' },
{ title: '������', index: 'deviceVersion.name' },
{ title: '������������', index: 'monitorPoint.name' },
{ title: '���������', index: 'operateUser.name' },
@@ -39,7 +39,7 @@
{
text: '������',
type: 'del',
- click: (record: any) => this.delete(record.id)
+ click: (record: any) => this.addOrModify(record.id)
},
{
text: '������',
--
Gitblit v1.8.0