From 3517e796f650b8aed52165c1a5905456f54033ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 10 Jan 2018 14:31:40 +0800
Subject: [PATCH] 项目路径 配置，以适应可能的框架更新
---
src/app/routes/devices/monitor-point/monitor-point.component.ts | 72 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/src/app/routes/devices/monitor-point/monitor-point.component.ts b/src/app/routes/devices/monitor-point/monitor-point.component.ts
index e1a6b84..db33f86 100644
--- a/src/app/routes/devices/monitor-point/monitor-point.component.ts
+++ b/src/app/routes/devices/monitor-point/monitor-point.component.ts
@@ -1,33 +1,19 @@
-import { DataType, AreaNames } from './../../../core/entity/grid';
+import { AreaNames, MonitorPoint } from '@business/entity/data';
import { Version, ValueTransformer } from '@angular/compiler/src/util';
import { Subject } from 'rxjs/Subject';
-import { ToolsService } from '@core/services/tools.service';
import { Component, OnInit } from '@angular/core';
import { NzMessageService, NzModalService } from 'ng-zorro-antd';
import { ModalHelper } from '@delon/theme';
import { HttpClient } from '@angular/common/http';
-import { environment } from '../../../../environments/environment';
-import { DateService } from '@core/services/date.service';
-import { VersionService } from 'app/routes/devices/version/version.service';
-import { Types } from '@core/enum/types.enum';
-import { Column, Grid, PageBean } from '@core/entity/grid';
+import { environment } from 'environments/environment';
+import { VersionService } from '@business/services/http/version.service';
+import { Types } from '@business/enum/types.enum';
+import { Column, Grid, PageBean, DataType } from '@business/entity/grid';
import { filter } from 'rxjs/operators/filter';
import { MonitorPointEditComponent } from 'app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component';
-import { MonitorPointService } from 'app/routes/devices/monitor-point/monitor-point.service';
+import { MonitorPointService } from '@business/services/http/monitor-point.service';
-interface MonitorPoint {
- address?: any|Column;
- areaCode?: any|Column;
- cityCode?: any|Column;
- description?: any|Column;
- id?: any|Column;
- isDelete?: any|Column;
- latitude?: any|Column;
- longitude?: any|Column;
- name?: any|Column;
- organizationId?: any|Column;
- provinceCode?: any|Column;
-}
+
@Component({
selector: 'app-monitor-point',
templateUrl: './monitor-point.component.html',
@@ -36,19 +22,36 @@
export class MonitorPointComponent implements OnInit {
- private organization: MonitorPoint;
+ private monitorPoint: MonitorPoint;
grid: Grid<MonitorPoint> = new Grid(null);
queryMap = { text: '���������������', value: ''};
queryTextStream: Subject<string> = new Subject<string>();
private initPage() {
- this.organization = {
+ this.monitorPoint = {
name: {
text: '������',
- width: '120px'
+ width: '300px'
+ },
+ address: {
+ text: '������',
+ width: '300px',
+ format: (value: any, col: Column, row: any) => {
+ value = value == null ? '' : value ;
+ if (row['areaNames'] != null) {
+ return row['areaNames']['provinceName'] + row['areaNames']['cityName'] + row['areaNames']['areaName'] + value;
+ } else {
+ return value;
+ }
+
+ }
+ },
+ description: {
+ text: '������',
+ width: '300px'
}
};
- this.grid.title = '������������';
- this.grid.setColumns(this.organization);
+ this.grid.title = '���������';
+ this.grid.setColumns(this.monitorPoint);
this.grid.pageSize = 10;
}
constructor(
@@ -99,13 +102,12 @@
if ( d != null) {
Object.assign(data, d);
}
- const cols = this.organization;
- this.modalHelper.static(MonitorPointEditComponent, { cols , data }).subscribe(
+ this.modalHelper.static(MonitorPointEditComponent, { data }).subscribe(
( ret: { data: any, close: Function} ) => {
// ������������
if (ret.data['index'] != null ) {
const index: number = ret.data['index'] ;
- const origData = this.grid.getData()[index];
+ const origData = this.grid.data[index];
const isModified = Object.keys(origData).some(
(key: string) => {
return ret.data[key] !== origData[key];
@@ -114,7 +116,7 @@
// ������������
if (!isModified) {
ret.close();
- this.msgSrv.success('���������������������������');
+ this.msgSrv.success(this.grid.title + '���������������������');
return;
}
}
@@ -123,7 +125,7 @@
if (res.code === 1) {
this.load();
ret.close();
- this.msgSrv.success('���������������������');
+ this.msgSrv.success(this.grid.title + '���������������');
}
}
);
@@ -135,7 +137,7 @@
( res: any) => {
if (res.code === 1) {
this.load();
- this.msgSrv.success('���������������������������');
+ this.msgSrv.success(this.grid.title + '���������������');
}
}
);
@@ -172,10 +174,4 @@
}
this.load();
}
-
- reset(ls: any[]) {
- for (const item of ls) item.value = false;
- this.load(true);
- }
-
}
--
Gitblit v1.8.0