diff --git a/dist.zip b/dist.zip
index 37d1e9e..7a0070a 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ

diff --git a/dist.zip b/dist.zip
index 37d1e9e..7a0070a 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/components/ConditionMonitoring/ConditionMonitoring.vue b/src/components/ConditionMonitoring/ConditionMonitoring.vue
index efb20c1..bad451c 100644
--- a/src/components/ConditionMonitoring/ConditionMonitoring.vue
+++ b/src/components/ConditionMonitoring/ConditionMonitoring.vue
@@ -12,31 +12,44 @@
     </div>
     <div class="picbox">
       <img src=" ./../../../static/img/ZhuangtaiJianKong/hong.png" v-if="list.state == 1" />
-
+      <img
+        src="./../../../static/img/ZhuangtaiJianKong/lv0.png"
+        v-if="list.state == 0 && list.flow == 0"
+      />
       <img
         src=" ./../../../static/img/ZhuangtaiJianKong/lv30.png"
-        v-if="list.state == 0 && list.openLevel <= 35.00"
+        v-if="list.state == 0 && list.openLevel <= 35.00 && list.flow != 0"
       />
       <img
         src=" ./../../../static/img/ZhuangtaiJianKong/lv50.png"
-        v-if="list.state == 0 && 35 < list.openLevel  &&  list.openLevel <= 55"
+        v-if="list.state == 0 && 35 < list.openLevel  &&  list.openLevel <= 55 && list.flow != 0"
       />
       <img
         src=" ./../../../static/img/ZhuangtaiJianKong/lv75.png"
-        v-if="list.state == 0 && 55 < list.openLevel  && list.openLevel <= 75.00"
+        v-if="list.state == 0 && 55 < list.openLevel  && list.openLevel <= 75.00 && list.flow != 0"
       />
       <img
         src=" ./../../../static/img/ZhuangtaiJianKong/lv100.png"
-        v-if="list.state == 0 && 75 < list.openLevel && list.openLevel <= 100.00"
+        v-if="list.state == 0 && 75 < list.openLevel && list.openLevel <= 100.00 && list.flow != 0"
       />
       <div class="watermessage">
-        <span class="waterMsg">水位：{{list.waterLevel}} {{list.waterLevelUnit}}</span>
+        <span class="waterMsg">
+          水位：
+          <span class="NumValue">{{list.waterLevel}}</span>
+          {{list.waterLevelUnit}}
+        </span>
       </div>
       <div class="waterposition">
         <el-progress :text-inside="true" :stroke-width="16" :percentage="list.percentage"></el-progress>
       </div>
       <div class="controlpersent" v-show="controlFlag">
-        <el-select size="mini" v-model="value" placeholder="请选择" @change="selControl">
+        <el-select
+          size="mini"
+          v-model="value"
+          placeholder="请选择"
+          @change="selControl"
+          style="background: rgba(0,0,0,.3);"
+        >
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -46,10 +59,18 @@
         </el-select>
       </div>
       <div class="openpersent" @click="controlFlag = !controlFlag">
-        <span class="waterMsg">开合度：{{list.openLevel}} {{list.openLevelUnit}}</span>
+        <span class="waterMsg">
+          开合度：
+          <span class="NumValue">{{list.openLevel}}</span>
+          {{list.openLevelUnit}}
+        </span>
       </div>
       <div class="liuliang">
-        <span class="waterMsg">流量：{{list.flow}} {{list.flowUnit}}</span>
+        <span class="waterMsg">
+          流量：
+          <span class="NumValue">{{list.flow}}</span>
+          {{list.flowUnit}}
+        </span>
       </div>
       <div class="bengji" v-if="list.stateDetail">
         <div class="waterMsg bjbox">
@@ -59,16 +80,31 @@
           >{{list.stateZn}}</span>
         </div>
         <div class="waterMsg bjbox">
-          A相电压/电流：{{list.stateDetail.voltage1}}
-          V&nbsp;&nbsp;&nbsp;&nbsp;{{list.stateDetail.electricity1}} A
+          A相电压/电流 ：
+          <span class="NumValue valueLength">{{list.stateDetail.voltage1}}</span>
+          V&nbsp;&nbsp;&nbsp;&nbsp;
+          <span
+            class="NumValue valueLength"
+          >{{list.stateDetail.electricity1}}</span>
+          A
         </div>
         <div class="waterMsg bjbox">
-          B相电压/电流：{{list.stateDetail.voltage2}}
-          V&nbsp;&nbsp;&nbsp;&nbsp;{{list.stateDetail.electricity2}} A
+          B相电压/电流：
+          <span class="NumValue valueLength">{{list.stateDetail.voltage2}}</span>
+          V&nbsp;&nbsp;&nbsp;&nbsp;
+          <span
+            class="NumValue valueLength"
+          >{{list.stateDetail.electricity2}}</span>
+          A
         </div>
         <div class="waterMsg bjbox">
