修改layout

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

@@ -254,25 +254,25 @@
       </div>
 
       <ion-item-divider sticky="true" class="itemDriver subTitle">
-        <ion-label>牛群在/离舍配置</ion-label>
+        <ion-label>牛群离舍配置</ion-label>
         <ion-icon name="add" slot="end" class="iconOpen" *ngIf="!isOpenInHouse" (click)="openItem('inHouseCfg')"></ion-icon>
         <ion-icon name="remove" slot="end" class="iconOpen" *ngIf="isOpenInHouse" (click)="openItem('inHouseCfg')"></ion-icon>
       </ion-item-divider>
       <ion-item class="fanItem" *ngIf="isOpenInHouse" @shrink >
         <ion-grid>
+          <!--<ion-row>-->
+            <!--<ion-col>牛群回舍时需恢复上述的设备</ion-col>-->
+          <!--</ion-row>-->
+          <!--<ion-row>-->
+            <!--<ion-col *ngFor="let device of curCowshed.back">-->
+              <!--<ion-item lines="none" class="cow">-->
+                <!--<ion-checkbox color="primary" class="cowCheckBox" slot="start" [(ngModel)]="device.flag"></ion-checkbox>-->
+                <!--<ion-label>{{device.type}}</ion-label>-->
+              <!--</ion-item>-->
+            <!--</ion-col>-->
+          <!--</ion-row>-->
           <ion-row>
-            <ion-col>牛群回舍时需恢复上述的设备</ion-col>
-          </ion-row>
-          <ion-row>
-            <ion-col *ngFor="let device of curCowshed.back">
-              <ion-item lines="none" class="cow">
-                <ion-checkbox color="primary" class="cowCheckBox" slot="start" [(ngModel)]="device.flag"></ion-checkbox>
-                <ion-label>{{device.type}}</ion-label>
-              </ion-item>
-            </ion-col>
-          </ion-row>
-          <ion-row>
-          <ion-col>牛群离舍时需完全关闭的设备</ion-col>
+            <ion-col>牛群离舍时需完全关闭的设备</ion-col>
           </ion-row>
           <ion-row>
             <ion-col *ngFor="let device of curCowshed.leave">

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

@@ -53,7 +53,7 @@ export class EnvCfgPage implements OnInit {
         propertyConfig: {toft: 0, hoft: 0},
         config: [],
         leave: [{type: '风机', flag: true}, {type: '喷淋', flag: false}, {type: '照明', flag: true}],
-        back: [{type: '风机', flag: false}, {type: '喷淋', flag: true}, {type: '照明', flag: false}],
+        back: [{type: '风机', flag: true}, {type: '喷淋', flag: true}, {type: '照明', flag: true}],
         environmentConfigJson: {TU: 0, TL: 0, HU: 0, HL: 0},
         heatStressList: [] };
 
