feat修改参数

subpkg/device/detail_new_20250528.vue

@@ -79,7 +79,7 @@
       </view>
       <view class="control_area" v-if="firstTab" :style="boardStyle">
         <view class="control" v-if="boardType ==6">
-          <view class="control_item" v-if="wenduSetting && jianyaoMode == 0">
+          <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="subTemperature(1)">-</view>
@@ -96,7 +96,7 @@
             </view>
           </view>
 
-          <view class="control_item" v-if="wenduSetting && jianyaoMode == 1">
+          <view class="control_item" v-if="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>
@@ -112,24 +112,24 @@
               设置温度
             </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">
-                <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" disabled="" v-model="currentTemperature"></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">-->
+<!--                <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" disabled="" v-model="currentTemperature"></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="wenhuoTimeDlgShow && jianyaoMode == 0">
+          <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>
@@ -146,7 +146,7 @@
             </view>
           </view>
 
-          <view class="control_item" v-if="wenhuoTimeDlgShow && jianyaoMode == 1">
+          <view class="control_item" v-if=" 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>
@@ -163,26 +163,26 @@
             </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">
-                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"  @change="propChange(1)"  @focus="propFocus(2)" @confirm="propBlur(2)" @blur="propBlur(2)"   v-model="leftJianyaoTime"></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;"/>-->
+<!--              <view class="control_item_detail">-->
+<!--                <view class="control_item_left" @click="subTemperatureTime(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(2)" @confirm="propBlur(2)" @blur="propBlur(2)"   v-model="leftJianyaoTime"></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 style="position: relative;top:-2vh">
-            <view class="control_item" v-if="planEditTime">
+            <view class="control_item">
               <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="subPlanTime(1)">-</view>
@@ -194,27 +194,27 @@
                 <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
                 <view class="control_item_right" style="left: 74%;"  @click="addPlanTime(1)">+</view>
               </view>
-              <view class="control_item_title">
-                设置预约时间
-              </view>
-            </view>
-            <view class="control_item" v-if="!planEditTime">
-              <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="subPlanTime(1)">-</view>
-                <view class="control_item_center">
-                  <view style="position: absolute">
-                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @change="propChange(8)"  @focus="propFocus(8)" @confirm="propBlur(8)" @blur="propBlur(8)" v-model="leftAppointmentTime"></u-input>
-                  </view>
-                </view>
-                <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
-                <view class="control_item_right" style="left: 74%;"  @click="addPlanTime(1)">+</view>
-              </view>
               <view class="control_item_title">
                 预约时间
               </view>
             </view>
-              <view class="control_item"  v-if="editWaterVolume && jianyaoMode == 0">
+<!--            <view class="control_item" v-if="!planEditTime">-->
+<!--              <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="subPlanTime(1)">-</view>-->
+<!--                <view class="control_item_center">-->
+<!--                  <view style="position: absolute">-->
+<!--                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" @change="propChange(8)"  @focus="propFocus(8)" @confirm="propBlur(8)" @blur="propBlur(8)" v-model="leftAppointmentTime"></u-input>-->
+<!--                  </view>-->
+<!--                </view>-->
+<!--                <view class="control_item_center_unit" :style="unitFixedStyle">min</view>-->
+<!--                <view class="control_item_right" style="left: 74%;"  @click="addPlanTime(1)">+</view>-->
+<!--              </view>-->
+<!--              <view class="control_item_title">-->
+<!--                预约时间-->
+<!--              </view>-->
+<!--            </view>-->
+              <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="subWaterVolume(1)">-</view>
@@ -230,7 +230,7 @@
                   煎药水量
                 </view>
               </view>
-              <view class="control_item"  v-if="editWaterVolume && jianyaoMode == 1">
+              <view class="control_item"  v-if="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>
@@ -246,27 +246,27 @@
                   煎药水量
                 </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"  v-model="currentWaterVolume"></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 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"  v-model="currentWaterVolume"></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 style="position: relative;top:-4vh">
-            <view class="control_item" v-if="editTimeSettingFirst">
+            <view class="control_item">
               <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="subTimeFirst(1)">-</view>
@@ -278,28 +278,28 @@
                 <view class="control_item_center_unit" :style="unitFixedStyle">分钟</view>
                 <view class="control_item_right" style="left: 74%;" @click="addTimeFirst(1)">+</view>
               </view>