-          C相电压/电流：{{list.stateDetail.voltage3}}
-          V&nbsp;&nbsp;&nbsp;&nbsp;{{list.stateDetail.electricity3}} A
+          C相电压/电流：
+          <span class="NumValue valueLength">{{list.stateDetail.voltage3}}</span>
+          V&nbsp;&nbsp;&nbsp;&nbsp;
+          <span
+            class="NumValue valueLength"
+          >{{list.stateDetail.electricity3}}</span>
+          A
         </div>
       </div>
     </div>
@@ -164,6 +200,7 @@
         }
       ],
       value: "",
+      OldValue: "",
       list: {},
       waterLevel: 0,
       icount: "",
@@ -188,6 +225,8 @@
       };
       ws.onmessage = function(message) {
         _this.list = JSON.parse(message.data);
+        _this.value = _this.list.openLevel;
+        _this.OldValue = _this.value;
         //   console.log(_this.list)
       };
       ws.onerror = function(error) {
@@ -223,7 +262,7 @@
 
       let params = {
         data: {
-          stationid: 3,
+          stationid: 1,
           pumpid: 1,
           deviceid: 1,
           state: i
@@ -261,7 +300,7 @@
       // clearInterval(this.icount);
       let params = {
         data: {
-          stationid: 3,
+          stationid: 1,
           pumpid: 1,
           deviceid: 1,
           state: 4,
@@ -285,6 +324,8 @@
               type: "error"
             });
           }
+          // 操作成功后保存此次的状态 zhangqy
+          this.OldValue = this.value;
         })
         .catch(res => {
           this.closeFullScreen2();
@@ -293,6 +334,8 @@
             message: "网络超时，请刷新后再次请求",
             type: "error"
           });
+          // 操作失败后还原到记录的OldValue状态 zhangqy
+          this.value = this.OldValue;
         });
     }
   }
@@ -376,7 +419,7 @@
   position: absolute;
   /* border: 1px solid red; */
   top: 48%;
-  left:20%;
+  left: 20%;
   width: 92px;
   text-align: center;
 }
@@ -414,8 +457,8 @@
   width: 200px;
   height: 30px;
   position: absolute;
-  top: 14.3%;
-  left: 44%;
+  top: 29.3%;
+  left: 54%;
 }
 
 .liuliang {
@@ -522,7 +565,7 @@
 
 .NumValue {
   font-family: "LCD";
-  font-size: 16px;
+  font-size: 18px;
 }
 
 .right {
@@ -616,4 +659,8 @@
 .circle1 {
   background: red !important;
 }
+.valueLength {
+  display: inline-block;
+  width: 60px;
+}
 </style>

diff --git a/dist.zip b/dist.zip
index 37d1e9e..7a0070a 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/components/ConditionMonitoring/ConditionMonitoring.vue b/src/components/ConditionMonitoring/ConditionMonitoring.vue
index efb20c1..bad451c 100644
--- a/src/components/ConditionMonitoring/ConditionMonitoring.vue
+++ b/src/components/ConditionMonitoring/ConditionMonitoring.vue
@@ -12,31 +12,44 @@
     </div>
     <div class="picbox">
       <img src=" ./../../../static/img/ZhuangtaiJianKong/hong.png" v-if="list.state == 1" />
-
+      <img
+        src="./../../../static/img/ZhuangtaiJianKong/lv0.png"
+        v-if="list.state == 0 && list.flow == 0"
+      />
       <img
         src=" ./../../../static/img/ZhuangtaiJianKong/lv30.png"
-        v-if="list.state == 0 && list.openLevel <= 35.00"
+        v-if="list.state == 0 && list.openLevel <= 35.00 && list.flow != 0"
       />
       <img
         src=" ./../../../static/img/ZhuangtaiJianKong/lv50.png"
-        v-if="list.state == 0 && 35 < list.openLevel  &&  list.openLevel <= 55"
+        v-if="list.state == 0 && 35 < list.openLevel  &&  list.openLevel <= 55 && list.flow != 0"
       />
       <img
         src=" ./../../../static/img/ZhuangtaiJianKong/lv75.png"
-        v-if="list.state == 0 && 55 < list.openLevel  && list.openLevel <= 75.00"
+        v-if="list.state == 0 && 55 < list.openLevel  && list.openLevel <= 75.00 && list.flow != 0"
       />
       <img
         src=" ./../../../static/img/ZhuangtaiJianKong/lv100.png"
-        v-if="list.state == 0 && 75 < list.openLevel && list.openLevel <= 100.00"
+        v-if="list.state == 0 && 75 < list.openLevel && list.openLevel <= 100.00 && list.flow != 0"
       />
       <div class="watermessage">
-        <span class="waterMsg">水位：{{list.waterLevel}} {{list.waterLevelUnit}}</span>
+        <span class="waterMsg">
+          水位：
+          <span class="NumValue">{{list.waterLevel}}</span>
+          {{list.waterLevelUnit}}
+        </span>
       </div>
       <div class="waterposition">
         <el-progress :text-inside="true" :stroke-width="16" :percentage="list.percentage"></el-progress>
       </div>
       <div class="controlpersent" v-show="controlFlag">
-        <el-select size="mini" v-model="value" placeholder="请选择" @change="selControl">
+        <el-select
+          size="mini"
+          v-model="value"
+          placeholder="请选择"
+          @change="selControl"
+          style="background: rgba(0,0,0,.3);"
+        >
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -46,10 +59,18 @@
         </el-select>
       </div>
       <div class="openpersent" @click="controlFlag = !controlFlag">
-        <span class="waterMsg">开合度：{{list.openLevel}} {{list.openLevelUnit}}</span>
+        <span class="waterMsg">
+          开合度：
+          <span class="NumValue">{{list.openLevel}}</span>
+          {{list.openLevelUnit}}
+        </span>
       </div>
       <div class="liuliang">
-        <span class="waterMsg">流量：{{list.flow}} {{list.flowUnit}}</span>
+        <span class="waterMsg">
+          流量：
+          <span class="NumValue">{{list.flow}}</span>
+          {{list.flowUnit}}
+        </span>
       </div>
       <div class="bengji" v-if="list.stateDetail">
         <div class="waterMsg bjbox">
@@ -59,16 +80,31 @@
           >{{list.stateZn}}</span>
         </div>
         <div class="waterMsg bjbox">
-          A相电压/电流：{{list.stateDetail.voltage1}}
-          V&nbsp;&nbsp;&nbsp;&nbsp;{{list.stateDetail.electricity1}} A
+          A相电压/电流 ：
+          <span class="NumValue valueLength">{{list.stateDetail.voltage1}}</span>
+          V&nbsp;&nbsp;&nbsp;&nbsp;
+          <span
+            class="NumValue valueLength"
+          >{{list.stateDetail.electricity1}}</span>
+          A
         </div>
         <div class="waterMsg bjbox">
-          B相电压/电流：{{list.stateDetail.voltage2}}
-          V&nbsp;&nbsp;&nbsp;&nbsp;{{list.stateDetail.electricity2}} A
+          B相电压/电流：
+          <span class="NumValue valueLength">{{list.stateDetail.voltage2}}</span>
+          V&nbsp;&nbsp;&nbsp;&nbsp;
+          <span
+            class="NumValue valueLength"
+          >{{list.stateDetail.electricity2}}</span>
+          A
         </div>
         <div class="waterMsg bjbox">
-          C相电压/电流：{{list.stateDetail.voltage3}}
-          V&nbsp;&nbsp;&nbsp;&nbsp;{{list.stateDetail.electricity3}} A
+          C相电压/电流：
+          <span class="NumValue valueLength">{{list.stateDetail.voltage3}}</span>
+          V&nbsp;&nbsp;&nbsp;&nbsp;
+          <span
+            class="NumValue valueLength"
+          >{{list.stateDetail.electricity3}}</span>
+          A
         </div>
       </div>
     </div>
@@ -164,6 +200,7 @@
         }
       ],
       value: "",
