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

Reviewed-on: #212

src/assets/css/main.css

@@ -841,6 +841,10 @@ textarea {
   font-size: 24px;
 }
 
+.popper__arrow {
+  display: none !important;
+}
+
 .el-dropdown-menu {
   width: 300px;
   border: none;

src/assets/css/main.scss

@@ -880,6 +880,9 @@ textarea{
     font-weight: bold;
     font-size: 24px;
 }
+.popper__arrow {
+    display: none!important;
+}
 
 .el-dropdown-menu {
     width: 300px;

src/views/page/CO2.vue

@@ -146,7 +146,7 @@
           type="text"
           placeholder="0"
         />
-        <span>KLU,允许补气</span>
+        <span>klux,允许补气</span>
       </div>
     </div>
     <div class="flex-view padding-none border-none shrink-none">
@@ -162,9 +162,9 @@
       <div class="input-main-80">
         <span>室内温度大于</span>
         <input
-          @blur="blurChange(startList[indexs - 1] + 9, $event)"
+          @blur="blurChangeCount(startList[indexs - 1] + 9, $event)"
           v-model="inputData[startList[indexs - 1] + 9]"
-          @input="change(startList[indexs - 1] + 9, $event)"
+          @input="changeCountData(startList[indexs - 1] + 9, $event)"
           type="text"
           placeholder="0"
         />
@@ -377,6 +377,7 @@ export default {
           value: parseInt(num, 2),
         },
       };
+     this.inputData[this.startList[this.indexs - 1] + 1]= parseInt(num, 2)
       this.changeBtn(this.startList[this.indexs - 1] + 1, dataNum);
     },
     getActive1() {
@@ -427,6 +428,7 @@ export default {
           this.getActive2();
           this.startList.forEach((el, index) => {
             this.inputData[el + 8] = this.countData10(this.inputData[el + 8]);
+              this.inputData[el + 9] = this.countData(this.inputData[el + 9]);
             this.inputDataNew[el + 2] = this.getData1(this.inputData[el + 2]);
           });
         }

src/views/page/parameterSet.vue

@@ -1393,7 +1393,7 @@
       </div>
       <div class="input-sel input-sel-w180">
         <span>CO2传感器来源选择</span>
-        <el-dropdown @command="handleCommand5($event, 21786)">
+        <el-dropdown @command="handleCommand6($event, 21786)">
           <div class="el-dropdown-link">
             <input
               v-model="inputDataNew[21786]"
@@ -1467,7 +1467,7 @@
       </div>
       <div class="input-sel input-sel-w180">
         <span>CO2传感器来源选择</span>
-        <el-dropdown @command="handleCommand5($event, 21789)">
+        <el-dropdown @command="handleCommand6($event, 21789)">
           <div class="el-dropdown-link">
             <input
               v-model="inputDataNew[21789]"