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

Reviewed-on: #219

src/router/index.js

@@ -197,7 +197,7 @@ const routes = [
         component: () => import('../views/wufang/snowRemoval.vue')
       },{
         path: '/targetTemperature',
-        name: 'targetTemperature',
+        name: 'targetTemperature',  
         component: () => import('../views/page/targetTemperature.vue')
       },{
         path: '/targetHumidity',

src/views/page/intrinsicParameter.vue

@@ -617,7 +617,7 @@
                  type="text" placeholder="0">
             </div>
         </div>
-        <div class="flex-view border-none shrink-none padding-none">
+        <div class="flex-view shrink-none padding-none">
             <div class="input-main-80">
                 <span>立面保温4全程运行时间</span>
                 <input @blur="blurChange(20750, $event)" v-model="inputData[20750]" @input="change(20750, $event)"
@@ -630,6 +630,21 @@
                  type="text" placeholder="0">
             </div>
         </div>
+         <div class="flex-view border-none shrink-none padding-none">
+            <div class="input-sel input-sel-w180">
+                <span>空调模式选择</span>
+                <el-dropdown @command="handleCommand3($event,20753)">
+                    <div class="el-dropdown-link">
+                        <input v-model="inputDataNew[20753]" type="text" class="input-input" placeholder="无">
+                        <div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
+                    </div>
+                    <el-dropdown-menu class="input-menu-180" slot="dropdown">
+                        <el-dropdown-item v-for="item, index in typeList4" :key="index" :command="item.value">{{
+                            item.label }}</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </div>
+        </div>
      <el-dialog title="请输入密码" class="vrcode-model confirm-psw" top="30vh" :close-on-click-modal="false" :append-to-body="true" :visible.sync="warnModel"
             width="700px">
             <div class="vrcode-model-title vrcode-model-title-282">请输入密码</div>
@@ -678,8 +693,19 @@ export default {
             typeList3: [
             { label: '加热模式', value: 1 },
             { label: '制冷模式', value: 2 },],
+              list3:[20726],
+            typeList4: [
+            { label: '自动模式', value: 0 },
+            { label: '制冷模式', value: 1 },
+            { label: '制热模式', value: 2 },
+            { label: '除湿模式', value: 3 },
+            { label: '送风模式', value: 4 },
+            { label: '冷暖模式', value: 5 },],
+              list4:[20753],
             inputData:[],
             inputDataNew:[],
+
+            
       loading:null,
         }
     },
@@ -770,6 +796,15 @@ modelConfirm(){
                 }
             })
             return name