-              <view class="control_item_title">
-                设置先煎时间
-              </view>
-            </view>
-
-            <view class="control_item" v-if="!editTimeSettingFirst">
-              <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="subTimeFirst(1)">-</view>
-                <view class="control_item_center">
-                  <view style="position: absolute">
-                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" v-model="currentTimeSettingFirst"></u-input>
-                  </view>
-                </view>
-                <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
-                <view class="control_item_right" style="left: 74%;" @click="addTimeFirst(1)">+</view>
-              </view>
               <view class="control_item_title">
                 先煎时间
               </view>
             </view>
-            <view class="control_item" v-if="editTimeSettingSecond">
+
+<!--            <view class="control_item" v-if="!editTimeSettingFirst">-->
+<!--              <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="subTimeFirst(1)">-</view>-->
+<!--                <view class="control_item_center">-->
+<!--                  <view style="position: absolute">-->
+<!--                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white" v-model="currentTimeSettingFirst"></u-input>-->
+<!--                  </view>-->
+<!--                </view>-->
+<!--                <view class="control_item_center_unit" :style="unitFixedStyle">min</view>-->
+<!--                <view class="control_item_right" style="left: 74%;" @click="addTimeFirst(1)">+</view>-->
+<!--              </view>-->
+<!--              <view class="control_item_title">-->
+<!--                先煎时间-->
+<!--              </view>-->
+<!--            </view>-->
+            <view class="control_item">
               <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="subTimeSecond(1)">-</view>
@@ -311,28 +311,28 @@
                 <view class="control_item_center_unit" :style="unitFixedStyle">min</view>
                 <view class="control_item_right" style="left: 74%;" @click="addTimeSecond(1)">+</view>
               </view>
-              <view class="control_item_title">
-                设置后下时间
-              </view>
-            </view>
-
-            <view class="control_item" v-if="!editTimeSettingSecond">
-              <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="subTimeSecond(1)">-</view>
-                <view class="control_item_center">
-                  <view style="position: absolute">
-                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"  v-model="currentTimeSettingSecond"></u-input>
-                  </view>
-                </view>
-                <view class="control_item_center_unit" :style="unitFixedStyle">分钟</view>
-                <view class="control_item_right" style="left: 74%;" @click="addTimeSecond(1)">+</view>
-              </view>
               <view class="control_item_title">
                 后下时间
               </view>
             </view>
 
+<!--            <view class="control_item" v-if="!editTimeSettingSecond">-->
+<!--              <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="subTimeSecond(1)">-</view>-->
+<!--                <view class="control_item_center">-->
+<!--                  <view style="position: absolute">-->
+<!--                    <u-input  customStyle="width:150rpx;border:0px;" disabledColor="white"  v-model="currentTimeSettingSecond"></u-input>-->
+<!--                  </view>-->
+<!--                </view>-->
+<!--                <view class="control_item_center_unit" :style="unitFixedStyle">分钟</view>-->
+<!--                <view class="control_item_right" style="left: 74%;" @click="addTimeSecond(1)">+</view>-->
+<!--              </view>-->
+<!--              <view class="control_item_title">-->
+<!--                后下时间-->
+<!--              </view>-->
+<!--            </view>-->
+
           </view>
 
 

subpkg/device/setting.vue

@@ -532,7 +532,20 @@
               水量修正
             </view>
           </view>
-
+          <view style="    width: 100%;
+display: flex;text-align: center">
+            <view style="color:rgb(217,28,18);width: 50%;border-right: 1px solid rgb(144,144,144)" @click="openWashSwitch(0)">
+              停止
+            </view>
+            <view style="color:rgb(81,220,21);width: 50%" @click="openWashSwitch(1)">
+              启动
+            </view>
+<!--            <view class="bottom_item" @click="turnChange(3)" style="width: 50%">-->
+<!--              <image v-if="!qingxiTurn" :src="imgUrl+'/img20250528/qingxi_off.png'" style="width: 32%;height:32%;"/>-->
+<!--              <image v-if="qingxiTurn" :src="imgUrl+'/img20250528/qingxi_on.png'" style="width: 32%;height:32%;"/>-->
+<!--              <view :class="pressTurn == 1?'active_on':''">清洗</view>-->
+<!--            </view>-->
+          </view>
         </view>
       </u-popup>
 
@@ -1930,6 +1943,14 @@ export default {
       arr.push(obj);
       this.mqttPublish(2,this.deviceInfo,arr)
     },
+    openWashSwitch(flag){
+      let arr = [];
+      let obj = {};
+      obj.shadow = flag;
+      obj.id = "WashSwitch";
+      arr.push(obj);
+      this.mqttPublish(2,this.deviceInfo,arr)
+    },
     turnChange(type){
       let flag = false;
       let obj = {};