Merge pull request 'pc-master' (#134) from pc-master into portal

Reviewed-on: #134

src/views/page/formula.vue

@@ -122,7 +122,7 @@
                    v-model="inputData[store.formulaNum[indexs - 1] + 28]"
                     @input="change(store.formulaNum[indexs - 1] + 28, $event)" type="number" style="height: 34px;margin: 0 5px;"
                     placeholder="0.0">
-                    <span style="padding:0">%</span>
+                    <span style="padding:0">秒</span>
                 </div>
               </div>
             </template>
@@ -353,8 +353,8 @@ export default {
           value: el.target.value * 10
         }
       };
-      console.log(data,11);
-      this.changeBtn(code, data)
+      // console.log(data,11);
+      // this.changeBtn(code, data)
     },
       //失去焦点
       blurChangeCount(code, el) {

src/views/page/status.vue

@@ -495,17 +495,20 @@ export default {
             this.openType = this.getType29(typeNumber)
 
             var statusIndex = 8
+            var list=[]
+         
             for (var j = 0; j < statusIndex; j++) {
                 if (Number(number[number.length - 1 - j])) {
                     if (j == 0) {
-                        this.right2Index.push('1')
+                        list.push('1')
                     } else if (j == 1) {
-                        this.right2Index.push('0')
+                        list.push('0')
                     } else {
-                        this.right2Index.push(j)
+                        list.push(j)
                     }
                 }
             }
+            this.right2Index=list
         },
         //进水泵和出水泵状态
         getData30() {