牛舍详情页(风机90%)

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

@@ -5,12 +5,12 @@
     </ion-buttons>
     <ion-title mode="ios" class="title">{{item.fieldRegionName}}详情</ion-title>
   </ion-toolbar>
-  <div style="margin-top: 5px;margin-bottom: 7px;background-color: #F0F0F0">
+  <div style="padding-top: 5px; padding-bottom: 7px; background-color: #F0F0F0">
     <span [ngClass]="{'online': item.online, 'offline': !item.online}">{{item.online ? '在线' : '离线'}}    </span>
     <span *ngIf="item.operationModel" class="online">{{item.operationModel ? '平控' :'现控'}}    </span>
     <span *ngIf="item.operationModel" [ngClass]="{'online': item.isWisdomModel, 'offline': !item.isWisdomModel}" class="online">智控    </span>
   </div>
-  <div style="background-color: #F0F0F0">
+  <div style="background-color: #F0F0F0;" align="center">
       <v-kanban class="home-bar" name="温度" [inData]="item.temp" iconClass="vo v-wendu" iconColor="#285B90" iconSize="14px"></v-kanban>
       <v-kanban class="home-bar" name="湿度" [inData]="item.humi" iconClass="vo v-shidu" iconColor="#285B90" iconSize="14px"></v-kanban>
       <v-kanban class="home-bar" name="热应激" [inData]="item.heatStressLevelName" iconClass="vo v-nav-ico" iconColor="#285B90" iconSize="14px"></v-kanban>

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

@@ -11,7 +11,7 @@
             margin-bottom: 5px;">模式状态</h1>
   <ion-item lines="full">
     <ion-label>运行模式</ion-label>
-    <ion-select multiple="false" cancelText="取消" okText="确认" [(ngModel)]="workModeSetting.workMode" [(value)]="workModeSetting.workMode"  (ionChange)="workModeEvent()">
+    <ion-select multiple="false" cancelText="取消" okText="确认" [(ngModel)]="controlModel">
       <ion-select-option value="0">手控模式</ion-select-option>
       <ion-select-option value="1">自控模式</ion-select-option>
       <ion-select-option value="2">智慧控制</ion-select-option>
@@ -23,50 +23,23 @@
             border-left: 5px solid #28c9bd;
             line-height: 25px;
             margin-bottom: 5px;">控制/状态</h1>
-  <ion-item *ngFor="let a of allBtns" lines="full" insert="false"  >
-    <!--<v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>-->
-    <ion-label>一键控制{{a.l}}</ion-label>
-    <v-switch [value]="a.v" (click)="allCheck(a)" [loading]="a.d"></v-switch>
+  <!--<ion-item *ngFor="let a of allBtns" lines="full" insert="false">-->
+    <!--<ion-label>一键控制</ion-label>-->
+    <!--<v-switch [value]="a.v" (click)="allCheck(a)" [loading]="a.d"></v-switch>-->
+  <!--</ion-item>-->
+  <ion-item lines="full">
+    <ion-label>一键控制</ion-label>
+    <v-switch [value]="false" (click)="allCheck()"></v-switch>
   </ion-item>
   <div>
-    <ion-card *ngFor="let a of workarea.param" class="card" color="white">
+    <ion-card *ngFor="let device of devices" class="card" color="white">
       <ion-card-header>
-        <ion-card-subtitle>{{a.name}}</ion-card-subtitle>
+        <ion-card-subtitle align="center">{{device.fieldDeviceName}}</ion-card-subtitle>
       </ion-card-header>
 
       <ion-card-content>
-        <v-switch [value]="a.runningState" (click)="toggle(a)" style="float: none;display: inline-block;margin-top: 5px"></v-switch>
+        <v-switch [value]="device.state" (click)="toggle(a)" style="float: none;display: inline-block;margin-top: 5px"></v-switch>
       </ion-card-content>
     </ion-card>
-    <!--<ion-card class="card" color="white">-->
-      <!--<ion-card-header>-->
-        <!--<ion-card-subtitle>1号风机组</ion-card-subtitle>-->
-      <!--</ion-card-header>-->
-
-      <!--<ion-card-content>-->
-        <!--<v-switch [value]="true" (click)="toggle(a)" style="float: none;display: inline-block;"></v-switch>-->
-      <!--</ion-card-content>-->
-    <!--</ion-card>-->
-
-    <!--<ion-card class="card" color="white">-->
-      <!--<ion-card-header>-->
-        <!--<ion-card-subtitle>2号风机组</ion-card-subtitle>-->
-      <!--</ion-card-header>-->
-
-      <!--<ion-card-content>-->
-        <!--<v-switch [value]=true  style="float: none;display: inline-block;"></v-switch>-->
-      <!--</ion-card-content>-->
-    <!--</ion-card>-->
-
-    <!--<ion-card class="card" color="white">-->
-      <!--<ion-card-header>-->
-        <!--<ion-card-subtitle>3号风机组</ion-card-subtitle>-->
-      <!--</ion-card-header>-->
-
-      <!--<ion-card-content>-->
-        <!--<v-switch [value]=true  style="float: none;display: inline-block;"></v-switch>-->
-      <!--</ion-card-content>-->
-    <!--</ion-card>-->
-
   </div>
 </ion-content>

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

@@ -27,23 +27,10 @@ export class EnvFanPage implements OnInit {
         isLoading : true
     };
 
-    allBtns = [{v:1}];
+    allBtns = [{v:1}]; // TODO 待删除
     fieldRegionNo = '';
     fieldRegionName = '';
 
-    workarea = {
-        param: [
-        {
-            name: '1号风机组',
-            runningState:true,  // 是否开启
-        },
-        {
-            name: '2号风机组',
-            runningState:false,
-        }
-        ]
-    };
-
     constructor(private api: Api, private ac: ActivatedRoute, private load: Load) { }
 
     ngOnInit() {
@@ -62,20 +49,23 @@ export class EnvFanPage implements OnInit {
             if (data) {
                 this.controlModel = data.controlModel;
                 this.devices = data.param;
+                // TODO 测试用准备数据
+                this.devices.push({fieldDeviceNo: '136641005998194688', fieldDeviceName: 'X号风机组', state: 1});
+                this.devices.push({fieldDeviceNo: '136641005998194688', fieldDeviceName: 'Y号风机组', state: 0});
             }
         }]);
     }
 
     toggle(a) {
-        // console.log("123");
+        a.value = true;
     }
 
     allCheck(a) {
         a.d = true;
         const req = {
             fieldRegionNo: this.fieldRegionNo,
+            fieldDeviceType: a.t,
             op: a.v ? 0 : 1,
-            type: a.t,
             ts: parseInt((new Date().getTime() / 1000).toString(), 10)
         };
         this.comm.remain = 120;