From f4839b6e3fac1f877190a78c36d7affdde091efe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 08:46:30 +0800
Subject: [PATCH] 设备数据

---
 src/app/routes/systems/organization/organization-config-screen/organization-config-screen.component.html |  259 +++++++++++++++++++++++++--------------------------
 1 files changed, 129 insertions(+), 130 deletions(-)

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 c8c58ee..5818e6c 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
@@ -4,144 +4,143 @@
             <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>
+            <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>
-                                <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>
+                                <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>
-                                                <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>
-                                                    &nbsp;
-                                                    <label>{{ sensor.name }}</label>
-                                                </div>
-                                            </ng-container>
-                                        </div>
-                                    </nz-card>
-                            </form>
+                                            </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">
+                                </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>
+                                    &nbsp;
+                                    <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;">
+        <div nz-form-label nz-col [nzSm]="24" style="text-align: center;">
             <h2 *ngIf="deviceVersions.length == 0">������������������������������������������������</h2>
         </div>
     </div>

--
Gitblit v1.8.0