修改参数

subpkg/device/detail_new_20250528.vue

@@ -385,7 +385,7 @@
         </view>
 
         <view style="    display: flex;flex-direction: row;">
-          <view style="position: relative" @click="setPressTurn" style="width: 33%" >
+          <view  @click="setPressTurn" style="width: 33%;position: relative" >
             <view style="background: white;height: 50px;width: 60px;position: relative;border-radius: 10px;top: 10px;margin: 0 10px;">
               <view style="height: 30%;width: 40%;position: relative;left: 34%;top: 20%;">
                 <image v-if="pressTurn == 1" :src="imgUrl+'/img20250528/jiya_on.png'" style="width: 100%;height: 100%"/>
@@ -395,7 +395,7 @@
               <view style="    position: relative;left: 37%;top: 29%; font-size: 12px;">挤压</view>
             </view>
           </view>
-          <view style="position: relative" @click="setResetTurn" style="width: 33%"  >
+          <view  @click="setResetTurn" style="width: 33%;position: relative"  >
             <view style="background: white;height: 50px;width: 60px;position: relative;border-radius: 10px;top: 10px;margin: 0 10px;">
               <view style="height: 30%;width: 40%;position: relative;left: 34%;top: 20%;">
                 <image v-if="resetTurn == 1" :src="imgUrl+'/img20250528/fuwei_on.png'" style="width: 100%;height: 100%"/>
@@ -405,7 +405,7 @@
               <view style="    position: relative;left: 37%;top: 29%; font-size: 12px;">复位</view>
             </view>
           </view>
-          <view style="position: relative" @click="paishui"  style="width: 33%" >
+          <view  @click="paishui"  style="width: 33%;position: relative" >
             <view style="background: white;height: 50px;width: 60px;position: relative;border-radius: 10px;top: 10px;margin: 0 10px;">
               <view style="height: 30%;width: 40%;position: relative;left: 34%;top: 20%;">
                 <image v-if="drainageTurn == 1" :src="imgUrl+'/img20250528/chuyao_on.png'" style="width: 100%;height: 100%"/>
