From 565f5b26ee306966f0b4b9447b7a8f9b04a9fe00 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Fri, 15 Jun 2018 09:21:00 +0800 Subject: [PATCH] 改变暂存 --- src/app/routes/devices/monitor-point/monitor-point.component.ts | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 201 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..0fd59a7 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,20 @@ +import { CoorPickerService } from 'app/routes/map/coordinates-picker/coordinates-picker.service'; +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'; +import { CoordinatesPickerComponent } from 'app/routes/map/coordinates-picker/coordinates-picker.component'; + @Component({ selector: 'app-monitor-point', @@ -7,9 +23,193 @@ }) 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 coorPickerService: CoorPickerService, + 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(); + } + configCoord(record: MonitorPoint): void { + Object.assign(this.coorPickerService.data, record); + const _data = this.coorPickerService.data; + const areaNames = record.areaNames; + let adress = ''; + if (areaNames != null) { + adress += !!areaNames.provinceName ? areaNames.provinceName : ''; + adress += ' '; + adress += !!areaNames.cityName ? areaNames.cityName : ''; + adress += ' '; + adress += !!areaNames.areaName ? areaNames.areaName : ''; + adress += ' '; + adress += !!record.address ? record.address : ''; + } + this.coorPickerService.data.address = adress; + this.coorPickerService.data['describe'] = '������������������'; + this.modalHelper.static(CoordinatesPickerComponent).subscribe( + (staticComp) => { + const data: MonitorPoint = { + id: record.id, + longitude: _data.longitude, + latitude: _data.latitude, + }; + this.monitorPointService.save(data).subscribe( + (res: any) => { + if (res.code === 1) { + this.load(); + this.msgSrv.success('���������������������'); + } + } + ); + + } + ); + } } -- Gitblit v1.8.0