wzh il y a 6 mois
Parent
commit
89aca2c945
2 fichiers modifiés avec 50 ajouts et 25 suppressions
  1. 28 8
      subpkg/device/detail_new_20250528.vue
  2. 22 17
      subpkg/device/setting.vue

+ 28 - 8
subpkg/device/detail_new_20250528.vue

@@ -272,7 +272,7 @@
                 <view class="control_item_left" @click="subTimeFirst(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="timeSettingFirst"></u-input>
+                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"   @confirm="propBlur(14)" @blur="propBlur(14)" v-model="timeSettingFirst"></u-input>
                   </view>
                 </view>
                 <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
@@ -305,7 +305,7 @@
                 <view class="control_item_left" @click="subTimeSecond(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="timeSettingSecond"></u-input>
+                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"  @confirm="propBlur(15)" @blur="propBlur(15)" v-model="timeSettingSecond"></u-input>
                   </view>
                 </view>
                 <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
@@ -625,7 +625,7 @@
              <view class="control_item_detail">
                <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTemperature(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(1)" @blur="propBlur(1)" v-model="FirstTemp"></u-input>
+                 <u-input fontSize="20px" customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"  @confirm="propBlur(13)" @blur="propBlur(13)"   v-model="FirstTemp"></u-input>
                </view>
                <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
@@ -637,7 +637,7 @@
              <view class="control_item_detail">
                <view class="control_item_left" style="left:22%;top:-41rpx" @click="subTemperature(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="currentTemperature"/>
+                 <u-input  fontSize="20px"  customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"   @change="propChange(1)"  @focus="this.wenduSetting = true"  v-model="currentTemperature"/>
                </view>
                <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
@@ -661,7 +661,7 @@
              <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>
+                 <u-input  fontSize="20px"  customStyle="width:150rpx;border:0px;font-size:20px" disabledColor="white"     @change="propChange(1)"  @focus="this.wenhuoTimeDlgShow = true" @confirm="propBlur(12)" @blur="propBlur(12)"   v-model="leftJianyaoTime"></u-input>
                </view>
                <view class="control_item_center_unit" style=";    font-size: 12px;
       left: 37vw;
@@ -2075,7 +2075,7 @@ export default {
             }
             self.productSize = ";width:"+imageWidth+"px;height:"+imgHeight+"px;";
           }else{
-            let rate = 0.35;
+            let rate = 0.42;
             if(windowHeight<800){
               rate = 0.30;
             }
@@ -2165,6 +2165,20 @@ export default {
         this.sendBaowenSetting();
       }
 
+      if(type == 12){
+        this.changeSecondTime()
+      }
+
+      if(type == 13){
+        this.changeFirstTemperature();
+      }
+      if(type ==14){
+        this.changeTimeFirst();
+      }
+      if(type ==15){
+        this.changeTimeSecond();
+      }
+
 
     },
     modifyName(){
@@ -3162,11 +3176,14 @@ export default {
         this.timeSettingFirst = 0;
       }
       this.editTimeSettingFirst = true;
-      this.sendJianYao("TimeSetFirst");
+      this.changeTimeFirst();
     },
     addTimeFirst(){
       this.timeSettingFirst = parseInt(this.timeSettingFirst) +1;
       this.editTimeSettingFirst = true;
+      this.changeTimeFirst();
+    },
+    changeTimeFirst(){
       this.sendJianYao("TimeSetFirst");
     },
     doAction(type){
@@ -3197,7 +3214,7 @@ export default {
     addTimeSecond(){
       this.timeSettingSecond = parseInt(this.timeSettingSecond) +1;
       this.editTimeSettingSecond = true;
-      this.sendJianYao("TimeSetSecond");
+      this.changeTimeSecond();
     },
     subTimeSecond(){
       this.timeSettingSecond = parseInt(this.timeSettingSecond) -1;
@@ -3205,6 +3222,9 @@ export default {
         this.timeSettingSecond = 0
       }
       this.editTimeSettingSecond = true;
+      this.changeTimeSecond();
+    },
+    changeTimeSecond(){
       this.sendJianYao("TimeSetSecond");
     },
     subWaterVolume(){

+ 22 - 17
subpkg/device/setting.vue

@@ -447,7 +447,7 @@
 
               <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>
+                  <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @confirm="propBlur(12)" @blur="propBlur(12)"  v-model="turnCurrent"></u-input>
 
                 </view>
               </view>
@@ -846,16 +846,16 @@ export default {
       this.sendJianYao("WaterRepair")
     },
     subTurnCurrent(){
-      this.setTurnCurrent--
-      if(this.setTurnCurrent<200){
-        this.setTurnCurrent = 200
+      this.turnCurrent--
+      if(this.turnCurrent<200){
+        this.turnCurrent = 200
       }
       this.sendJianYao("TurnCurrent")
     },
     addTurnCurrent(){
-      this.setTurnCurrent++
-      if(this.setTurnCurrent>999){
-        this.setTurnCurrent = 999
+      this.turnCurrent++
+      if(this.turnCurrent>999){
+        this.turnCurrent = 999
       }
       this.sendJianYao("TurnCurrent")
     },
@@ -2292,9 +2292,17 @@ 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"){
@@ -2346,14 +2354,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){