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 | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 1 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 9ada8ef..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,4 +1,18 @@ +import { AreaNames, MonitorPoint } from '@business/entity/data'; +import { Version, ValueTransformer } from '@angular/compiler/src/util'; +import { Subject } from 'rxjs/Subject'; 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 { 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 '@business/services/http/monitor-point.service'; + @Component({ selector: 'app-monitor-point', @@ -7,9 +21,157 @@ }) export class MonitorPointComponent implements OnInit { - constructor() { } + + private monitorPoint: MonitorPoint; + grid: Grid<MonitorPoint> = new Grid(null); + queryMap = { text: '���������������', value: ''}; + queryTextStream: Subject<string> = new Subject<string>(); + private initPage() { + this.monitorPoint = { + name: { + text: '������', + 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.monitorPoint); + this.grid.pageSize = 10; + } + constructor( + private monitorPointService: MonitorPointService, + + private confirmServ: NzModalService, + public msgSrv: NzMessageService, + private modalHelper: ModalHelper, + ) {} ngOnInit() { + this.initPage(); + this.queryTextStream + .debounceTime(500) + .distinctUntilChanged() + .subscribe(queryText => { + this.load(); + }); + } + queryTextChanged($event) { + this.queryTextStream.next(this.queryMap.value); + } + load(reload: boolean = false) { + if (reload) { + this.grid.pageIndex = 1 ; + } + // ������������������ExpressionChangedAfterItHasBeenCheckedError + setTimeout(() => { + this.grid.loading = true; + }, 1); + this.monitorPointService.getPagingList(this.grid, this.queryMap.value).subscribe( + (res: PageBean) => { + this.grid.loading = true; + if (res != null && res.data != null) { + this.grid.initData(res); + this.grid.refreshStatus(); + setTimeout(() => { + this.grid.loading = false; + }, 1); + } + } + ); } +// rowData���null��������������� + addOrModify(d) { + const data = {}; + if ( d != null) { + Object.assign(data, d); + } + 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.data[index]; + const isModified = Object.keys(origData).some( + (key: string) => { + return ret.data[key] !== origData[key]; + } + ); + // ������������ + if (!isModified) { + ret.close(); + this.msgSrv.success(this.grid.title + '���������������������'); + return; + } + } + this.monitorPointService.save(ret.data).subscribe( + ( res: any) => { + if (res.code === 1) { + this.load(); + ret.close(); + this.msgSrv.success(this.grid.title + '���������������'); + } + } + ); + }); + } + + delete(...id: number[]) { + this.monitorPointService.delete( ...id ).subscribe( + ( res: any) => { + if (res.code === 1) { + this.load(); + this.msgSrv.success(this.grid.title + '���������������'); + } + } + ); + } + + deleteSelected() { + this.confirmServ.confirm({ + title: '������������', + content: '������������������������������������������������', + okText: '������', + cancelText: '������' + }).on('onOk', () => { + if (this.grid.selectedIndexs != null && this.grid.selectedIndexs.length > 0) { + const ids = this.grid.selectedIndexs.map( + (index: number) => { + const id = this.grid.data[index].id; + return Number.parseInt(id); + } + ); + this.delete( ...ids ); + } + }); + } + sort(field: string, value: string) { + // ������������field + this.grid.sorts = this.grid.sorts.filter( + (fn: string) => { + return fn !== field; + } + ); + // ������value������null������������������������������filed + if ( value != null ) { + this.grid.sorts.push(field); + } + this.load(); + } } -- Gitblit v1.8.0