修改参数

subpkg/device/detail_new_20250528.vue

@@ -132,14 +132,14 @@
           <view class="control_item" v-if=" 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_left" @click="subNewTemperatureTime(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>
               <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
-              <view class="control_item_right" style="left: 74%;" @click="addTemperatureTime(1)">+</view>
+              <view class="control_item_right" style="left: 74%;" @click="addNewTemperatureTime(1)">+</view>
             </view>
             <view class="control_item_title">
               时间设置
@@ -506,56 +506,59 @@
         </view>
 
         <view v-if="statusHandler.type == 3">
-          <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="editTempSettingFirst">
-            <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"    v-model="tempSettingFirst"/>
-              </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="editTempSettingFirst">
+              <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"    v-model="tempSettingFirst"/>
+                </view>
+                <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
       top: 13px;">℃</view>
-              <view class="control_item_right" style="top: -3px" @click="addTempSettingFirst(1)">+</view>
-            </view>
-          </view>
-          <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="!editTempSettingFirst">
-            <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="currentTemperature"/>
+                <view class="control_item_right" style="top: -3px" @click="addTempSettingFirst(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="!editTempSettingFirst">
+              <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="currentTemperature"/>
+                </view>
+                <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
       top: 13px;">℃</view>
-              <view class="control_item_right" style="top: -3px" @click="addTempSettingFirst(1)">+</view>
+                <view class="control_item_right" style="top: -3px" @click="addTempSettingFirst(1)">+</view>
+              </view>
             </view>
-          </view>
 
 
-          <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="!editTimeSettingFirst">
-            <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="leftJianyaoTime"/>
-              </view>
-              <view class="control_item_center_unit" style=";    font-size: 12px;
+            <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="!editTimeSettingFirst">
+              <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="leftJianyaoTime"/>
+                </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="addTimeFirst(1)">+</view>
-            </view>
-          </view>
-          <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="editTimeSettingFirst">
-            <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="timeSettingFirst"/>
+                <view class="control_item_right" style="top: -3px" @click="addTimeFirst(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="editTimeSettingFirst">
+              <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="timeSettingFirst"/>
+                </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="addTimeFirst(1)">+</view>
+                <view class="control_item_right" style="top: -3px" @click="addTimeFirst(1)">+</view>
+              </view>
             </view>
           </view>
+
         </view>
 
 
@@ -712,6 +715,56 @@
                 </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>
