调整layout

src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.html

@@ -24,12 +24,13 @@
         <ion-select-option value="1" class="popLabel">已修复</ion-select-option>
       </ion-select>
       <ion-select interface="popover" placeholder="类型" [(ngModel)]="fieldDeviceType" (click)="refresh()" id="selectType">
-        <ion-select-option value="全部" class="popLabel">全部</ion-select-option>
-        <ion-select-option value="环境" class="popLabel">环境</ion-select-option>
-        <ion-select-option value="风机" class="popLabel">风机</ion-select-option>
-        <ion-select-option value="喷淋" class="popLabel">喷淋</ion-select-option>
-        <ion-select-option value="照明" class="popLabel">照明</ion-select-option>
-        <ion-select-option value="水槽" class="popLabel">水槽</ion-select-option>
+        <ion-select-option *ngFor="let option of typeOptions" [value]="option.modelId">{{option.modelValue}}</ion-select-option>
+        <!--<ion-select-option value="全部" class="popLabel">全部</ion-select-option>-->
+        <!--<ion-select-option value="环境" class="popLabel">环境</ion-select-option>-->
+        <!--<ion-select-option value="风机" class="popLabel">风机</ion-select-option>-->
+        <!--<ion-select-option value="喷淋" class="popLabel">喷淋</ion-select-option>-->
+        <!--<ion-select-option value="照明" class="popLabel">照明</ion-select-option>-->
+        <!--<ion-select-option value="水槽" class="popLabel">水槽</ion-select-option>-->
       </ion-select>
     </ion-item>
 
@@ -43,21 +44,21 @@
       <div style="width: 30%">
         <ion-datetime class="content-text-color" style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="stopTime" style="margin-left: 3px;" (click)="refresh()" id="selectStopTime"></ion-datetime>
       </div>
-      <div style="width: 40%; padding-right: 10px;">
+      <div style="width: 40%; padding-right: 15px;">
         <div class="note" style="margin-bottom: 5px;">
-          <div style="width:80%; display:inline-block">
+          <div style="width:85%; display:inline-block">
             <span class="font-note" style="text-align: right; padding-right:5px;">未解决数</span>
           </div>
-          <div style="width:20%; display:inline-block;">
+          <div style="width:15%; display:inline-block;">
             <span class="main-color" style="font-size: 13px" *ngIf="isTroubleDis">{{detailInfo.devErr}}</span>
             <span class="main-color" style="font-size: 13px" *ngIf="isAlarmDis">{{detailInfo.alarm}}</span>
           </div>
         </div>
         <div class="note">
-          <div style="width:80%; display:inline-block">
+          <div style="width:85%; display:inline-block">
             <span class="font-note" style="text-align: right; padding-right:5px;">总数</span>
           </div>
-          <div style="width:20%; display:inline-block;">
+          <div style="width:15%; display:inline-block;">
             <span class="main-color" style="font-size: 13px" *ngIf="isTroubleDis">{{detailInfo.devErrTotal}}</span>
             <span class="main-color" style="font-size: 13px" *ngIf="isAlarmDis">{{detailInfo.alarmTotal}}</span>
           </div>
@@ -91,7 +92,7 @@
                 <div *ngIf="item.data !== null && item.data.NH3 !== undefined && item.data.NH3 !== null && item.data.NH3 !== ''" class="warnContent font-content">氨气: {{item.data.NH3}} ppm</div>
               </div>
               <div style="width:35%; float: left">
-                <div *ngIf="displayArea === 'trouble' && item.disposeState === 0" >
+                <div *ngIf="displayArea === 'trouble' && item.disposeState === 0" >is
                   <ion-button color="secondary" style="display: inline-block; width: 55px; height: 30px; font-size: 12px; border-radius: 20px;" (click)="onRecvClick(item)">确认修复</ion-button>
                 </div>
                 <img *ngIf="displayArea === 'trouble' && item.disposeState === 1" [src]="'../../assets/img/troubleDisposeState' + item.disposeState + '.png'" class="warnIcon">

src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.ts

@@ -43,6 +43,13 @@ export class EnvAlarmDetailPage implements OnInit {
         'workModeOld': '1'
     };
 
+    typeOptions = [
+        {modelId: '全部', modelValue: '全部'},
+        {modelId: '环境', modelValue: '环境'},
+        {modelId: '风机', modelValue: '风机'},
+        {modelId: '喷淋', modelValue: '喷淋'},
+        {modelId: '照明', modelValue: '照明'},
+        {modelId: '水槽', modelValue: '水槽'}];
     // commTmr: any;
 
     @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll;

src/app/envCtrl/env-fan/env-fan.page.html

@@ -52,7 +52,6 @@
 
       <ion-toggle color="secondary" mode="ios" style="display:inline-block" slot="end" [checked]="batchSwitch.op" [disabled]="batchSwitch.disabled"
                   [(ngModel)]="batchSwitch.op" (load)="batchSwitch.load" (click)="toggle(batchSwitch)"></ion-toggle>
-      <!--<v-switch (click)="allCheck(batchSwitch)" [value]="batchSwitch.op" [disabled]="batchSwitch.disabled" [loading]="batchSwitch.load"></v-switch>-->
     </ion-item>
     <div class="card-div">
       <ion-card mode="ios" *ngFor="let device of devices" class="card" color="white">
@@ -61,16 +60,13 @@
         </ion-card-header>
 
         <ion-card-content mode="ios" class="cardContent">
-          <!--<ion-toggle slot="middle" [checked]="device.state"></ion-toggle>-->
+
           <ion-toggle mode="ios" class="btn-switch" *ngIf="device.alarm === 0" [checked]="device.op" [disabled]="device.disabled" color="secondary"
                       [(ngModel)]="device.op" (click)="deviceCheck(device)"></ion-toggle>
           <ion-toggle mode="ios" class="btn-switch" *ngIf="device.alarm === 1" [checked]="device.op" [disabled]="device.disabled" color="danger"
                       [(ngModel)]="device.op" (click)="deviceCheck(device)"></ion-toggle>
-          <!--<v-switch *ngIf="device.alarm === 0" class="btn-switch" (click)="deviceCheck(device)" [value]="device.state" [disabled]="device.disabled" [loading]="device.load"></v-switch>-->
-          <!--<v-switch *ngIf="device.alarm === 1" class="btn-switch" color="danger" (click)="deviceCheck(device)" [value]="device.state" [disabled]="device.disabled" [loading]="device.load"></v-switch>-->
         </ion-card-content>
       </ion-card>
     </div>
-    <!--<v-loading-bump style="z-index: 9999; color: red" [remain]="comm.remain" *ngIf="comm.isLoading"></v-loading-bump>-->
   </div>
 </ion-content>