From a52dc7a6e7119d575c611f9c2800649dff029f5e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 09:29:25 +0800
Subject: [PATCH] 大屏布局
---
src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.ts | 18 --
src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts | 24 ++-
src/app/routes/systems/organization/organization-config-screen/organization-config-screen.component.html | 287 ++++++++++++++++++++++++-----------------------
src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.html | 21 +-
src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html | 6
5 files changed, 181 insertions(+), 175 deletions(-)
diff --git a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html
index e6f6a46..5a10e19 100644
--- a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html
+++ b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html
@@ -70,10 +70,10 @@
<div nz-col [nzSm]="8" [nzXs]="24">
<label>{{item.name}}</label>
</div>
- <div nz-col [nzSm]="8" [nzXs]="24">
- <label>{{item.rules.replace('{0}','������')}}</label>
+ <div nz-col [nzSm]="12" [nzXs]="24">
+ <label>{{ rulesToShow(item.rules) }}</label>
</div>
- <div nz-col [nzSm]="8" [nzXs]="24">
+ <div nz-col [nzSm]="4" [nzXs]="24">
<a (click)="toEdit(item)">������</a>
<span> | </span>
<nz-popconfirm [nzTitle]="'���������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(item.id)" >
diff --git a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts
index 2965818..0f48916 100644
--- a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts
+++ b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts
@@ -39,6 +39,9 @@
}
);
}
+ public rulesToShow(rules: string) {
+ return rules.replace( /d/g, '').replace('{0}', '������');
+ }
ngOnInit() {
this.loadDataList();
const validates: SensorUnit = {
@@ -111,22 +114,25 @@
};
this.rules.push(rule);
this.setValueToControl('_rules' , this.rulesToString(this.rules, '������'));
- }
- rulesToString(rules , dataLabel?: string) {
+ } rulesToString(rules , dataLabel?: string) {
let rulesString = '' ;
- dataLabel = dataLabel === undefined ? '{0}' : dataLabel;
+ const isDataLabel = dataLabel === undefined;
+ dataLabel = isDataLabel ? '{0}' : dataLabel;
if (!!this.rules && this.rules.length > 0) {
// const dataLabel = '������';
rulesString += dataLabel ;
this.rules.forEach(rule => {
if (!rulesString.endsWith(dataLabel)) {
rulesString = '(' + rulesString + ')';
- }
- switch (rule.operator) {
- case Operator.PLUS: rulesString += '+' + rule.value + 'd'; break;
- case Operator.MINUS: rulesString += '-' + rule.value + 'd'; break;
- case Operator.MULTIPLY: rulesString += '*' + rule.value + 'd'; break;
- case Operator.DIVIDE: rulesString += '/' + rule.value + 'd'; break;
+ }
+ switch (rule.operator) {
+ case Operator.PLUS: rulesString += '+' + rule.value; break;
+ case Operator.MINUS: rulesString += '-' + rule.value; break;
+ case Operator.MULTIPLY: rulesString += '*' + rule.value; break;
+ case Operator.DIVIDE: rulesString += '/' + rule.value; break;
+ }
+ if ( isDataLabel ) {
+ rulesString += 'd';
}
});
}
diff --git a/src/app/routes/systems/organization/organization-config-screen/organization-config-screen.component.html b/src/app/routes/systems/organization/organization-config-screen/organization-config-screen.component.html
index ecffbf9..c8c58ee 100644
--- a/src/app/routes/systems/organization/organization-config-screen/organization-config-screen.component.html
+++ b/src/app/routes/systems/organization/organization-config-screen/organization-config-screen.component.html
@@ -1,142 +1,153 @@
-<nz-tabset [nzTabPosition]="'left'" [(nzSelectedIndex)]="selectedIndex" (nzSelectedIndexChange)="swapTab()">
- <nz-tab *ngFor="let tab of deviceVersions">
- <ng-template #nzTabHeading>
- {{tab.name}}
- </ng-template>
- <nz-spin [nzSpinning]="isSpinning">
- <form nz-form>
- <nz-card [nzBordered]="false" nzTitle="���������({{surplusSensors.length}})">
- <div nz-form-item nz-row>
- <ng-container *ngFor="let sensor of surplusSensors,index as i">
- <div nz-form-control nz-col [nzSm]="2">
- <label>{{ sensor.name }}</label>
- </div>
- <div nz-form-control nz-col [nzSm]="4">
- <nz-dropdown [nzTrigger]="'click'">
- <a class="ant-dropdown-link" nz-dropdown>
- ������
- <i class="anticon anticon-down"></i>
- </a>
- <ul nz-menu>
- <li nz-menu-item>
- <a (click)="moveTo(surplusSensors,i,defaultMonitorItems)">
- ���������
- </a>
- </li>
- <li nz-menu-divider></li>
- <li nz-menu-item (click)="moveTo(surplusSensors,i,coreMonitorItems)" [nzDisable]="isCoreItemsFull">
- ���������
- <span *ngIf="isCoreItemsFull">(������)</span>
- </li>
- </ul>
- </nz-dropdown>
- </div>
- </ng-container>
- </div>
- <nz-row nzType="flex" nzJustify="end" nzAlign="top">
- <nz-col nzSpan="4" >
- <button (click)="moveAllto(surplusSensors,defaultMonitorItems)" nz-button>���������������������</button>
- </nz-col>
- </nz-row>
- </nz-card>
- <div nz-form-item nz-row>
- <div nz-form-control nz-col [nzSm]="8"></div>
- <div nz-form-control nz-col [nzSm]="8">
- <label class="display-3">������������ :</label>
- <span class="display-3">{{ chartSensorName }}</span>
- </div>
- <div nz-form-control nz-col [nzSm]="8"></div>
- </div>
- <nz-card [nzBordered]="false" nzTitle="���������({{defaultMonitorItems.length}})">
- <div *ngFor="let sensor of defaultMonitorItems,index as i" nz-form-item nz-row>
- <div nz-form-control nz-col [nzSm]="6">
- <label>{{ sensor.name }}</label>
- </div>
- <div nz-form-control nz-col [nzSm]="3">
- <a (click)="itemUp(defaultMonitorItems,i)">������</a>
- </div>
- <div nz-form-control nz-col [nzSm]="3">
- <a (click)="itemDown(defaultMonitorItems,i)">������</a>
- </div>
- <div nz-form-control nz-col [nzSm]="3">
- <a (click)="setChartSensorKey(sensor.sensorKey)">������������</a>
- </div>
- <div nz-form-control nz-col [nzSm]="3">
- <nz-dropdown [nzTrigger]="'click'">
- <a class="ant-dropdown-link" nz-dropdown>
- ������
- <i class="anticon anticon-down"></i>
- </a>
- <ul nz-menu>
- <li nz-menu-item>
- <a (click)="moveTo(defaultMonitorItems,i,surplusSensors)">
- ���������
- </a>
- </li>
- <li nz-menu-divider></li>
- <li nz-menu-item (click)="moveTo(defaultMonitorItems,i,coreMonitorItems)" [nzDisable]="isCoreItemsFull">
- ���������
- <span *ngIf="isCoreItemsFull">(������)</span>
- </li>
- </ul>
- </nz-dropdown>
- </div>
- </div>
- </nz-card>
- <nz-card [nzBordered]="false" nzTitle="���������({{coreMonitorItems.length}}/6)">
- <div *ngFor="let sensor of coreMonitorItems,index as i" nz-form-item nz-row>
- <div nz-form-control nz-col [nzSm]="6">
- <label>{{ sensor.name }}</label>
- </div>
- <div nz-form-control nz-col [nzSm]="3">
- <a (click)="itemUp(coreMonitorItems,i)">������</a>
- </div>
- <div nz-form-control nz-col [nzSm]="3">
- <a (click)="itemDown(coreMonitorItems,i)">������</a>
- </div>
- <div nz-form-control nz-col [nzSm]="3">
- <a (click)="setChartSensorKey(sensor.sensorKey)">������������</a>
- </div>
- <div nz-form-control nz-col [nzSm]="3">
- <nz-dropdown [nzTrigger]="'click'">
- <a class="ant-dropdown-link" nz-dropdown>
- ������
- <i class="anticon anticon-down"></i>
- </a>
- <ul nz-menu>
- <li nz-menu-item>
- <a (click)="moveTo(coreMonitorItems,i,surplusSensors)">
- ���������
- </a>
- </li>
- <li nz-menu-divider></li>
- <li nz-menu-item (click)="moveTo(coreMonitorItems,i,defaultMonitorItems)">
- ���������
- </li>
- </ul>
- </nz-dropdown>
- </div>
- </div>
- </nz-card>
- <nz-card [nzBordered]="false" nzTitle="���������({{optionalFixedItems.length}})">
- <div nz-form-item nz-row>
- <ng-container *ngFor="let sensor of optionalFixedItems,index as i">
- <div nz-form-control nz-col [nzSm]="2">
+<ng-container *ngIf="!!deviceVersions.length; else elseTemplate">
+ <nz-tabset [nzTabPosition]="'left'" [(nzSelectedIndex)]="selectedIndex" (nzSelectedIndexChange)="swapTab()">
+ <nz-tab *ngFor="let tab of deviceVersions">
+ <ng-template #nzTabHeading>
+ {{tab.name}}
+ </ng-template>
+ <nz-spin [nzSpinning]="isSpinning">
+ <form *ngIf="!!deviceVersions.length" nz-form>
+ <nz-card [nzBordered]="false" nzTitle="���������({{surplusSensors.length}})">
+ <div nz-form-item nz-row>
+ <ng-container *ngFor="let sensor of surplusSensors,index as i">
+ <div nz-form-control nz-col [nzSm]="2">
+ <label>{{ sensor.name }}</label>
+ </div>
+ <div nz-form-control nz-col [nzSm]="4">
+ <nz-dropdown [nzTrigger]="'click'">
+ <a class="ant-dropdown-link" nz-dropdown>
+ ������
+ <i class="anticon anticon-down"></i>
+ </a>
+ <ul nz-menu>
+ <li nz-menu-item>
+ <a (click)="moveTo(surplusSensors,i,defaultMonitorItems)">
+ ���������
+ </a>
+ </li>
+ <li nz-menu-divider></li>
+ <li nz-menu-item (click)="moveTo(surplusSensors,i,coreMonitorItems)" [nzDisable]="isCoreItemsFull">
+ ���������
+ <span *ngIf="isCoreItemsFull">(������)</span>
+ </li>
+ </ul>
+ </nz-dropdown>
+ </div>
+ </ng-container>
+ </div>
+ <nz-row nzType="flex" nzJustify="end" nzAlign="top">
+ <nz-col nzSpan="4" >
+ <button (click)="moveAllto(surplusSensors,defaultMonitorItems)" nz-button>���������������������</button>
+ </nz-col>
+ </nz-row>
+ </nz-card>
+ <div nz-form-item nz-row>
+ <div nz-form-control nz-col [nzSm]="8"></div>
+ <div nz-form-control nz-col [nzSm]="8">
+ <label class="display-3">������������ :</label>
+ <span class="display-3">{{ chartSensorName }}</span>
+ </div>
+ <div nz-form-control nz-col [nzSm]="8"></div>
</div>
- <div nz-form-control nz-col [nzSm]="4">
- <label nz-checkbox [ngModel]="isFixedSensorSelected(sensor.sensorKey)"
- (ngModelChange) = "changeFixedItem( $event, sensor)"
- name="fixed_{{sensor.sensorKey}}_selected"></label>
-
- <label>{{ sensor.name }}</label>
- </div>
- </ng-container>
- </div>
- </nz-card>
- </form>
- </nz-spin>
- </nz-tab>
-</nz-tabset>
+ <nz-card [nzBordered]="false" nzTitle="���������({{defaultMonitorItems.length}})">
+ <div *ngFor="let sensor of defaultMonitorItems,index as i" nz-form-item nz-row>
+ <div nz-form-control nz-col [nzSm]="6">
+ <label>{{ sensor.name }}</label>
+ </div>
+ <div nz-form-control nz-col [nzSm]="3">
+ <a (click)="itemUp(defaultMonitorItems,i)">������</a>
+ </div>
+ <div nz-form-control nz-col [nzSm]="3">
+ <a (click)="itemDown(defaultMonitorItems,i)">������</a>
+ </div>
+ <div nz-form-control nz-col [nzSm]="3">
+ <a (click)="setChartSensorKey(sensor.sensorKey)">������������</a>
+ </div>
+ <div nz-form-control nz-col [nzSm]="3">
+ <nz-dropdown [nzTrigger]="'click'">
+ <a class="ant-dropdown-link" nz-dropdown>
+ ������
+ <i class="anticon anticon-down"></i>
+ </a>
+ <ul nz-menu>
+ <li nz-menu-item>
+ <a (click)="moveTo(defaultMonitorItems,i,surplusSensors)">
+ ���������
+ </a>
+ </li>
+ <li nz-menu-divider></li>
+ <li nz-menu-item (click)="moveTo(defaultMonitorItems,i,coreMonitorItems)" [nzDisable]="isCoreItemsFull">
+ ���������
+ <span *ngIf="isCoreItemsFull">(������)</span>
+ </li>
+ </ul>
+ </nz-dropdown>
+ </div>
+ </div>
+ </nz-card>
+ <nz-card [nzBordered]="false" nzTitle="���������({{coreMonitorItems.length}}/6)">
+ <div *ngFor="let sensor of coreMonitorItems,index as i" nz-form-item nz-row>
+ <div nz-form-control nz-col [nzSm]="6">
+ <label>{{ sensor.name }}</label>
+ </div>
+ <div nz-form-control nz-col [nzSm]="3">
+ <a (click)="itemUp(coreMonitorItems,i)">������</a>
+ </div>
+ <div nz-form-control nz-col [nzSm]="3">
+ <a (click)="itemDown(coreMonitorItems,i)">������</a>
+ </div>
+ <div nz-form-control nz-col [nzSm]="3">
+ <a (click)="setChartSensorKey(sensor.sensorKey)">������������</a>
+ </div>
+ <div nz-form-control nz-col [nzSm]="3">
+ <nz-dropdown [nzTrigger]="'click'">
+ <a class="ant-dropdown-link" nz-dropdown>
+ ������
+ <i class="anticon anticon-down"></i>
+ </a>
+ <ul nz-menu>
+ <li nz-menu-item>
+ <a (click)="moveTo(coreMonitorItems,i,surplusSensors)">
+ ���������
+ </a>
+ </li>
+ <li nz-menu-divider></li>
+ <li nz-menu-item (click)="moveTo(coreMonitorItems,i,defaultMonitorItems)">
+ ���������
+ </li>
+ </ul>
+ </nz-dropdown>
+ </div>
+ </div>
+ </nz-card>
+ <nz-card [nzBordered]="false" nzTitle="���������({{optionalFixedItems.length}})">
+ <div nz-form-item nz-row>
+ <ng-container *ngFor="let sensor of optionalFixedItems,index as i">
+ <div nz-form-control nz-col [nzSm]="2">
+ </div>
+ <div nz-form-control nz-col [nzSm]="4">
+ <label nz-checkbox [ngModel]="isFixedSensorSelected(sensor.sensorKey)"
+ (ngModelChange) = "changeFixedItem( $event, sensor)"
+ name="fixed_{{sensor.sensorKey}}_selected"></label>
+
+ <label>{{ sensor.name }}</label>
+ </div>
+ </ng-container>
+ </div>
+ </nz-card>
+ </form>
+ </nz-spin>
+ </nz-tab>
+ </nz-tabset>
+</ng-container>
+<ng-template #elseTemplate>
+ <div nz-form-item nz-row>
+ <div nz-form-label nz-col [nzSm]="24" style="text-align: center;">
+ <h2 *ngIf="deviceVersions.length == 0">������������������������������������������������</h2>
+ </div>
+ </div>
+</ng-template>
+
+
<footer-toolbar>
<label>���������������</label>
<span [ngStyle]="{'font-size': '16px','font-weight': 'bold','margin-right':'30px'}">{{ organization.name }}</span>
diff --git a/src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.html b/src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.html
index d4ad476..f8f6fa2 100644
--- a/src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.html
+++ b/src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.html
@@ -1,29 +1,30 @@
<form nz-form>
- <ng-container *ngIf="!!osuTowDimList.length; else elseTemplate">
- <div *ngFor= "let osuList of osuTowDimList" nz-form-item nz-row>
- <ng-container *ngFor="let osu of osuList">
+ <ng-container *ngIf="!!osuList.length; else elseTemplate">
+ <nz-row nzGutter="8">
+ <ng-container *ngFor="let osu of osuList,index as i">
+
<div nz-form-label nz-col [nzSm]="3">
<label>{{osu.sensor.description}}</label>
</div>
- <div nz-form-control nz-col [nzSm]="4">
+ <div nz-form-control nz-col [nzSm]="3">
<nz-select [nzMode]="'default'" nzAllowClear
- nzPlaceHolder="{{osu.sensor.unit}}(������������)" [(ngModel)]="osu.sensorUnitId" name="sensorUnitId">
+ nzPlaceHolder="{{osu.sensor.unit}}(������������)" [(ngModel)]="osu.sensorUnitId" name="sensorUnit_{{i}}">
<nz-option
*ngFor="let option of sensorUnitMap[osu.sensor.id]"
[nzLabel]="option.name"
[nzValue]="option.id">
- </nz-option>
+ </nz-option>
</nz-select>
- </div>
+ </div>
</ng-container>
- </div>
+ </nz-row>
</ng-container>
<ng-template #elseTemplate>
<div nz-form-item nz-row>
<div nz-form-label nz-col [nzSm]="24" style="text-align: center;">
- <h2>���������������������������������������������������</h2>
+ <h2>������������������������������������������������</h2>
</div>
- </div>
+ </div>
</ng-template>
diff --git a/src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.ts b/src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.ts
index 29678a3..ebf441c 100644
--- a/src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.ts
+++ b/src/app/routes/systems/organization/organization-config-unit/organization-config-unit.component.ts
@@ -16,10 +16,9 @@
private organizationService: OrganizationService,
public msgSrv: NzMessageService
) { }
- public osuTowDimList: OrganizationSensorUnit[][] = [];
public originalOsuList: OrganizationSensorUnit[] = [];
- public osuList: OrganizationSensorUnit[];
+ public osuList: OrganizationSensorUnit[] = [];
public sensorUnitMap;
ngOnInit() {
this.organization = this.organizationService.data;
@@ -32,19 +31,8 @@
Object.assign(osu, item);
this.originalOsuList.push(osu);
});
- if ( !!osuList ) {
- for (let index = 0 ; index < osuList.length; index += 3 ) {
- const osuListTemp: OrganizationSensorUnit[] = [];
- for (let n = 0 ; n < 3; n++ ) {
- const nTemp = index + n;
- if (nTemp < osuList.length ) {
- osuListTemp.push(osuList[nTemp]);
- }
- }
- this.osuTowDimList.push(osuListTemp);
- }
- }
- console.log(this.osuTowDimList);
+ console.log(this.osuList);
+ console.log(this.sensorUnitMap);
}
public isSaving = false;
save() {
--
Gitblit v1.8.0