+      OldValue: "",
       list: {},
       waterLevel: 0,
       icount: "",
@@ -188,6 +225,8 @@
       };
       ws.onmessage = function(message) {
         _this.list = JSON.parse(message.data);
+        _this.value = _this.list.openLevel;
+        _this.OldValue = _this.value;
         //   console.log(_this.list)
       };
       ws.onerror = function(error) {
@@ -223,7 +262,7 @@
 
       let params = {
         data: {
-          stationid: 3,
+          stationid: 1,
           pumpid: 1,
           deviceid: 1,
           state: i
@@ -261,7 +300,7 @@
       // clearInterval(this.icount);
       let params = {
         data: {
-          stationid: 3,
+          stationid: 1,
           pumpid: 1,
           deviceid: 1,
           state: 4,
@@ -285,6 +324,8 @@
               type: "error"
             });
           }
+          // 操作成功后保存此次的状态 zhangqy
+          this.OldValue = this.value;
         })
         .catch(res => {
           this.closeFullScreen2();
@@ -293,6 +334,8 @@
             message: "网络超时，请刷新后再次请求",
             type: "error"
           });
+          // 操作失败后还原到记录的OldValue状态 zhangqy
+          this.value = this.OldValue;
         });
     }
   }
@@ -376,7 +419,7 @@
   position: absolute;
   /* border: 1px solid red; */
   top: 48%;
-  left:20%;
+  left: 20%;
   width: 92px;
   text-align: center;
 }
@@ -414,8 +457,8 @@
   width: 200px;
   height: 30px;
   position: absolute;
-  top: 14.3%;
-  left: 44%;
+  top: 29.3%;
+  left: 54%;
 }
 
 .liuliang {
@@ -522,7 +565,7 @@
 
 .NumValue {
   font-family: "LCD";
-  font-size: 16px;
+  font-size: 18px;
 }
 
 .right {
@@ -616,4 +659,8 @@
 .circle1 {
   background: red !important;
 }
+.valueLength {
+  display: inline-block;
+  width: 60px;
+}
 </style>
diff --git a/static/img/ZhuangtaiJianKong/lv0.png b/static/img/ZhuangtaiJianKong/lv0.png
index 31e7e96..d65dddf 100644
--- a/static/img/ZhuangtaiJianKong/lv0.png
+++ b/static/img/ZhuangtaiJianKong/lv0.png
Binary files differ