@@ -392,6 +392,8 @@ export class EnvCfgPage implements OnInit {
             // this.comm.remain = 150;
             this.loading.presentLoading(150);
             this.curCowshed.isWisdomModel = this.curCowshed.isWisdomModelChecked ? 1 : 0;
+            // 回舍时默认设备都为打开状态
+            this.curCowshed.back.forEach(one => (one.flag = true));
             this.api.config.updateConfig([this.curCowshed, (data) => {
                 if (data && data.code !== 0) {
                     this.api.presentMsgToast(data.message);

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

@@ -41,7 +41,7 @@
 //}
 
 .top {
-  padding: 5px;
+  padding: 5px 5px 0px 5px;
   background-color: #F0F0F0
 }
 
@@ -65,7 +65,7 @@
 
 .inHouseDiv {
   background-color: rgb(240, 240, 240);
-  height: 40px;
+  height: 35px;
   padding-right: 10px;
   text-align: right;
 }

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

@@ -40,21 +40,55 @@
     </ion-item>
 
     <h1 class="main-title-detail">供液泵状态</h1>
-    <ion-item lines="none" style="width: 98%;">
+    <ion-item lines="none" class="item-content">
       <div [ngClass]="{'sucCir': bump.alarm === 0, 'errCir': bump.alarm === 0}"></div>&nbsp;
       <span class="content">{{bump.alarm === 1 ? '异常' : '运行'}}</span>
       <span class="content" style="margin-left: 30px">压力:  {{bump.press}} Mpa</span>
     </ion-item>
     <h1 class="main-title-detail">时间参数</h1>
-    <ion-item lines="full" insert="false">
-      <span class="content">{{fieldDeviceNameA}}喷淋时间 &nbsp;&nbsp;&nbsp;&nbsp;{{controlConfig.a}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>
-    </ion-item>
-    <ion-item lines="full" insert="false">
-      <span class="content">{{fieldDeviceNameB}}喷淋时间 &nbsp;&nbsp;&nbsp;&nbsp;{{controlConfig.b}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>
-    </ion-item>
-    <ion-item lines="full" insert="false">
-      <span class="content">间隔时间 &nbsp;&nbsp;&nbsp;&nbsp; {{controlConfig.interval}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>
+    <ion-item lines="none" insert="false">
+      <ion-grid>
+        <ion-row>
+          <ion-col>
+            <div style="width:100%">
+              <span class="content">{{fieldDeviceNameA}}喷淋时间 &nbsp;&nbsp;&nbsp;&nbsp;{{controlConfig.a}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>
+            </div>
+          </ion-col>
+        </ion-row>
+        <ion-row>
+          <ion-col>
+            <div style="width:100%">
+              <span class="content">{{fieldDeviceNameB}}喷淋时间 &nbsp;&nbsp;&nbsp;&nbsp;{{controlConfig.b}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>
+            </div>
+          </ion-col>
+        </ion-row>
+        <ion-row>
+          <ion-col>
+            <div style="width:100%">
+              <span class="content">间隔时间 &nbsp;&nbsp;&nbsp;&nbsp; {{controlConfig.interval}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>
+            </div>
+          </ion-col>
+        </ion-row>
+      </ion-grid>
+
+
+      <!--<div style="width:100%">-->
+        <!--<span class="content">{{fieldDeviceNameA}}喷淋时间 &nbsp;&nbsp;&nbsp;&nbsp;{{controlConfig.a}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>-->
+      <!--</div>-->
+      <!--<div style="width:100%">-->
+        <!--<span class="content">{{fieldDeviceNameB}}喷淋时间 &nbsp;&nbsp;&nbsp;&nbsp;{{controlConfig.b}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>-->
+      <!--</div>-->
+      <!--<div style="width:100%">-->
+        <!--<span class="content">间隔时间 &nbsp;&nbsp;&nbsp;&nbsp; {{controlConfig.interval}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>-->
+      <!--</div>-->
+
     </ion-item>
+    <!--<ion-item lines="none" insert="false" class="item-content">-->
+      <!--<span class="content">{{fieldDeviceNameB}}喷淋时间 &nbsp;&nbsp;&nbsp;&nbsp;{{controlConfig.b}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>-->
+    <!--</ion-item>-->
+    <!--<ion-item lines="none" insert="false" class="item-content">-->
+      <!--<span class="content">间隔时间 &nbsp;&nbsp;&nbsp;&nbsp; {{controlConfig.interval}} &nbsp;&nbsp;&nbsp;&nbsp; 秒</span>-->
+    <!--</ion-item>-->
 
     <h1 class="main-title-detail">控制状态</h1>
     <div class="card-div">
@@ -62,12 +96,17 @@
         <ion-card-header class="cardHeader">
           <ion-card-title class="card-title">
             <div style="width:100%;text-align:center;">
-              <div style="width:48%;display: inline-block; height: 40px;float: left; text-align: center; padding-top: 10px;">
+              <div class="card-title-label">
                 <div style="text-align: center;margin:auto">{{device.fieldDeviceName}}</div>
               </div>
-              <div style="width:48%;display: inline-block"><img [src]="'../../assets/img/shower-' + device.state + '.png'" style="width:50px !important; margin: auto;"></div>
+              <div style="width:48%;display: inline-block">
+                <img *ngIf="device.cycle === 1 && device.state === 1" src="../../assets/img/shower-ing.gif" style="width:50px !important; margin: auto;">
+                <img *ngIf="device.cycle === 1 && device.state === 0" src="../../assets/img/shower-1.png" style="width:50px !important; margin: auto;">
+                <img *ngIf="device.cycle === 0 && device.state === 0" src="../../assets/img/shower-0.png" style="width:50px !important; margin: auto;">
+              </div>
             </div>
           </ion-card-title>
+
         </ion-card-header>
 
         <ion-card-content class="cardContent">

src/app/envCtrl/env-shower/env-shower.page.scss

@@ -10,6 +10,15 @@
   font-size: 16px;
 }
 
+.card-title-label {
+  width:48%;
+  display: inline-block;
+  height: 20px;
+  float: left;
+  text-align: center;
+  padding-top: 20px;
+}
+
 .content {
   font-size: 13px;
 }
@@ -43,9 +52,13 @@
 .cardHeader {
   --padding-inline-start: 0px !important;
   --padding-inline-end: 0px !important;
-  padding: 10px;
+  padding: 3px 10px 0px 10px;
 }
 .cardContent {
   padding: 5px;
   text-align: center;
 }
+
+.item-content {
+  padding-left: 12px;
+}

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

@@ -126,6 +126,7 @@ export class EnvShowerPage implements OnInit {
                 this.param = data.param;
                 this.param.forEach(device => {
                     device.op = device.cycle === 1 ? true : false;
+                    device.press = device.press < 0 ? 0 : device.press;
                 });
 
                 if (this.param[0]) {

src/app/service/api.ts

@@ -161,7 +161,17 @@ export class Api {
             duration: t ? t : 5000,
             mode: 'ios',
             cssClass: 'msgToast',
-            position: wz ? wz : 'top'
+            color: 'medium',
+            position: wz ? wz : 'top',
+            buttons: [
+                {
+                    role: 'cancel',
+                    icon: 'close',
+                    handler: () => {
+                        console.log('Favorite clicked');
+                    }
+                }
+            ]
         });
         toast.present();
     }