From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/devices/version/version.component.ts | 201 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 199 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/devices/version/version.component.ts b/src/app/routes/devices/version/version.component.ts
index 3297984..6e970b7 100644
--- a/src/app/routes/devices/version/version.component.ts
+++ b/src/app/routes/devices/version/version.component.ts
@@ -1,4 +1,19 @@
+import { VersionSensorConfigComponent } from './version-sensor-config/version-sensor-config.component';
+import { DataType } from '@business/entity/grid';
+import { DeviceVersion, Sensor } from '@business/entity/data';
+import { Version } from '@angular/compiler/src/util';
+import { Subject } from 'rxjs/Subject';
+import { ToolsService } from '@business/services/util/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 { DateService } from '@business/services/util/date.service';
+import { VersionService } from '@business/services/http/version.service';
+import { Types } from '@business/enum/types.enum';
+import { Column, Grid, PageBean } from '@business/entity/grid';
+import { VersionEditComponent } from 'app/routes/devices/version/version-edit/version-edit.component';
+
@Component({
selector: 'app-version',
@@ -6,10 +21,192 @@
styles: []
})
export class VersionComponent implements OnInit {
-
- constructor() { }
+ private version: DeviceVersion;
+ grid: Grid<DeviceVersion> = new Grid(null);
+ queryMap = { text: '������������������������', value: ''};
+ queryTextStream: Subject<string> = new Subject<string>();
+ private initPage() {
+ this.version = {
+ name: {
+ text: '������',
+ width: '18%'
+ },
+ version: {
+ text: '������',
+ width: '18%',
+ isSort: true
+ },
+ createTime: {
+ text: '������������',
+ width: '18%',
+ type: {
+ name: Types.Date,
+ format: 'YYYY-MM-DD HH:mm:ss'
+ },
+ isSort: true
+ },
+ description: {
+ text: '������',
+ width: '18%'
+ }
+ };
+ this.grid.title = '������������';
+ this.grid.setColumns(this.version);
+ this.grid.pageSize = 10;
+ }
+ constructor(
+ private versionService: VersionService,
+
+ 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.versionService.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(data) {
+ if ( data == null) {
+ data = {};
+ }
+ const cols = this.version;
+ this.modalHelper.static(VersionEditComponent, { cols , data }).subscribe(
+ ( ret: { data: any, close: Function} ) => {
+ this.versionService.save(ret.data).subscribe(
+ ( res: any) => {
+ if (res.code === 1) {
+ this.load();
+ ret.close();
+ this.msgSrv.success(this.grid.title + '���������������');
+ }
+ }
+ );
+ });
+ }
+
+ delete(...id: number[]) {
+ this.versionService.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();
+ }
+ configSensor(data) {
+ const deviceVersionId = data.id;
+ this.versionService.getSensorIds(deviceVersionId).subscribe(
+ (selectedSensorIds: number[]) => {
+ this.modalHelper.static(VersionSensorConfigComponent, { deviceVersionId, selectedSensorIds }).subscribe(
+ ( ret: { grid: Grid<Sensor>, close: Function} ) => {
+ // ������������id
+ const selectedIds = ret.grid.data.filter(
+ (r: any) => {
+ return r['checked'] === true;
+ }
+ ).map(
+ (r: any) => {
+ return r['id'];
+ }
+ );
+ // ������������������������������
+ let isModified = selectedIds.length !== selectedSensorIds.length;
+ // ���������������������������
+ if (!isModified) {
+ isModified = !selectedIds.every(
+ (id: number) => {
+ // console.log('id:' + id);
+ const result = selectedSensorIds.some(
+ (sid: number) => {
+ return id === sid ;
+ }
+ );
+ // console.log('result:' + result);
+ return result;
+ }
+ );
+ }
+ if ( !isModified ) {
+ this.msgSrv.success(this.grid.title + '������������������');
+ ret.close();
+ return ;
+ }
+ this.versionService.versionSensorConfig(deviceVersionId, selectedIds).subscribe(
+ ( res: any) => {
+ if (res.code === 1) {
+ ret.close();
+ this.msgSrv.success(this.grid.title + '���������������');
+ }
+ }
+ );
+ });
+ }
+ );
+
+ }
}
--
Gitblit v1.8.0