diff --git a/src/views/page/air-conditioning.vue b/src/views/page/air-conditioning.vue
index 543eb33..bc99c1c 100644
--- a/src/views/page/air-conditioning.vue
+++ b/src/views/page/air-conditioning.vue
@@ -95,7 +95,6 @@
             >
           </el-dropdown-menu>
         </el-dropdown>
-       <span>(0是空调自动调整风速) </span>
       </div>
     </div>
     <div class="flex-view padding-none shrink-none">
@@ -198,7 +197,7 @@
         <span>制冷时段启用</span>
       </div>
     </div>
-    <div class="flex-view padding-none border-none shrink-none">
+    <div class="flex-view padding-none shrink-none">
       <div class="input-main-60">
         <span></span><span></span><span></span><span></span><span></span><span></span><span></span>
         <span>工作时段</span>
@@ -344,6 +343,41 @@
         <span></span><span></span><span></span><span></span><span></span><span></span><span></span>
         <span class="tips">实时温度<目标温度-空调停机温度差值，空调停机</span>
       </div>
+    </div>
+      <div class="flex-view padding-none border-none shrink-none" v-if="inputData[22042]==5">
+      <div class="input-main-60">
+        <span></span><span></span><span></span><span></span><span></span><span></span>
+        <span>冷暖模式:</span>
+    
+      </div>
+    </div>
+      <div class="flex-view padding-none border-none shrink-none" v-if="inputData[22042]==5">
+      <div class="input-main-60">
+        <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
+        <span>空调制冷，制热切换时间</span>
+        <input
+          @blur="blurChange(22061, $event)"
+          v-model="inputData[22061]"
+          @input="change(22061, $event)"
+          type="text"
+          placeholder="0"
+        />
+        <span>秒</span>
+      </div>
+    </div>
+    <div class="flex-view padding-none border-none shrink-none" v-if="inputData[22042]==5">
+      <div class="input-main-60">
+        <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
+        <span>冷暖模式温度允许误差值</span>
+        <input
+          @blur="blurChange10(22062, $event)"
+          v-model="inputData[22062]"
+          @input="changeCount10(22062, $event)"
+          type="text"
+          placeholder="0"
+        />
+        <span>℃</span>
+      </div>
     </div>
     <div class="flex-view padding-none border-none shrink-none">
          <div class="input-main">
@@ -381,6 +415,7 @@
         <span>分钟后启动空调</span>
       </div>
     </div>
+   
   </div>
 </template>
 <script>
@@ -408,6 +443,7 @@ export default {
         { label: "制热模式", value: 2 },
         { label: "除湿模式", value: 3 },
         { label: "送风模式", value: 4 },
+        { label: "冷暖模式", value: 5 },
       ],
     };
   },
@@ -616,6 +652,7 @@ export default {
           this.inputData[22044] = this.countData10(this.inputData[22044]);
           this.inputData[22059] = this.countData10(this.inputData[22059]);
           this.inputData[22060] = this.countData10(this.inputData[22060]);
+          this.inputData[22062] = this.countData10(this.inputData[22062]);
           this.inputDataNew[22041] = this.getData1(this.inputData[22041]);
           this.inputDataNew[22042] = this.getData2(this.inputData[22042]);
           this.getActive1();
diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue
index 375bc80..9feb0c7 100644
--- a/src/views/page/realTime.vue
+++ b/src/views/page/realTime.vue
@@ -324,9 +324,9 @@
                                  <div class="sel-auto" v-if="item.count==4">
                                     送风模式
                                 </div>
-                                <!-- <div class="sel-auto" v-if="item.count==5">
+                                <div class="sel-auto" v-if="item.count==5">
                                     冷暖模式
-                                </div> -->
+                                </div>
                             </div>
                           <div class="status-fan status-btn">
                                 <div class="btn" :class="item.index == 1 ? 'blue' : 'off'">
@@ -958,7 +958,7 @@ export default {
         },
         getNumberStatus(item) {
             var index = item.index
-            if (item.type == 2 || item.type == 5 || item.type == 6 || item.type == 12) {
+            if (item.type == 2 || item.type == 5 || item.type == 6 ) {
                 //顶卷膜
                 if (index == 0) {
                     return '静止状态'
@@ -982,7 +982,7 @@ export default {
                     return ''
                 }
            }
-            if(item.type == 15){
+            if(item.type == 15|| item.type == 12){
              if (index == 0) {
                     return '静止状态'
                 } else if (index == 1) {