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

Reviewed-on: #153

src/views/page/LED.vue

@@ -67,7 +67,7 @@
                 </div>
             </div>
             <div class="input-main-80">
-                <span>使用1#日标温度</span>
+                <span>使用1#目标温度</span>
             </div>
             <div class="input-btn">
                 <div class="btn btn-w80" @click="changeIndexOpen2(1)" :class="actList3[1] == '1' ? 'blue' : 'off'">
@@ -75,7 +75,7 @@
                 </div>
             </div>
             <div class="input-main-80">
-                <span>使用2#日标温度</span>
+                <span>使用2#目标温度</span>
             </div>
         </div>
         <div class="flex-view padding-none border-none shrink-none">

src/views/page/alarmSettings.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="flex-view shrink-none border-none">
             <div class="input-sel input-sel-w180">
-                <span>目标温度1的实时温度选择</span>
+                <span>报警温度1的实时温度选择</span>
                 <el-dropdown @command="handleCommand1($event, 20080)">
                     <div class="el-dropdown-link">
                         <input v-model="inputDataNew[20080]" type="text" class="input-input" placeholder="无">
@@ -72,7 +72,7 @@
         </div>
         <div class="flex-view shrink-none border-none">
             <div class="input-sel input-sel-w180">
-                <span>目标温度2的实时温度选择</span>
+                <span>报警温度2的实时温度选择</span>
                 <el-dropdown @command="handleCommand1($event, 20086)">
                     <div class="el-dropdown-link">
                         <input v-model="inputDataNew[20086]" type="text" class="input-input" placeholder="无">
@@ -139,7 +139,7 @@
         </div>
         <div class="flex-view shrink-none border-none">
             <div class="input-sel input-sel-w180">
-                <span>目标湿度1的实时湿度选择</span>
+                <span>报警湿度1的实时湿度选择</span>
                 <el-dropdown @command="handleCommand2($event, 20092)">
                     <div class="el-dropdown-link">
                         <input v-model="inputDataNew[20092]" type="text" class="input-input" placeholder="无">
@@ -207,7 +207,7 @@
         </div>
         <div class="flex-view shrink-none border-none">
             <div class="input-sel input-sel-w180">
-                <span>目标湿度2的实时湿度选择</span>
+                <span>报警湿度2的实时湿度选择</span>
                 <el-dropdown @command="handleCommand2($event, 20098)">
                     <div class="el-dropdown-link">
                         <input v-model="inputDataNew[20098]" type="text" class="input-input" placeholder="无">

src/views/page/facadeInsulation.vue

@@ -62,7 +62,7 @@
                 <span>提前</span>
                   <input @blur="blurChange(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="change(startList[indexs-1]+7, $event)"
                  type="text" placeholder="0">
-                    <span>分钟收拢内保温</span>
+                    <span>分钟收拢立面保温</span>
             </div>
         </div>
 

src/views/page/wetFan.vue

@@ -7,7 +7,7 @@
         <template v-if="indexs==1">
             <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[21950] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0,21950)" :class="inputData[21950] == 0 ? 'blue' : 'green'">
                     {{ inputData[21950] == 0 ? '无效' : '有效' }}
                 </div>
             </div>