+        },
+          getData4(data) {
+            var name=''
+            this.typeList4.forEach((el, index) => {
+                if (el.value == data) {
+                   name=el.label
+                }
+            })
+            return name
         },
         dataInit() {
             this.loading = this.$loading({
@@ -795,7 +830,13 @@ modelConfirm(){
                     this.list2.forEach((el,index)=>{
                         this.inputDataNew[el]=this.getData2(this.inputData[el])
                     })
-                    this.inputDataNew[20726]=this.getData3(this.inputData[20726])
+                     this.list3.forEach((el,index)=>{
+                        this.inputDataNew[el]=this.getData3(this.inputData[el])
+                    })
+                     this.list4.forEach((el,index)=>{
+                        this.inputDataNew[el]=this.getData4(this.inputData[el])
+                    })
+                    // this.inputDataNew[20726]=this.getData3(this.inputData[20726])
                     console.log(this.inputData, this.inputDataNew);
                 }
                 
@@ -886,7 +927,20 @@ modelConfirm(){
             };
             this.changeBtn(code, dataNum);
         },
-
+ //类型选择
+         handleCommand3(command,code) {
+            this.typeList4.forEach((el, index) => {
+                if (el.value == command) {
+                    this.inputDataNew[code] = el.label
+                }
+            })
+            var dataNum = {
+                target: {
+                    value: command,
+                },
+            };
+            this.changeBtn(code, dataNum);
+        },
          //类型选择
          handleCommand2(command,code) {
             this.typeList2.forEach((el, index) => {

src/views/page/irrigateSet.vue

@@ -96,6 +96,13 @@
         <!-- <div class="btn green">
           <img src="../../assets/image/rotate.png" alt="" />轮模式启用
         </div> -->
+      </div>
+        <div class="flex-view" v-if="indexs>=5&&indexs<=8">
+        <div class="input-main-80">
+          <span>本灌溉组启动追随阀</span>
+          <input @blur="blurChange(10 + (indexs - 1) + '75', $event)" v-model="inputData[10 + (indexs - 1) + '75']"
+            @input="change(10 + (indexs - 1) + '75', $event)" type="number" placeholder="0" />
+        </div>
       </div>
       <div class="flex-view">
 

src/views/page/realTime.vue

@@ -296,6 +296,67 @@
                             <div>当前设备无效</div>
                         </div>
                     </div>
+                    <!-- 空调 -->
+                        <div class="status-view-content" v-else-if="item.type == 17">
+                        <div v-if="item.open != 0" class="status-true">
+                            <div class="status-true-sel" style="margin-bottom: 10px;">
+                                <div class="sel-auto">
+                                    <img v-if="item.open == 1" src="../../assets/img/status-true-sel.png" alt="">
+                                    <img v-else src="../../assets/img/status-true-nosel.png" alt="">
+                                    自动控制
+                                </div>
+                                <div class="sel-phone">
+                                    <img v-if="item.open != 1" src="../../assets/img/status-true-sel.png" alt="">
+                                    <img v-else src="../../assets/img/status-true-nosel.png" alt="">
+                                    手机控制
+                                </div>
+                            </div>
+                                <!-- 空调六选一 -->
+                            <div class="status-true-sel" style="justify-content: center;margin-top:10px">
+                                <div class="sel-auto" v-if="item.count==0">
+                                    <img v-if="item.count == 0" src="../../assets/img/status-true-sel.png" alt="">
+                                    <img v-else src="../../assets/img/status-true-nosel.png" alt="">
+                                    自动模式
+                                </div>
+                                <div class="sel-auto" v-if="item.count==1">
+                                    <img v-if="item.count == 1" src="../../assets/img/status-true-sel.png" alt="">
+                                    <img v-else src="../../assets/img/status-true-nosel.png" alt="">
+                                    制冷模式
+                                </div>
+                                 <div class="sel-auto" v-if="item.count==2">
+                                    <img v-if="item.count == 2" src="../../assets/img/status-true-sel.png" alt="">
+                                    <img v-else src="../../assets/img/status-true-nosel.png" alt="">
+                                    制热模式
+                                </div>
+                                 <div class="sel-auto" v-if="item.count==3">
+                                    <img v-if="item.count == 3" src="../../assets/img/status-true-sel.png" alt="">
+                                    <img v-else src="../../assets/img/status-true-nosel.png" alt="">
+                                    除湿模式
+                                </div>
+                                 <div class="sel-auto" v-if="item.count==4">
+                                    <img v-if="item.count == 4" src="../../assets/img/status-true-sel.png" alt="">
+                                    <img v-else src="../../assets/img/status-true-nosel.png" alt="">
+                                    送风模式
+                                </div>
+                                <div class="sel-auto" v-if="item.count==5">
+                                    <img v-if="item.count == 5" src="../../assets/img/status-true-sel.png" alt="">
+                                    <img v-else src="../../assets/img/status-true-nosel.png" alt="">
+                                    冷暖模式
+                                </div>
+                            </div>
+                          <div class="status-fan status-btn">
+                                <div class="btn" :class="item.index == 1 ? 'blue' : 'off'">
+                                    <img class="light-img" :src="getIcon(item)" alt="">
+                                    <!-- <img v-else src="../../assets/img/fan-off.png" alt=""> -->
+                                    <span>{{ item.index == 1 ? '开启' : '关闭' }}</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div v-else class="status-noTrue">
+                            <img src="../../assets/img/status-no.png" alt="">
+                            <div>当前设备无效</div>
+                        </div>
+                    </div>
                     <!-- 顶卷膜及其他 -->
                     <div class="status-view-content" v-else>
                         <div v-if="item.open != 0" class="status-true">
@@ -317,8 +378,8 @@
                                 <div :id="'statusCharts' + index"></div>
                             </div>
                             <div class="status-true-charts" style="background: unset;height: 50px;" v-else>
-
                             </div>
+                        
                             <div class="status-true-text" v-if="item.type == 2 || item.type == 5 || item.type == 6 || item.type == 12
             || item.type == 13 || item.type == 14 || item.type == 15 || item.type == 16">
                                 <div class="status-true-text-left">{{ getNumberStatus(item) }}</div>
@@ -334,7 +395,7 @@
                                     <span>{{ item.index == 1 ? '开启' : '关闭' }}</span>
                                 </div>
                             </div>
-                            <div class="status-true-text" v-if="item.type == 15|| item.type == 17">
+                            <div class="status-true-text" v-if="item.type == 15">
                                 <div class="status-true-text-left">计算结果</div>
                                 <div class="status-true-text-right">
                                     {{ item.count }}</div>