@@ -522,7 +522,7 @@
             <view class="control_item_detail">
               <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTempSettingFirst(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"    @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(7)" @blur="propBlur(7)" v-model="currentTempSettingFirst"/>
+                <u-input  fontSize="20px"  customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"    @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(7)" @blur="propBlur(7)" v-model="currentTemperature"/>
               </view>
               <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
@@ -536,7 +536,7 @@
             <view class="control_item_detail">
               <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTimeFirst(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="currentTimeSettingFirst"/>
+                <u-input fontSize="20px" customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"    v-model="leftJianyaoTime"/>
               </view>
               <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
@@ -548,7 +548,7 @@
             <view class="control_item_detail">
               <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTimeFirst(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"     @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(7)" @blur="propBlur(7)" v-model="currentTempSettingFirst"/>
+                <u-input  fontSize="20px"  customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"     @change="propChange(1)"  @focus="propFocus(1)" @confirm="propBlur(7)" @blur="propBlur(7)" v-model="timeSettingFirst"/>
               </view>
               <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
@@ -641,28 +641,56 @@
           </view>
 
 
-          <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="wenhuoTimeDlgShow">
-            <view class="control_item_detail">
-              <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTemperatureTime(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="temperatureTime"/>
-              </view>
-              <view class="control_item_center_unit" style=";    font-size: 12px;
+         <view v-if="secondJianyaoMode == 10">
+           <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="wenhuoTimeDlgShow">
+             <view class="control_item_detail">
+               <view class="control_item_left" style="left:22%;top:-41rpx" @click="subSecondTime(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="SecondTime"/>
+               </view>
+               <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
       top: 13px;">min</view>
-              <view class="control_item_right" style="top: -3px" @click="addTemperatureTime(1)">+</view>
-            </view>
-          </view>
-          <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="!wenhuoTimeDlgShow">
-            <view class="control_item_detail">
-              <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTemperatureTime(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"     @change="propChange(1)"  @focus="propFocus(2)" @confirm="propBlur(2)" @blur="propBlur(2)"   v-model="leftJianyaoTime"></u-input>
+               <view class="control_item_right" style="top: -3px" @click="addSecondTime(1)">+</view>
+             </view>
+           </view>
+           <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="!wenhuoTimeDlgShow">
+             <view class="control_item_detail">
+               <view class="control_item_left" style="left:22%;top:-41rpx" @click="subSecondTime(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"     @change="propChange(1)"  @focus="propFocus(2)" @confirm="propBlur(2)" @blur="propBlur(2)"   v-model="leftJianyaoTime"></u-input>
+               </view>
+               <view class="control_item_center_unit" style=";    font-size: 12px;
+      left: 37vw;
+      top: 13px;">min</view>
+               <view class="control_item_right" style="top: -3px" @click="addSecondTime(1)">+</view>
+             </view>
+           </view>
+         </view>
+          <view v-else>
+            <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="wenhuoTimeDlgShow">
+              <view class="control_item_detail">
+                <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTemperatureTime(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="FirstTime"/>
+                </view>
+                <view class="control_item_center_unit" style=";    font-size: 12px;
+      left: 37vw;
+      top: 13px;">min</view>
+                <view class="control_item_right" style="top: -3px" @click="addTemperatureTime(1)">+</view>
               </view>
-              <view class="control_item_center_unit" style=";    font-size: 12px;
+            </view>
+            <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="!wenhuoTimeDlgShow">
+              <view class="control_item_detail">
+                <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTemperatureTime(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"     @change="propChange(1)"  @focus="propFocus(2)" @confirm="propBlur(2)" @blur="propBlur(2)"   v-model="leftJianyaoTime"></u-input>
+                </view>
+                <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
       top: 13px;">min</view>
-              <view class="control_item_right" style="top: -3px" @click="addTemperatureTime(1)">+</view>
+                <view class="control_item_right" style="top: -3px" @click="addTemperatureTime(1)">+</view>
+              </view>
             </view>
           </view>
         </view>
@@ -711,7 +739,7 @@
             <view class="control_item_detail">
               <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTimeSecond(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="currentTimeSettingSecond"></u-input>
+                <u-input  fontSize="20px"  customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"    v-model="leftJianyaoTime"></u-input>
               </view>
               <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
@@ -1325,7 +1353,7 @@ export default {
       current:0,
       inputStyle:{height:'44rpx','fontSize':'20rpx'},
       modelKey:['PowerControl','LockControl'],
-      jianyaoKeys : ["TempSetting","TimeSetting","WaterVolume","SecondWaterVolume","AppointmentTime","TimeSettingFirst","TimeSettingSecond","SecondAddWaterTime","TempSettingFirst","FirstTemp","FirstTime"],
+      jianyaoKeys : ["SecondTime","TempSetting","TimeSetting","WaterVolume","SecondWaterVolume","AppointmentTime","TimeSettingFirst","TimeSettingSecond","SecondAddWaterTime","TempSettingFirst","FirstTemp","FirstTime"],
       baozhuangKeys:["SetSealTemp","SetBandingTemp","PackageQuantity","PackingVolume"],
       power:{
         loading:true,
@@ -1522,6 +1550,7 @@ export default {
       let obj  = {};
       obj.id = "DecoctingSwitch";
       obj.shadow = 0;
+      this.decoctControlStatus = false;
       arr.push(obj);
       this.mqttPublish(2,this.deviceInfo,arr,true)
     },
@@ -2851,6 +2880,31 @@ export default {
       }
 
     },
+    addSecondTime(){
+      this.SecondTime ++;
+      this.wenhuoTimeDlgShow = true;
+      this.changeSecondTime()
+    },
+    subSecondTime(){
+      this.SecondTime --;
+      if(this.SecondTime<15){
+        this.SecondTime = 15;
+      }
+      this.wenhuoTimeDlgShow = true;
+      this.changeSecondTime()
+    },
+    changeSecondTime(){
+      let min = 1;
+      let max = 600;
+      if(this.SecondTime<min){
+        this.SecondTime = min;
+      }
+      if(this.SecondTime>max){
+        this.SecondTime = max;
+      }
+      console.log("current temperatureTime is :"+this.SecondTime)
+      this.sendJianYao("SecondTime");
+    },
     changeFirstTime(){
       let min = 1;
       let max = 600;
@@ -3219,6 +3273,14 @@ export default {
               self.jianyaoShijianSetting = false;
             },self.resetDuration)
           }
+
+          if(key === "SecondTime"){
+            obj.shadow = this.SecondTime;
+            setTimeout(function(){
+              self.wenhuoTimeDlgShow = false;
+              self.jianyaoShijianSetting = false;
+            },self.resetDuration)
+          }
           if(key === "TempSettingFirst"){
             obj.shadow = this.tempSettingFirst;
             self.resetTempSettingFirstTimer();