+          <view v-else-if="firstJianyaoMode == 5">
+            <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="wenduSetting">
+              <view class="control_item_detail">
+                <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTemperature(4)">-</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(1)" @blur="propBlur(1)" v-model="temperature"></u-input>
+                </view>
+                <view class="control_item_center_unit" style=";    font-size: 12px;
+      left: 37vw;
+      top: 13px;">℃</view>
+                <view class="control_item_right" style="top: -3px" @click="addTemperature(4)">+</view>
+              </view>
+            </view>
+            <view class="control_item" style="width: 100%;background: white;height: 90rpx" v-if="!wenduSetting">
+              <view class="control_item_detail">
+                <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTemperature(5)">-</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="currentTemperature"/>
+                </view>
+                <view class="control_item_center_unit" style=";    font-size: 12px;
+      left: 37vw;
+      top: 13px;">℃</view>
+                <view class="control_item_right" style="top: -3px" @click="addTemperature(5)">+</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"     v-model="temperatureTime"/>
+                </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>
+                <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>
@@ -1427,7 +1480,7 @@ export default {
       current:0,
       inputStyle:{height:'44rpx','fontSize':'20rpx'},
       modelKey:['PowerControl','LockControl'],
-      jianyaoKeys : ["SecondTime","TempSetting","TimeSetting","WaterVolume","SecondWaterVolume","AppointmentTime","TimeSettingFirst","TimeSettingSecond","SecondAddWaterTime","TempSettingFirst","FirstTemp","FirstTime"],
+      jianyaoKeys : ["SecondTime","TempSetting","TimeSetting","WaterVolume","SecondWaterVolume","AppointmentTime","TimeSetFirst","TimeSetSecond","SecondAddWaterTime","TempSetFirst","FirstTemp","FirstTime"],
       baozhuangKeys:["SetSealTemp","SetBandingTemp","PackageQuantity","PackingVolume"],
       power:{
         loading:true,
@@ -2917,7 +2970,7 @@ export default {
       this.editSecondAddWaterTime = true;
       this.sendJianYao("SecondAddWaterTime")
     },
-    addTemperatureTime(){
+    addTemperatureTime(type){
       if(this.jianyaoMode == 0){
         console.log("增加煎药时间")
         if(!this.wenhuoTimeDlgShow){
@@ -2932,7 +2985,40 @@ export default {
         this.changeFirstTime()
       }
     },
-    subTemperatureTime(){
+    subNewTemperatureTime(type){
+      this.temperatureTime--;
+      let min = 1;
+      let max = 600;
+      if(this.temperatureTime<min){
+        this.temperatureTime = min;
+      }
+      if(this.temperatureTime>max){
+        this.temperatureTime = max;
+      }
+      this.sendData("TimeSetting",this.temperatureTime)
+    },
+    addNewTemperatureTime(type){
+      this.temperatureTime++
+      let min = 1;
+      let max = 600;
+      if(this.temperatureTime<min){
+        this.temperatureTime = min;
+      }
+      if(this.temperatureTime>max){
+        this.temperatureTime = max;
+      }
+      this.sendData("TimeSetting",this.temperatureTime)
+    },
+    sendData(key,value){
+      let obj = {};
+      let arr = [];
+
+      obj.id = key;
+      obj.shadow = value;
+      arr.push(obj);
+      this.mqttPublish(2,this.deviceInfo,arr,true)
+    },
+    subTemperatureTime(type){
       if(this.jianyaoMode == 0){
         console.log("减少煎药时间")
         if(!this.wenhuoTimeDlgShow){
@@ -3076,12 +3162,12 @@ export default {
         this.timeSettingFirst = 0;
       }
       this.editTimeSettingFirst = true;
-      this.sendJianYao("TimeSettingFirst");
+      this.sendJianYao("TimeSetFirst");
     },
     addTimeFirst(){
       this.timeSettingFirst = parseInt(this.timeSettingFirst) +1;
       this.editTimeSettingFirst = true;
-      this.sendJianYao("TimeSettingFirst");
+      this.sendJianYao("TimeSetFirst");
     },
     doAction(type){
       if(type == 3){
@@ -3111,7 +3197,7 @@ export default {
     addTimeSecond(){
       this.timeSettingSecond = parseInt(this.timeSettingSecond) +1;
       this.editTimeSettingSecond = true;
-      this.sendJianYao("TimeSettingSecond");
+      this.sendJianYao("TimeSetSecond");
     },
     subTimeSecond(){
       this.timeSettingSecond = parseInt(this.timeSettingSecond) -1;
@@ -3119,7 +3205,7 @@ export default {
         this.timeSettingSecond = 0
       }
       this.editTimeSettingSecond = true;
-      this.sendJianYao("TimeSettingSecond");
+      this.sendJianYao("TimeSetSecond");
     },
     subWaterVolume(){
       if(this.jianyaoMode == 0){
@@ -3230,12 +3316,15 @@ export default {
       if(this.tempSettingFirst <0){
         this.tempSettingFirst = 0
       }
-      this.sendJianYao("TempSettingFirst")
+      this.sendJianYao("TempSetFirst")
     },
     addTempSettingFirst(){
       this.editTempSettingFirst = true;
       this.tempSettingFirst ++;
-      this.sendJianYao("TempSettingFirst")
+      if(this.tempSettingFirst>105){
+        this.tempSettingFirst = 105;
+      }
+      this.sendJianYao("TempSetFirst")
     },
     subPlanTime(type){
       console.log("减少预约时间")
@@ -3326,9 +3415,16 @@ export default {
         clearTimeout(this.jianyaoTimer);
       }
 
-      this.jianyaoTimer = setTimeout(function (){
-        for (let i = 0; i <this.jianyaoKeys.length; i++) {
-          let key = this.jianyaoKeys[i];
+      this.jianyaoTimer = setTimeout(function (targetKey){
+        let isExist = false;
+        for (let j = 0; j <this.jianyaoKeys.length; j++) {
+          let key = this.jianyaoKeys[j];
+          if(key == targetKey){
+            isExist = true;
+          }
+        }
+        if(isExist){
+          let key = targetKey
           let obj = {};
           obj.id = key;
           if(key === "TempSetting"){
@@ -3355,7 +3451,7 @@ export default {
               self.jianyaoShijianSetting = false;
             },self.resetDuration)
           }
-          if(key === "TempSettingFirst"){
+          if(key === "TempSetFirst"){
             obj.shadow = this.tempSettingFirst;
             self.resetTempSettingFirstTimer();
           }
@@ -3363,20 +3459,12 @@ export default {
             obj.shadow = this.secondAddWaterTime;
             self.resetSecondAddWaterTimeTimer();
           }
-          if(key === "TimeSettingFirst"){
+          if(key === "TimeSetFirst"){
             obj.shadow = this.timeSettingFirst
-            // setTimeout(function(){
-            //   self.wenhuoTimeDlgShow = false;
-            //   self.jianyaoShijianSetting = false;
-            // },self.resetDuration)
             self.resetTimeSettingFirst()
           }
-          if(key === "TimeSettingSecond"){
+          if(key === "TimeSetSecond"){
             obj.shadow = this.timeSettingSecond
-            // setTimeout(function(){
-            //   self.wenhuoTimeDlgShow = false;
-            //   self.jianyaoShijianSetting = false;
-            // },self.resetDuration)
             self.resetTimeSettingSecond()
           }
           if(key === "WaterVolume"){
@@ -3401,14 +3489,11 @@ export default {
               self.jianyaoShijianSetting = false;
             },self.resetDuration)
           }
-          if(targetKey == key){
-            arr.push(obj);
-            break;
-          }
-
+          arr.push(obj);
+          this.mqttPublish(2,this.deviceInfo,arr,true)
         }
-        this.mqttPublish(2,this.deviceInfo,arr,true)
-      }.bind(this),500);
+
+      }.bind(this,targetKey),500);
     },
     buildPropKey(key){
         if(this.childId !=0){
@@ -3816,7 +3901,6 @@ export default {
       getDetail(this.id).then(res=>{
         self.deviceInfo = res.data;
         self.deviceType = res.data.type;
-        self.deviceType = 23
         let msg = res.msg;
         if(msg){
           try{
@@ -4203,10 +4287,12 @@ export default {
         this.setPropValue(id,"AppointmentTime","planTime",value,0)
 
 
-        this.setPropValue(id,"TimeSettingFirst","timeSettingFirst",value,0)
+        this.setPropValue(id,"TempSetFirst","tempSettingFirst",value,0)
+
+        this.setPropValue(id,"TimeSetFirst","timeSettingFirst",value,0)
         this.setPropValue(id,"CurrentTimeSettingFirst","currentTimeSettingFirst",value,0)
 
-        this.setPropValue(id,"TimeSettingSecond","timeSettingSecond",value,0)
+        this.setPropValue(id,"TimeSetSecond","timeSettingSecond",value,0)
         this.setPropValue(id,"CurrentTimeSettingSecond","currentTimeSettingSecond",value,0)
 
         this.setPropValue(id,"SecondAddWaterTime","secondAddWaterTime",value,0)
@@ -4543,14 +4629,14 @@ export default {
       if(msgId === "DrainageTurn"){
         this.drainageTurn = obj.value
       }
-      if(msgId === "TimeSettingFirst"){
+      if(msgId === "TimeSetFirst"){
         this.timeSettingFirst = obj.value;
       }
       if(msgId === "CurrentTimeSettingFirst"){
         this.currentTimeSettingFirst = obj.value;
       }
 
-      if(msgId === "TimeSettingSecond"){
+      if(msgId === "TimeSetSecond"){
         this.timeSettingSecond = obj.value;
       }
       if(msgId === "CurrentTimeSettingSecond"){
@@ -4598,8 +4684,9 @@ export default {
         this.secondWaterVolume = parseInt(obj.value)/10;
       }
 
-
-
+      if(msgId == "TempSetFirst"){
+        this.tempSettingFirst = obj.value
+      }
 
 
     },