新增设备

pages/work/index.vue

@@ -235,7 +235,7 @@ export default {
 
               if(device != null){
                 let type =device.type;
-                if(type == 23){
+                if(type == 24){
                   uni.navigateTo({
                     url: '/subpkg/device/detail_new_20250528?id='+device.deviceId
                   });

subpkg/device/detail_new_20250528.vue

@@ -79,22 +79,39 @@
       </view>
       <view class="control_area" v-if="firstTab" :style="boardStyle">
         <view class="control" v-if="boardType ==6">
-            <view class="control_item" v-if="wenduSetting">
-              <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
-              <view class="control_item_detail">
-                <view class="control_item_left" @click="subTemperature(1)">-</view>
-                <view class="control_item_center">
-                  <view style="position: absolute">
-                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(1)" @blur="propBlur(1)" v-model="temperature"></u-input>
-                  </view>
+          <view class="control_item" v-if="wenduSetting && jianyaoMode == 0">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_left" @click="subTemperature(1)">-</view>
+              <view class="control_item_center">
+                <view style="position: absolute">
+                  <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(1)" @blur="propBlur(1)" v-model="temperature"></u-input>
                 </view>
-                <view class="control_item_center_unit" :style="unitFixedStyle">℃</view>
-                <view class="control_item_right" @click="addTemperature(1)">+</view>
               </view>
-              <view class="control_item_title">
-                设置温度
+              <view class="control_item_center_unit" :style="unitFixedStyle">℃</view>
+              <view class="control_item_right" @click="addTemperature(1)">+</view>
+            </view>
+            <view class="control_item_title">
+              设置温度
+            </view>
+          </view>
+
+          <view class="control_item" v-if="wenduSetting && jianyaoMode == 1">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_left" @click="subTemperature(1)">-</view>
+              <view class="control_item_center">
+                <view style="position: absolute">
+                  <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(1)" @blur="propBlur(1)" v-model="FirstTemp"></u-input>
+                </view>
               </view>
+              <view class="control_item_center_unit" :style="unitFixedStyle">℃</view>
+              <view class="control_item_right" @click="addTemperature(1)">+</view>
+            </view>
+            <view class="control_item_title">
+              设置温度
             </view>
+          </view>
             <view class="control_item" v-if="!wenduSetting">
               <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
               <view class="control_item_detail">
@@ -112,22 +129,39 @@
               </view>
             </view>
 
-            <view class="control_item" v-if="wenhuoTimeDlgShow">
-              <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
-              <view class="control_item_detail">
-                <view class="control_item_left" @click="subTemperatureTime(1)">-</view>
-                <view class="control_item_center">
-                  <view style="position: absolute;z-index: 999">
-                    <u-input  customStyle="width:150rpx;border:0px;z-index: 999" disabledColor="white"    v-model="temperatureTime"></u-input>
-                  </view>
+          <view class="control_item" v-if="wenhuoTimeDlgShow && jianyaoMode == 0">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_left" @click="subTemperatureTime(1)">-</view>
+              <view class="control_item_center">
+                <view style="position: absolute;z-index: 999">
+                  <u-input  customStyle="width:150rpx;border:0px;z-index: 999" disabledColor="white"    v-model="temperatureTime"></u-input>
                 </view>
-                <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
-                <view class="control_item_right" style="left: 74%;" @click="addTemperatureTime(1)">+</view>
               </view>
-              <view class="control_item_title">
-                时间设置
+              <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
+              <view class="control_item_right" style="left: 74%;" @click="addTemperatureTime(1)">+</view>
+            </view>
+            <view class="control_item_title">
+              时间设置
+            </view>
+          </view>
+
+          <view class="control_item" v-if="wenhuoTimeDlgShow && jianyaoMode == 1">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_left" @click="subTemperatureTime(1)">-</view>
+              <view class="control_item_center">
+                <view style="position: absolute;z-index: 999">
+                  <u-input  customStyle="width:150rpx;border:0px;z-index: 999" disabledColor="white"    v-model="FirstTime"></u-input>
+                </view>
               </view>
+              <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
+              <view class="control_item_right" style="left: 74%;" @click="addTemperatureTime(1)">+</view>
+            </view>
+            <view class="control_item_title">
+              时间设置
             </view>
+          </view>
 
             <view class="control_item" v-if="!wenhuoTimeDlgShow">
               <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
@@ -180,23 +214,38 @@
                 预约时间
               </view>
             </view>
-            <view class="control_item"  v-if="editWaterVolume">
-              <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
-              <view class="control_item_detail">
-                <view class="control_item_left" @click="subWaterVolume(1)">-</view>
-                <view class="control_item_center">
-                  <view style="position: absolute">
-                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(7)" @blur="propBlur(7)" v-model="waterVolume"></u-input>
+              <view class="control_item"  v-if="editWaterVolume && jianyaoMode == 0">
+                <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+                <view class="control_item_detail">
+                  <view class="control_item_left" @click="subWaterVolume(1)">-</view>
+                  <view class="control_item_center">
+                    <view style="position: absolute">
+                      <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(7)" @blur="propBlur(7)" v-model="waterVolume"></u-input>
+                    </view>
                   </view>
+                  <view class="control_item_center_unit" :style="unitFixedStyle">L</view>
+                  <view class="control_item_right" @click="addWaterVolume(1)">+</view>
+                </view>
+                <view class="control_item_title">
+                  煎药水量
                 </view>
-                <view class="control_item_center_unit" :style="unitFixedStyle">L</view>
-                <view class="control_item_right" @click="addWaterVolume(1)">+</view>
               </view>
-              <view class="control_item_title">
-                加水水量
+              <view class="control_item"  v-if="editWaterVolume && jianyaoMode == 1">
+                <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+                <view class="control_item_detail">
+                  <view class="control_item_left" @click="subWaterVolume(1)">-</view>
+                  <view class="control_item_center">
+                    <view style="position: absolute">
+                      <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(7)" @blur="propBlur(7)" v-model="secondWaterVolume"></u-input>
+                    </view>
+                  </view>
+                  <view class="control_item_center_unit" :style="unitFixedStyle">L</view>
+                  <view class="control_item_right" @click="addWaterVolume(1)">+</view>
+                </view>
+                <view class="control_item_title">
+                  煎药水量
+                </view>
               </view>
-            </view>
-
             <view class="control_item" v-if="!editWaterVolume">
               <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
               <view class="control_item_detail">
@@ -210,7 +259,7 @@
                 <view class="control_item_right" @click="addWaterVolume(1)">+</view>
               </view>
               <view class="control_item_title">
-                当前水量
+                当前煎药水量
               </view>
             </view>
 
@@ -674,28 +723,28 @@
 
 
         <view v-if="statusHandler.type == 9">
-          <view class="control_item" style="width: 100%;background: white;height: 90rpx"  v-if="editSecondAddWaterTime">
-            <view class="control_item_detail">
-              <view class="control_item_left" style="left:22%;top:-41rpx" @click="subErqibushui(1)">-</view>
-              <view class="control_item_center" style="top:-2px;left: 40%;">
-                <u-input fontSize="20px" customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"   v-model="secondAddWaterTime"></u-input>
-              </view>
-              <view class="control_item_center_unit" style=";    font-size: 12px;
-      left: 37vw;
-      top: 13px;">s</view>
-              <view class="control_item_right" style="top: -3px" @click="addErqibushui(1)">+</view>
-            </view>
-          </view>
-          <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="!editSecondAddWaterTime">
+<!--          <view class="control_item" style="width: 100%;background: white;height: 90rpx"  v-if="editSecondAddWaterTime">-->
+<!--            <view class="control_item_detail">-->
+<!--              <view class="control_item_left" style="left:22%;top:-41rpx" @click="subErqibushui(1)">-</view>-->
+<!--              <view class="control_item_center" style="top:-2px;left: 40%;">-->
+<!--                <u-input fontSize="20px" customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"   v-model="secondAddWaterTime"></u-input>-->
+<!--              </view>-->
+<!--              <view class="control_item_center_unit" style=";    font-size: 12px;-->
+<!--      left: 37vw;-->
+<!--      top: 13px;">s</view>-->
+<!--              <view class="control_item_right" style="top: -3px" @click="addErqibushui(1)">+</view>-->
+<!--            </view>-->
+<!--          </view>-->
+          <view class="control_item" style="width: 100%;background: white;height: 90rpx">
             <view class="control_item_detail">
-              <view class="control_item_left" style="left:22%;top:-41rpx" @click="subErqibushui(1)">-</view>
+<!--              <view class="control_item_left" style="left:22%;top:-41rpx" @click="subErqibushui(1)">-</view>-->
               <view class="control_item_center" style="top:-2px;left: 40%;">
                 <u-input  fontSize="20px"  customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"    v-model="currentSecondAddWaterTime"></u-input>
               </view>
               <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
       top: 13px;">s</view>
-              <view class="control_item_right" style="top: -3px" @click="addErqibushui(1)">+</view>
+<!--              <view class="control_item_right" style="top: -3px" @click="addErqibushui(1)">+</view>-->
             </view>
           </view>
           <view style="font-size: 10px;color: red;text-align: center">可调范围10~20</view>
@@ -807,7 +856,7 @@
 
     <u-popup :show="erqibushuiDlg" @close="closeErqibushuiPop" mode="center"  :closeable="true" :round="10">
       <view style="position: relative;width: 400rpx;background: none;padding:40rpx;">
-        <view class="control_item" style="width: 100%" v-if="editSecondAddWaterTime">
+        <view class="control_item" style="width: 100%" >
           <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
           <view class="control_item_detail">
             <view class="control_item_left" @click="subErqibushui(1)" style="left: 18%;">-</view>
@@ -824,24 +873,24 @@
           </view>
         </view>
 
-        <view class="control_item"  style="width: 100%" v-if="!editSecondAddWaterTime" >
-          <image :src="imgUrl+'/detail/bg_mid.png'"  style="width: 100%;height:100%;position: absolute;top:0px;"/>
-          <view class="control_item_detail">
-            <view class="control_item_left" @click="subErqibushui(1)" style="left: 18%;">-</view>
+<!--        <view class="control_item"  style="width: 100%" v-if="!editSecondAddWaterTime" >-->
+<!--          <image :src="imgUrl+'/detail/bg_mid.png'"  style="width: 100%;height:100%;position: absolute;top:0px;"/>-->
+<!--          <view class="control_item_detail">-->
+<!--            <view class="control_item_left" @click="subErqibushui(1)" style="left: 18%;">-</view>-->
 
-            <view class="control_item_center">
-              <view style="position: absolute">
-                <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"    v-model="currentSecondAddWaterTime"></u-input>
-              </view>
-            </view>
-            <view class="control_item_center_unit" :style="unitFixedStyle">s</view>
-            <view class="control_item_right" style="left: 80%;" @click="addErqibushui(1)">+</view>
+<!--            <view class="control_item_center">-->
+<!--              <view style="position: absolute">-->
+<!--                <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"    v-model="currentSecondAddWaterTime"></u-input>-->
+<!--              </view>-->
+<!--            </view>-->
+<!--            <view class="control_item_center_unit" :style="unitFixedStyle">s</view>-->
+<!--            <view class="control_item_right" style="left: 80%;" @click="addErqibushui(1)">+</view>-->
 
-          </view>
-          <view class="control_item_title">
-            二煎补水剩余时间
-          </view>
-        </view>
+<!--          </view>-->
+<!--          <view class="control_item_title">-->
+<!--            二煎补水剩余时间-->
+<!--          </view>-->
+<!--        </view>-->
       </view>
     </u-popup>
 <!--    预约框-->
@@ -1224,6 +1273,9 @@ export default {
   components: {UText, UImage, UPicker},
   data(){
     return {
+      SecondTime:0,
+      FirstTemp:0,
+      FirstTime:0,
       lineProgreeStyle:"width:0%;background:#50ACFF;height: 100%;",
       liuzhuanPopDlg:false,
       turnPercent:1,
@@ -1273,7 +1325,7 @@ export default {
       current:0,
       inputStyle:{height:'44rpx','fontSize':'20rpx'},
       modelKey:['PowerControl','LockControl'],
-      jianyaoKeys : ["TempSetting","TimeSetting","WaterVolume","AppointmentTime","TimeSettingFirst","TimeSettingSecond","SecondAddWaterTime","TempSettingFirst"],
+      jianyaoKeys : ["TempSetting","TimeSetting","WaterVolume","SecondWaterVolume","AppointmentTime","TimeSettingFirst","TimeSettingSecond","SecondAddWaterTime","TempSettingFirst","FirstTemp","FirstTime"],
       baozhuangKeys:["SetSealTemp","SetBandingTemp","PackageQuantity","PackingVolume"],
       power:{
         loading:true,
@@ -1383,6 +1435,7 @@ export default {
       jiashuiTurn:false,
       baowenTurn:false,
       waterVolume:5,
+      secondWaterVolume:5,
       currentWaterVolume:0,
       baowenSettingMode:false,
       baowenSettingTimer:null,
@@ -1950,6 +2003,7 @@ export default {
         this.sendBaowenSetting();
       }
 
+
     },
     modifyName(){
       let self = this;
@@ -2755,31 +2809,66 @@ export default {
       this.sendJianYao("SecondAddWaterTime")
     },
     addTemperatureTime(){
-      console.log("增加煎药时间")
-      if(!this.wenhuoTimeDlgShow){
+      if(this.jianyaoMode == 0){
+        console.log("增加煎药时间")
+        if(!this.wenhuoTimeDlgShow){
+          this.wenhuoTimeDlgShow = true;
+          this.temperatureTime = this.leftJianyaoTime;
+        }
+        this.temperatureTime++;
+        this.changeTemperatureTime()
+      }else{
         this.wenhuoTimeDlgShow = true;
-        this.temperatureTime = this.leftJianyaoTime;
+        this.FirstTime++;
+        this.changeFirstTime()
       }
-      this.temperatureTime++;
-      this.changeTemperatureTime()
     },
     subTemperatureTime(){
-      console.log("减少煎药时间")
-      if(!this.wenhuoTimeDlgShow){
+      if(this.jianyaoMode == 0){
+        console.log("减少煎药时间")
+        if(!this.wenhuoTimeDlgShow){
+          this.wenhuoTimeDlgShow = true;
+          this.temperatureTime = this.leftJianyaoTime;
+        }
+        this.temperatureTime--;
+        if(this.temperatureTime<=0){
+          this.temperatureTime = 1;
+        }
+        this.changeTemperatureTime()
+      }else{
         this.wenhuoTimeDlgShow = true;
-        this.temperatureTime = this.leftJianyaoTime;
+        this.FirstTime--;
+        if(this.FirstTime<=0){
+          this.FirstTime = 1;
+        }
+        this.changeFirstTime()
       }
-      this.temperatureTime--;
-      if(this.temperatureTime<=0){
-        this.temperatureTime = 1;
+
+    },
+    changeFirstTime(){
+      let min = 1;
+      let max = 600;
+      if(this.FirstTime<min){
+        this.FirstTime = min;
       }
-      this.changeTemperatureTime()
+      if(this.FirstTime>max){
+        this.FirstTime = max;
+      }
+      console.log("current temperatureTime is :"+this.FirstTime)
+      this.sendJianYao("FirstTime");
     },
     addTemperature(){
-      console.log("增加煎药温度")
-      this.temperature++;
-      this.wenduSetting = true;
-      this.changeTemperature();
+      if(this.jianyaoMode == 0){
+        console.log("zengjia煎药温度")
+        this.temperature++;
+        this.wenduSetting = true;
+        this.changeTemperature();
+      }else{
+        console.log("zengjia煎药温度")
+        this.FirstTemp++;
+        this.wenduSetting = true;
+        this.changeFirstTemperature();
+      }
 
     },
     resetShowPlanTime(){
@@ -2865,7 +2954,15 @@ export default {
         let mode = this.jianyaoMode;
         if(mode == 0){
           this.firstJianyaoMode = 5;
+        }else{
+          this.secondJianyaoMode = 8;
         }
+        let arr = []
+        let obj2 = {};
+        obj2.id = "DecoctingSwitch";
+        obj2.shadow = 1;
+        arr.push(obj2);
+        this.mqttPublish(2,this.deviceInfo,arr,true);
         this.setStatusHandler()
         return;
       }
@@ -2891,28 +2988,88 @@ export default {
       this.sendJianYao("TimeSettingSecond");
     },
     subWaterVolume(){
+      if(this.jianyaoMode == 0){
+        this.waterVolume = parseFloat(this.waterVolume) -0.1;
+        this.waterVolume = this.waterVolume.toFixed(1);
+        this.editWaterVolume = true;
+        this.sendWaterVolume();
+      }else if(this.jianyaoMode == 1){
+        this.secondWaterVolume = parseFloat(this.secondWaterVolume) -0.1;
+        this.secondWaterVolume = this.secondWaterVolume.toFixed(1);
+        this.editWaterVolume = true;
+        this.sendSecondWaterVolume();
+      }
+
+    },
+    addWaterVolume(){
+      if(this.jianyaoMode == 0){
+        this.waterVolume = parseFloat(this.waterVolume) +0.1;
+        this.waterVolume = this.waterVolume.toFixed(1);
+        this.editWaterVolume = true;
+        this.sendWaterVolume();
+      }else if(this.jianyaoMode == 1){
+        this.secondWaterVolume = parseFloat(this.secondWaterVolume) +0.1;
+        this.secondWaterVolume = this.secondWaterVolume.toFixed(1);
+        this.editWaterVolume = true;
+        this.sendSecondWaterVolume();
+      }
+    },
+
+    subSecondWaterVolume(){
       this.waterVolume = parseFloat(this.waterVolume) -0.1;
       this.waterVolume = this.waterVolume.toFixed(1);
       this.editWaterVolume = true;
       this.sendWaterVolume();
     },
-    addWaterVolume(){
+    addSecondWaterVolume(){
       this.waterVolume = parseFloat(this.waterVolume) +0.1;
       this.waterVolume = this.waterVolume.toFixed(1);
       this.editWaterVolume = true;
       this.sendWaterVolume();
     },
+    sendSecondWaterVolume(){
+      if(this.secondWaterVolume<0){
+        this.secondWaterVolume = 0;
+      }
+      this.sendJianYao("SecondWaterVolume");
+    },
     sendWaterVolume(){
-      if(this.waterVolume<0){
-        this.waterVolume = 0;
+      if(this.jianyaoMode == 0){
+        if(this.waterVolume<0){
+          this.waterVolume = 0;
+        }
+        this.sendJianYao("WaterVolume");
+      }else{
+        this.sendSecondWaterVolume();
       }
-      this.sendJianYao("WaterVolume");
+
     },
     subTemperature(type){
-      console.log("减少煎药温度")
-      this.temperature--;
-      this.wenduSetting = true;
-      this.changeTemperature();
+      if(this.jianyaoMode == 0){
+        console.log("减少煎药温度")
+        this.temperature--;
+        this.wenduSetting = true;
+        this.changeTemperature();
+      }else{
+        console.log("减少煎药温度")
+        this.FirstTemp--;
+        this.wenduSetting = true;
+        this.changeFirstTemperature();
+      }
+
+
+    },
+    changeFirstTemperature(){
+      let max = 140;
+      let min = 100;
+      if(this.FirstTemp<min){
+        this.FirstTemp = min;
+      }
+      if(this.FirstTemp>max){
+        this.FirstTemp = max;
+      }
+      console.log("current temperature is :"+this.FirstTemp)
+      this.sendJianYao("FirstTemp");
     },
     changeJianyaoMode(mode){
       let arr = [];
@@ -3044,6 +3201,18 @@ export default {
             obj.shadow = this.temperature;
             self.resetShowWendu();
           }
+
+          if(key === "FirstTemp"){
+            obj.shadow = this.FirstTemp;
+            self.resetShowWendu();
+          }
+          if(key === "FirstTime"){
+            obj.shadow = this.FirstTime;
+            setTimeout(function(){
+              self.wenhuoTimeDlgShow = false;
+              self.jianyaoShijianSetting = false;
+            },self.resetDuration)
+          }
           if(key === "TempSettingFirst"){
             obj.shadow = this.tempSettingFirst;
             self.resetTempSettingFirstTimer();
@@ -3073,6 +3242,11 @@ export default {
             self.resetWaterVolume();
           }
 
+          if(key === "SecondWaterVolume"){
+            obj.shadow = this.secondWaterVolume*10;
+            self.resetWaterVolume();
+          }
+
           if(key === "AppointmentTime"){
             obj.shadow = this.planTime;
             self.resetShowPlanTime();
@@ -3178,8 +3352,23 @@ export default {
             }
           }
         }
+      }else if(parseInt(this.jianyaoMode) === 1){
+        if(parseFloat(this.secondWaterVolume)>0) {
+          this.secondJianyaoMode = 1;
+        }else{
+          if(parseFloat(this.planTime)>0) {//是否预约
+            this.secondJianyaoMode = 2;
+          }else{
+            if(parseFloat(this.timeSettingFirst)>0){//是否设置先煎
+              this.secondJianyaoMode = 3;
+            }else{
+              this.secondJianyaoMode = 7;
+            }
+          }
+        }
       }
 
+
     },
     kongzhiJianyao(flag,arr){//不判断煎药状态
       let obj = {};
@@ -3843,6 +4032,10 @@ export default {
         this.setPropValue(id,"PackageQuantity","packageNumber",value,1)
 
 
+        this.setPropValue(id,"SecondTime","SecondTime",value,1)
+        this.setPropValue(id,"FirstTemp","FirstTemp",value,1)
+        this.setPropValue(id,"FirstTime","FirstTime",value,1)
+
         //封边温度
         this.setPropValue(id,"BandingTemp","edegTemperature",value);
         this.setPropValue(id,"BandingTemp","tempFengBianWendu",value)
@@ -4243,6 +4436,18 @@ export default {
         this.leftTransferTime = obj.value
       }
 
+      if(msgId == "SecondTime"){
+        this.SecondTime = obj.value
+      }
+
+      if(msgId == "FirstTemp"){
+        this.FirstTemp = obj.value
+      }
+
+      if(msgId == "FirstTime"){
+        this.FirstTime = obj.value
+      }
+
 
     },
     /** 发布物模型 类型(1=属性，2=功能) */

subpkg/device/index.vue

@@ -82,7 +82,7 @@ export default {
   methods:{
     goDeviceDetail(item){
       let type = item.type;
-      if(type == 23){
+      if(type == 24){
         uni.navigateTo({
           url: '/subpkg/device/detail_new_20250528?id='+item.deviceId
         });

subpkg/device/setting.vue

@@ -22,35 +22,45 @@
             {{jiaozhunTemp}}℃<uni-icons type="forward" size="16"></uni-icons>
           </view>
         </view>
-        <view class="prop-item" @click="toPlan" v-if="firstTab">
-          <view class="prop-item-image" style="width: 60rpx;
-    height: 60rpx;
-    bottom: 22rpx;
-    left: 26rpx;
-}">
-            <image :src="imgUrl+'/setting/plan_oper.png?1'" style="width: 100%;height:100%;"/>
-          </view>
-          <view class="prop-item-left">预约</view>
-          <view class="prop-item-right" >
-            <uni-icons type="forward" size="16"></uni-icons>
-          </view>
-        </view>
-        <view class="prop-item" v-if="firstTab && boardType == 5">
+<!--        <view class="prop-item" @click="toPlan" v-if="firstTab">-->
+<!--          <view class="prop-item-image" style="width: 60rpx;-->
+<!--    height: 60rpx;-->
+<!--    bottom: 22rpx;-->
+<!--    left: 26rpx;-->
+<!--}">-->
+<!--            <image :src="imgUrl+'/setting/plan_oper.png?1'" style="width: 100%;height:100%;"/>-->
+<!--          </view>-->
+<!--          <view class="prop-item-left">预约</view>-->
+<!--          <view class="prop-item-right" >-->
+<!--            <uni-icons type="forward" size="16"></uni-icons>-->
+<!--          </view>-->
+<!--        </view>-->
+<!--        <view class="prop-item">-->
+<!--          <view class="prop-item-image">-->
+<!--            <image :src="imgUrl+'/setting/current_icon6.png'" style="width: 100%;height:100%;"/>-->
+<!--          </view>-->
+<!--          <view class="prop-item-left">当前扭力</view>-->
+<!--          <view class="prop-item-right" >-->
+<!--            {{validCurrent}}-->
+<!--          </view>-->
+<!--        </view>-->
+        <view class="prop-item" @click="showLiuProp">
           <view class="prop-item-image">
-            <image :src="imgUrl+'/setting/current_icon6.png'" style="width: 100%;height:100%;"/>
+            <image :src="imgUrl+'/setting/current_icon5.png'" style="width: 100%;height:100%;"/>
           </view>
-          <view class="prop-item-left">当前扭力</view>
+          <view class="prop-item-left">电流设置</view>
           <view class="prop-item-right" >
-            {{validCurrent}}
+            <uni-icons type="forward" size="16"></uni-icons>
           </view>
         </view>
-        <view class="prop-item" @click="showLiuProp" v-if="firstTab && boardType == 5">
+
+        <view class="prop-item" @click="showWaterProp">
           <view class="prop-item-image">
             <image :src="imgUrl+'/setting/current_icon5.png'" style="width: 100%;height:100%;"/>
           </view>
-          <view class="prop-item-left">扭力设置</view>
+          <view class="prop-item-left">水量修正</view>
           <view class="prop-item-right" >
-            {{turnCurrent}}<uni-icons type="forward" size="16"></uni-icons>
+            <uni-icons type="forward" size="16"></uni-icons>
           </view>
         </view>
 
@@ -412,28 +422,119 @@
         </view>
       </view>
     </u-popup>
-    <u-popup :show="liuzhuanPopDlg" @close="closeliuzhuanPop" mode="center"  :closeable="true" :round="10">
-      <view style="position: relative;width: 400rpx;background: none;padding:30rpx;padding-top:60rpx;">
-        <view class="control_item" style="width: 100%">
-          <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
-          <view class="control_item_detail">
-            <view class="control_item_center">
-              <view style="position: absolute">
-                <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"   v-model="setTurnCurrent"></u-input>
+      <u-popup :show="liuzhuanPopDlg" @close="closeliuzhuanPop" mode="center"  :closeable="true" :round="10">
+        <view style="position: relative;width: 400rpx;background: none;padding:30rpx;padding-top:60rpx;padding-bottom:0px">
+          <view class="control_item" style="width: 100%">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_center">
+                <view style="position: absolute">
+                  <u-input  customStyle="width:150rpx;border:0px;" disabled="" disabledColor="white"   v-model="validCurrent"></u-input>
+
+                </view>
+              </view>
+              <view class="control_item_center_unit" :style="unitFixedStyle"></view>
 
+            </view>
+            <view class="control_item_title">
+              实时电流
+            </view>
+          </view>
+          <view class="control_item" style="width: 100%">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_left" @click="subTurnCurrent(1)" style="left: 18%;">-</view>
+
+              <view class="control_item_center">
+                <view style="position: absolute">
+                  <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @confirm="propBlur(12)" @blur="propBlur(12)"  v-model="setTurnCurrent"></u-input>
+
+                </view>
               </view>
+              <view class="control_item_center_unit" :style="unitFixedStyle"></view>
+              <view class="control_item_right" style="left: 80%;" @click="addTurnCurrent(1)">+</view>
+
+            </view>
+            <view class="control_item_title">
+              设置电流
             </view>
-            <view class="control_item_center_unit" :style="unitFixedStyle">MA</view>
           </view>
-          <view class="control_item_title">
-            扭力
+
+          <view class="control_item" style="width: 100%">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_left" @click="subPressDelay(1)" style="left: 18%;">-</view>
+
+              <view class="control_item_center">
+                <view style="position: absolute">
+                  <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"  @confirm="propBlur(13)" @blur="propBlur(13)"   v-model="pressDelay"></u-input>
+
+                </view>
+              </view>
+              <view class="control_item_center_unit" :style="unitFixedStyle">s</view>
+              <view class="control_item_right" style="left: 80%;" @click="addPressDelay(1)">+</view>
+
+            </view>
+            <view class="control_item_title">
+              挤压延时
+            </view>
+          </view>
+          <view style="    width: 100%;
+    height: 140rpx;">
+            <view class="bottom_item" @click="setPressTurn" style="width: 50%">
+              <image v-if="pressTurn == 1" :src="imgUrl+'/img20250528/jiya_on.png'" style="width: 32%;height:32%;"/>
+              <image v-if="pressTurn == 0" :src="imgUrl+'/img20250528/jiya_off.png'" style="width: 32%;height:32%;"/>
+              <view :class="pressTurn == 1?'active_on':''">挤压</view>
+            </view>
+            <view class="bottom_item" @click="setResetTurn" style="width: 50%">
+              <image v-if="resetTurn == 1" :src="imgUrl+'/img20250528/fuwei_on.png'" style="width: 32%;height:32%;"/>
+              <image v-if="resetTurn == 0" :src="imgUrl+'/img20250528/fuwei_off.png'" style="width: 32%;height:32%;"/>
+              <view :class="resetTurn == 1?'active_on':''">复位</view>
+            </view>
           </view>
         </view>
-        <view>
-          <button style="background: white;" @click="confirmLiuzhuannCurrent">确认</button>
+      </u-popup>
+
+      <u-popup :show="waterPopDlg" @close="closeWaterPop" mode="center"  :closeable="true" :round="10">
+        <view style="position: relative;width: 400rpx;background: none;padding:30rpx;padding-top:60rpx;padding-bottom:0px">
+          <view class="control_item" style="width: 100%">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_center">
+                <view style="position: absolute">
+                  <u-input  customStyle="width:150rpx;border:0px;" disabled="" disabledColor="white"   v-model="waterVolume"></u-input>
+
+                </view>
+              </view>
+              <view class="control_item_center_unit" :style="unitFixedStyle"></view>
+
+            </view>
+            <view class="control_item_title">
+              实时水量
+            </view>
+          </view>
+          <view class="control_item" style="width: 100%">
+            <image :src="imgUrl+'/detail/bg_mid.png'" style="width: 100%;height:100%;position: absolute;top:0px;"/>
+            <view class="control_item_detail">
+              <view class="control_item_left" @click="subWaterRepair(1)" style="left: 18%;">-</view>
+
+              <view class="control_item_center">
+                <view style="position: absolute">
+                  <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @confirm="propBlur(14)" @blur="propBlur(14)"  v-model="waterRepair"></u-input>
+
+                </view>
+              </view>
+              <view class="control_item_center_unit" :style="unitFixedStyle"></view>
+              <view class="control_item_right" style="left: 80%;" @click="addWaterRepair(1)">+</view>
+
+            </view>
+            <view class="control_item_title">
+              水量修正
+            </view>
+          </view>
+
         </view>
-      </view>
-    </u-popup>
+      </u-popup>
 
     <u-popup :show="baowenPopDlg" @close="closeBaowenPopDlg" mode="center"  :closeable="true" :round="10">
       <view style="position: relative;width: 400rpx;background: none;padding:30rpx;padding-top:60rpx;">
@@ -497,6 +598,7 @@ export default {
     return {
       lineProgreeStyle:"width:0%;background:#50ACFF;height: 100%;",
       liuzhuanPopDlg:false,
+      waterPopDlg:false,
       turnPercent:1,
       onlineStatus:false,
       modeList:[[
@@ -544,7 +646,7 @@ export default {
       current:0,
       inputStyle:{height:'44rpx','fontSize':'20rpx'},
       modelKey:['PowerControl','LockControl'],
-      jianyaoKeys : ["TempSetting","TimeSetting","WaterVolume","AppointmentTime","TimeSettingFirst","TimeSettingSecond","SecondAddWaterTime"],
+      jianyaoKeys : ["TempSetting","TimeSetting","WaterVolume","AppointmentTime","TimeSettingFirst","TimeSettingSecond","SecondAddWaterTime","PressDelay","TurnCurrent","WaterRepair"],
       baozhuangKeys:["SetSealTemp","SetBandingTemp","PackageQuantity","PackingVolume"],
       power:{
         loading:true,
@@ -634,7 +736,9 @@ export default {
       lineTimer:null,
       validCurrent:0,//当前扭力
       turnCurrent:0,//堵转电流值
-      setTurnCurrent:0,
+      setTurnCurrent:200,
+      pressDelay:0,//挤压延迟
+      waterRepair:200,
       pressTurn:0,
       resetTurn:0,
       drainageTurn:0,
@@ -714,6 +818,45 @@ export default {
     }
   },
   methods:{
+    subWaterRepair(){
+      this.waterRepair--
+      if(this.waterRepair<200){
+        this.waterRepair = 200
+      }
+      this.sendJianYao("WaterRepair")
+    },
+    addWaterRepair(){
+      this.waterRepair++
+      if(this.waterRepair>999){
+        this.waterRepair = 999
+      }
+      this.sendJianYao("WaterRepair")
+    },
+    subTurnCurrent(){
+      this.setTurnCurrent--
+      if(this.setTurnCurrent<200){
+        this.setTurnCurrent = 200
+      }
+      this.sendJianYao("TurnCurrent")
+    },
+    addTurnCurrent(){
+      this.setTurnCurrent++
+      if(this.setTurnCurrent>400){
+        this.setTurnCurrent = 400
+      }
+      this.sendJianYao("TurnCurrent")
+    },
+    subPressDelay(){
+      this.pressDelay--
+      if(this.pressDelay <0){
+        this.pressDelay = 0;
+      }
+      this.sendJianYao("PressDelay")
+    },
+    addPressDelay(){
+      this.pressDelay++
+      this.sendJianYao("PressDelay")
+    },
     setSystemInfo(){
       const systemInfo = uni.getSystemInfoSync();
       let uniPlatform = systemInfo.uniPlatform;
@@ -1070,6 +1213,17 @@ export default {
       if(type == 11){
         this.sendBaowenSetting();
       }
+      if(type == 12){
+        this.sendJianYao("TurnCurrent")
+      }
+      if(type == 13){
+        this.sendJianYao("PressDelay")
+      }
+
+      if(type == 14){
+        this.sendJianYao("WaterRepair")
+      }
+
 
     },
     modifyName(){
@@ -1254,6 +1408,22 @@ export default {
     closejiaozhunPop(){
       this.jiaozhunPopDlg = false;
     },
+    closeWaterPop(){
+      this.waterPopDlg = false;
+    },
+    showWaterProp(){
+      let self = this;
+      uni.showModal({
+        title: "提 示",
+        content: "非专业人员修改可能导致机器损坏",
+        confirmText:"确认",
+        success: function (res) {
+          if(res.confirm){
+            self.waterPopDlg = true;
+          }
+        },
+      })
+    },
     showLiuProp(){
       let self = this;
       uni.showModal({
@@ -2110,6 +2280,15 @@ export default {
             obj.shadow = this.temperature;
             self.resetShowWendu();
           }
+          if(key === "WaterRepair"){
+            obj.shadow = this.waterRepair;
+          }
+          if(key === "PressDelay"){
+            obj.shadow = this.pressDelay;
+          }
+          if(key === "TurnCurrent"){
+            obj.shadow = this.turnCurrent;
+          }
           if(key === "SecondAddWaterTime"){
             obj.shadow = this.secondAddWaterTime;
           }
@@ -2877,6 +3056,11 @@ export default {
 
         this.setPropValue(id,"ValidCurrent","validCurrent",value,0)
         this.setPropValue(id,"TurnCurrent","turnCurrent",value,0)
+        this.setPropValue(id,"PressDelay","pressDelay",value,0)
+
+
+        this.setPropValue(id,"WaterRepair","waterRepair",value,0)
+
 
         this.setPropValue(id,"HoldingTemp","baowenTemp",value,0)
         this.setPropValue(id,"HoldingTime","baowenTime",value,0)
@@ -3247,6 +3431,16 @@ export default {
       }
 
 
+      if(msgId = "PressDelay"){
+        this.pressDelay =  obj.value;
+      }
+
+
+      if(msgId = "WaterRepair"){
+        this.waterRepair =  obj.value;
+      }
+
+
 
     },
     /** 发布物模型 类型(1=属性，2=功能) */