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

Reviewed-on: #28

src/api/index.js

@@ -147,4 +147,8 @@ export default {
   getReadControlSensorInputSynthesis(data){
     return sendGetRequest('/readControl/sensorInputSynthesis',data)
   },
+    //控制器 主页查看控制器气象站实时数据
+    getControlRtDatastation(data){
+      return sendGetRequest('/getcontrol/rtDatastation',data)
+    },
 };

src/assets/css/main.css

@@ -786,6 +786,7 @@
 
 .btn.green {
   background: #00BB88;
+  opacity: 0.5;
 }
 
 .btn.blue {
@@ -988,6 +989,10 @@
   background-size: 100% 100%;
 }
 
+.sensorSet {
+  height: 100%;
+}
+
 .sensorSet .sensor-view {
   display: flex;
   align-items: center;
@@ -1099,6 +1104,10 @@
   margin-right: 30px;
 }
 
+.sensorSet.sensorSet-con .sensor-view {
+  height: calc(100% - 120px);
+}
+
 .sensorSet.sensorSet-con .right-sel {
   width: 100%;
   flex-wrap: wrap;
@@ -1466,7 +1475,49 @@
   height: 100%;
   background: rgba(0, 92, 178, 0.15);
   border: 2px solid rgba(0, 186, 255, 0.2);
-  padding: 20px 30px;
+  padding: 30px 30px 20px;
+}
+
+.realTime .page-content .control-view {
+  display: flex;
+  align-items: center;
+  position: absolute;
+  right: 30px;
+  top: 10px;
+}
+
+.realTime .page-content .control-view .title {
+  margin-right: 10px;
+}
+
+.realTime .page-content .control-view .control-list {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  max-width: 500px;
+}
+
+.realTime .page-content .control-view .control-list > div {
+  display: flex;
+  overflow: unset !important;
+}
+
+.realTime .page-content .control-view .control-list > div > div {
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+  margin-right: 100px;
+}
+
+.realTime .page-content .control-view .control-list .list-view {
+  display: flex;
+  align-items: center;
+  margin-right: 10px;
+}
+
+.realTime .page-content .control-view .control-list .list-view .icon {
+  width: 30px;
+  height: 30px;
 }
 
 .realTime .page-content .timeNow {

src/assets/css/main.scss

@@ -824,6 +824,7 @@
 
     &.green {
         background: #00BB88;
+        opacity: 0.5;
     }
 
     &.blue {
@@ -1045,6 +1046,7 @@
 }
 
 .sensorSet {
+    height: 100%;
     .sensor-view {
         display: flex;
         align-items: center;
@@ -1160,6 +1162,9 @@
     }
 
     &.sensorSet-con{
+        .sensor-view{
+            height: calc(100% - 120px);
+        }
         .right-sel{
             width: 100%;
             flex-wrap: wrap;
@@ -1555,7 +1560,45 @@
         height: 100%;
         background: rgba(0, 92, 178, 0.15);
         border: 2px solid rgba(0, 186, 255, 0.20);
-        padding: 20px 30px;
+        padding: 30px 30px 20px;
+        .control-view{
+            display: flex;
+            align-items: center;
+            position: absolute;
+            right: 30px;
+            top: 10px;
+            .title{
+                margin-right: 10px;
+            }
+            .control-list{
+                display: flex;
+                align-items: center;
+               
+                overflow: hidden;
+                max-width: 500px;
+                >div {
+                    // width: 100%!important;
+                    display: flex;
+                    overflow: unset !important;
+    
+                    >div {
+                        display: flex;
+                        align-items: center;
+                        flex-shrink: 0;
+                        margin-right: 100px;
+                    }
+                }
+                .list-view{
+                    display: flex;
+                    align-items: center;
+                    margin-right: 10px;
+                    .icon{
+                        width: 30px;
+                        height: 30px;
+                    }
+                }
+            }
+        }
        
         .timeNow {
             text-align: center;

src/views/page/fan.vue

@@ -19,19 +19,19 @@
 
         </div>
         <div class="flex-view">
-            <div @click="changeIndexOpen(1)" class="btn" :class="actList1[1]=='1'?'blue':'off'">
+            <div @click="changeIndexOpen(0)" class="btn" :class="actList1[0]=='1'?'blue':'off'">
                 一号风组
             </div>
-            <div @click="changeIndexOpen(2)" class="btn" :class="actList1[2]=='1'?'blue':'off'">
+            <div @click="changeIndexOpen(1)" class="btn" :class="actList1[1]=='1'?'blue':'off'">
                 二号风组
             </div>
-            <div @click="changeIndexOpen(3)" class="btn" :class="actList1[3]=='1'?'blue':'off'">
+            <div @click="changeIndexOpen(2)" class="btn" :class="actList1[2]=='1'?'blue':'off'">
                 三号风组
             </div>
-            <div @click="changeIndexOpen(4)" class="btn" :class="actList1[4]=='1'?'blue':'off'">
+            <div @click="changeIndexOpen(3)" class="btn" :class="actList1[3]=='1'?'blue':'off'">
                 四号风组
             </div>
-            <div @click="changeIndexOpen(5)" class="btn" :class="actList1[5]=='1'?'blue':'off'">
+            <div @click="changeIndexOpen(4)" class="btn" :class="actList1[4]=='1'?'blue':'off'">
                 五号风组
             </div>
         </div>
@@ -246,9 +246,9 @@ export default {
         },
         getAct21601(){
             this.actList1=[]
-            var num = this.inputData['21601']?this.inputData['21601']:0
+            var num = this.inputData['21601']
             var num1 = this.padString(num.toString(2), 5)
-            var openListNew
+            var openListNew=[]
             openListNew = num1.split("")
             openListNew.forEach((el, index) => {
                 this.actList1.push(openListNew[openListNew.length - index - 1])

src/views/page/realTime.vue

@@ -6,6 +6,23 @@
                 }}</span> -->
                 {{ list[0].updateTime ? list[0].updateTime : '' }}
             </div>
+            <div class="control-view">
+                <div class="title">气象站:</div>
+                <vue-seamless class="control-list" v-if="deviceName == 10" :data="controlList" :class-option="defaultOption">
+                <div class="list-view" v-for="item, index in controlList " :key="index">
+                    <img class="icon" :src="item.img" alt="">
+                    {{ item.environmentDataId
+                    }}:{{ getControlData(item) }}
+                </div>
+            </vue-seamless>
+            </div>
+            <!-- <div class="control-list" >
+                <div v-for="(item, index) in controlList" :key="index">
+                    <img :src="item.img" alt="">
+                    {{ item.environmentDataId
+                    }}:{{ getControlData(item) }}
+                </div>
+            </div> -->
             <div class="table-title">
                 <img src="../../assets/image/real-time.png" alt="" />
                 实时数据
@@ -74,6 +91,7 @@ export default {
             url: '',
             timer: null,
             deviceName: 1,
+            controlList: [],
         }
     },
     watch: {
@@ -154,6 +172,32 @@ export default {
             var num = (data - 400) / 10
             return num.toFixed(2)
         },
+        //右上角数据过滤
+        getControlData(item) {
+            var x = item.environmentData
+            var num = item.num
+            if (item.formula == '12') {
+                if (x < 22 || x > 337) {
+                    return '北'
+                } else if (x >= 22 && x <= 67) {
+                    return '东北'
+                } else if (x > 67 && x < 112) {
+                    return '东'
+                } else if (x >= 112 && x <= 157) {
+                    return '东南'
+                } else if (x > 157 && x < 202) {
+                    return '南'
+                } else if (x >= 202 && x <= 247) {
+                    return '西南'
+                } else if (x > 247 && x < 292) {
+                    return '西'
+                } else if (x >= 292 && x <= 337) {
+                    return '西北'
+                }
+            } else {
+                return num
+            }
+        },
         dataInit() {
             var store = this.$store.state
             var equipmentId = store.equipmentList[this.indexs - 1].deviceId
@@ -162,6 +206,9 @@ export default {
             //     // pattern: 0, //需要根据文档填写 //6目标ph-数值
             //     // regNum: 73,
             // };
+            var formData = {
+                equipmentId: store.equipmentList[this.indexs - 1].deviceId
+            }
             var list = store.typeList
             if (this.deviceName == 1) {
                 this.api.postRtdata(equipmentId).then((res) => {
@@ -235,7 +282,6 @@ export default {
                 //     channelid: '1'
                 // }
                 this.api.getGethls(data2).then(res => {
-                console.log(res.data, 11);
                     if (res.data.code == 200) {
                         this.url = res.data.msg
                         this.createVideo()
@@ -291,6 +337,24 @@ export default {
                         this.$message.error(res.data.msg);
                     }
                 });
+                this.api.getControlRtDatastation(formData).then(res => {
+                    this.controlList = []
+                    res.data.data.forEach((el, index) => {
+                        list.forEach((el1, index1) => {
+                            if (el.formula == el1.value) {
+                                console.log(el1);
+                                var num = el.environmentData + el1.unit
+                                this.controlList.push({
+                                    ...el,
+                                    num: num,
+                                    img: require(`../../assets/image/real-time-${el.formula}.png`)
+                                })
+                            }
+                        })
+                    })
+                    console.log(this.controlList);
+                })
+
                 var data1 = store.equipmentList[this.indexs - 1].deviceId
 
                 this.api.getControlFsdata(data1).then(res => {

src/views/page/sensorSet-con.vue

@@ -41,7 +41,7 @@
                         </div>
                     </div>
                     <div class="input-sel">
-                        <div class="title">专感器类型</div>
+                        <div class="title">传感器类型</div>
                         <el-dropdown @command="handleCommand">
                             <div class="el-dropdown-link">
                                 <input v-model="sensorType" type="text" class="input-input" placeholder="选择传感器类型">

src/views/page/sensorSet.vue

@@ -24,7 +24,7 @@
                             </div>
                         </div>
                         <div class="input-sel">
-                            <div class="title">专感器类型</div>
+                            <div class="title">传感器类型</div>
                             <el-dropdown  @command="handleCommand">
                                 <div class="el-dropdown-link">
                                     <input v-model="sensorType" type="text" class="input-input" placeholder="选择传感器类型">
@@ -107,7 +107,7 @@ export default {
     watch:{
         'active'(newVal,oldVal){
             this.getSensorType()
-            this.getCountData()
+            // this.getCountData()
         },
     },
     mounted() { 
@@ -167,23 +167,25 @@ export default {
         },
            //根据类型修改数据
            getCountData(){
+            for (var i = 0; i < 6; i++) {
             this.typeList.forEach((el, index) => {
-                if (el.value == this.inputData[this.numberList[this.active]]) {
+                if (el.value == this.inputData[this.numberList[i]]) {
                    if(el.countType==0){
 
                    }else if(el.countType==1){
-                    this.inputData[this.numberList[this.active] + 2]=this.countType1(this.inputData[this.numberList[this.active] + 2])
+                    this.inputData[this.numberList[i] + 2]=this.countType1(this.inputData[this.numberList[i] + 2])
-                   this.inputData[this.numberList[this.active] + 4]=this.countType1(this.inputData[this.numberList[this.active] + 4])
+                   this.inputData[this.numberList[i] + 4]=this.countType1(this.inputData[this.numberList[i] + 4])
                    }else if(el.countType==2){
-                    this.inputData[this.numberList[this.active] + 2]=this.countType2(this.inputData[this.numberList[this.active] + 2])
+                    this.inputData[this.numberList[i] + 2]=this.countType2(this.inputData[this.numberList[i] + 2])
-                   this.inputData[this.numberList[this.active] + 4]=this.countType2(this.inputData[this.numberList[this.active] + 4])
+                   this.inputData[this.numberList[i] + 4]=this.countType2(this.inputData[this.numberList[i] + 4])
                    }else if(el.countType==3){
-                    this.inputData[this.numberList[this.active] + 2]=this.countType3(this.inputData[this.numberList[this.active] + 2])
+                    this.inputData[this.numberList[i] + 2]=this.countType3(this.inputData[this.numberList[i] + 2])
-                   this.inputData[this.numberList[this.active] + 4]=this.countType3(this.inputData[this.numberList[this.active] + 4])
+                   this.inputData[this.numberList[i] + 4]=this.countType3(this.inputData[this.numberList[i] + 4])
                    }
                   
                 }
             })
+        }
         },
         getSensorType(){
             this.typeList.forEach((el,index)=>{

src/views/page/skylight.vue

@@ -9,10 +9,10 @@
           <img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
         </div>
         <div class="btn" @click="changeOpen(2)" :class="openIndex == 2 ? 'blue' : 'green'">
-          <img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
+          <img src="../../assets/image/irrigateSet3.png" alt="" />手动打开
         </div>
         <div class="btn" @click="changeOpen(3)" :class="openIndex == 3 ? 'blue' : 'green'">
-          <img src="../../assets/image/irrigateSet3.png" alt="" />手动打开
+          <img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
         </div>
         <div class="btn" @click="changeOpen(4)" :class="openIndex == 4 ? 'blue' : 'green'">
           <img src="../../assets/image/irrigateSet1.png" alt="" />停止