wzh 6 mēneši atpakaļ
vecāks
revīzija
07f7c38814
2 mainītis faili ar 102 papildinājumiem un 28 dzēšanām
  1. 98 24
      subpkg/device/detail_new_20250528.vue
  2. 4 4
      subpkg/device/setting.vue

+ 98 - 24
subpkg/device/detail_new_20250528.vue

@@ -615,33 +615,33 @@
 
 
         <view v-if="statusHandler.type == 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(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="temperature"></u-input>
-              </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="wenduSetting">
+             <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>
+               </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(1)">+</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(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"/>
-              </view>
-              <view class="control_item_center_unit" style=";    font-size: 12px;
+               <view class="control_item_right" style="top: -3px" @click="addTemperature(1)">+</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(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"/>
+               </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(1)">+</view>
-            </view>
-          </view>
-
-
-         <view v-if="secondJianyaoMode == 10">
+               <view class="control_item_right" style="top: -3px" @click="addTemperature(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>
@@ -667,7 +667,81 @@
              </view>
            </view>
          </view>
+          <view v-else-if="secondJianyaoMode == 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(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>
+                </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(1)">+</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(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"/>
+                </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(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"     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>
+            <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>
+            </view>
+          </view>
           <view v-else>
+            <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(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="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(1)">+</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(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"/>
+                </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(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>
@@ -796,7 +870,7 @@
           </view>
         </view>
         <view v-else>
-          <view v-if="statusHandler.type !=9">>
+          <view v-if="statusHandler.type !=9">
             <view style="position: relative" @click="doAction(1)" v-if="pauseStatus == 0">
               <view style="background: white;height: 60px;width: 90px;position: relative;border-radius: 10px;left: 33%;top: 10px;">
                 <view style="height: 30%;width: 20%;    position: relative;left: 40%;top: 20%;">

+ 4 - 4
subpkg/device/setting.vue

@@ -502,7 +502,7 @@
             <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>
+                  <u-input  customStyle="width:150rpx;border:0px;" disabled="" disabledColor="white"   v-model="currentWaterVolume"></u-input>
 
                 </view>
               </view>
@@ -533,7 +533,7 @@
             </view>
           </view>
           <view style="    width: 100%;
-display: flex;text-align: center">
+display: flex;text-align: center;margin-bottom: 15px">
             <view style="color:rgb(217,28,18);width: 50%;border-right: 1px solid rgb(144,144,144)" @click="openWashSwitch(0)">
               停止
             </view>
@@ -854,8 +854,8 @@ export default {
     },
     addTurnCurrent(){
       this.setTurnCurrent++
-      if(this.setTurnCurrent>400){
-        this.setTurnCurrent = 400
+      if(this.setTurnCurrent>999){
+        this.setTurnCurrent = 999
       }
       this.sendJianYao("TurnCurrent")
     },