1

src/assets/css/main.css

@@ -438,6 +438,7 @@
 .index .header .header-right > img {
   width: 40px;
   height: 40px;
+  flex-shrink: 0;
 }
 
 .index .header .header-right .user-data {
@@ -445,7 +446,7 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
-  padding: 0 20px 0 10px;
+  padding: 0 5px 0 10px;
   margin-right: 20px;
   border-right: 1px solid rgba(255, 255, 255, 0.2);
 }
@@ -470,6 +471,7 @@
   background: url(../image/login-out.png) no-repeat center;
   background-size: 100% 100%;
   cursor: pointer;
+  flex-shrink: 0;
 }
 
 .index .header .header-right .login-out:hover {

src/assets/css/main.scss

@@ -466,6 +466,7 @@
             >img {
                 width: 40px;
                 height: 40px;
+                flex-shrink: 0;
             }
 
             .user-data {
@@ -473,7 +474,7 @@
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
-                padding: 0 20px 0 10px;
+                padding: 0 5px 0 10px;
                 margin-right: 20px;
                 border-right: 1px solid rgba(255, 255, 255, 0.2);
 
@@ -498,7 +499,7 @@
                 background: url(../image/login-out.png) no-repeat center;
                 background-size: 100% 100%;
                 cursor: pointer;
-
+                flex-shrink: 0;
                 &:hover {
                     background: url(../image/login-out-hover.png) no-repeat center;
                     background-size: 100% 100%;

src/views/page/irrigateSet.vue

@@ -773,6 +773,12 @@ export default {
     };
   },
   watch: {
+    '$store.state.equipmentIndex': function(newValue, oldValue) {
+      const that = this;
+    setTimeout(() => {
+      that.dataInit();
+    }, 0);
+    },
     $route(newVal, oldVal) {
       const that = this;
       this.indexs = this.$route.query.id ? this.$route.query.id : 1;

src/views/page/wetFan.vue

@@ -271,6 +271,9 @@
                 <span>湿帘外翻窗1模式:</span>
             </div>
             <div class="input-btn ">
+                <div class="btn" @click="changeOpen(0,21974)" :class="inputData[21974] == 0 ? 'blue' : 'green'">
+                   无效
+                </div>
                 <div class="btn" @click="changeOpen(1,21974)" :class="inputData[21974] == 1 ? 'blue' : 'green'">
                     <img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
                 </div>
@@ -318,6 +321,9 @@
                 <span>湿帘外翻窗2模式:</span>
             </div>
             <div class="input-btn ">
+                <div class="btn" @click="changeOpen(0,21979)" :class="inputData[21979] == 0 ? 'blue' : 'green'">
+                    无效
+                </div>
                 <div class="btn" @click="changeOpen(1,21979)" :class="inputData[21979] == 1 ? 'blue' : 'green'">
                     <img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
                 </div>