Merge remote-tracking branch 'guAn_client/master'

src/views/modules_guAn/visualization/modules/ModeInfo.vue

@@ -5,8 +5,8 @@
       <div>
         <div class="itemHead">温度</div>
         <div class="item">
-          <div id="demo1">温度：</div>
-          <div>输出：</div>
+          <div id="demo1">温度：{{template}}</div>
+          <div>输出：{{outputT}}</div>
         </div>
         <div class="item">
           <div id="demo1">升温
@@ -17,28 +17,29 @@
           </div>
         </div>
         <div class="item">
-          <div id="demo1">温度设定：(123)℃</div>
-          <div>斜率设定：(123)℃/min</div>
+          <!-- <div id="demo1">温度设定：(123)℃</div> -->
+          <div id="demo1">目标温度：{{targetT}}℃</div>
+          <div>斜率设定：{{slopeT}}℃/min</div>
         </div>
         <div class="item">
-          <div id="demo1">起始温度：(123)℃</div>
-          <div>目标温度：(123)℃</div>
+          <div id="demo1">起始温度：{{startT}}℃</div>
+          <!-- <div>目标温度：(123)℃</div> -->
         </div>
         <div class="itemHead">辐照</div>
         <div class="item">
-          <div id="demo1">辐照强度：(0)W/㎡</div>
+          <div id="demo1">辐照强度：0W/㎡</div>
           <div>吹风</div>
         </div>
         <div class="item">
-          <div id="demo1">时间 30min</div>
-          <div>辐照强度设定：(0)W/㎡</div>
+          <div id="demo1">时间 0min</div>
+          <div>辐照强度设定：0W/㎡</div>
         </div>
       </div>
       <div>
         <div class="itemHead">湿度</div>
         <div class="item">
-          <div id="demo1">湿度：80%</div>
-          <div>输出：80%</div>
+          <div id="demo1">湿度：{{humidity}}%</div>
+          <div>输出：{{outputH}}%</div>
         </div>
         <div class="item">
           <div id="demo1">加湿
@@ -49,11 +50,12 @@
           </div>
         </div>
         <div class="item">
-          <div>湿度设定：(123)%/min</div>
+          <!-- <div>湿度设定：(123)%/min</div> -->
+          <div>目标湿度：{{targetH}}%R.H</div>
         </div>
         <div class="item">
-          <div id="demo1">起始湿度：(123)%</div>
-          <div>目标湿度：(123)%</div>
+          <div id="demo1">起始湿度：{{startH}}%R.H</div>
+          <!-- <div>目标湿度：(123)%</div> -->
         </div>
         <div class="itemHead">淋雨</div>
         <div class="item">
@@ -61,7 +63,7 @@
           <div>暴雨</div>
         </div>
         <div class="item">
-          <div id="demo1">时间 30min</div>
+          <div id="demo1">时间 0min</div>
         </div>
       </div>
     </div>
@@ -74,8 +76,49 @@ import commonTitle from '../components/commonTitle.vue'
 export default {
   components: { commonTitle },
   name: '',
+  props: {
+    data: {
+      type: Array,
+      default: []
+    }
+  },
   data () {
     return {
+      // 获取数据(总)
+      dataList: [],
+      // 温度
+      template: '',
+      // 温度输出
+      outputT: '',
+      // 目标温度
+      targetT: '',
+      // 斜率设定（温度）
+      slopeT: '',
+      // 起始温度
+      startT: '',
+      // 辐照强度
+      // 吹风
+      // 时间
+      // 辐照强度设定
+      // 湿度
+      humidity: '',
+      // 湿度输出
+      outputH: '',
+      // 目标湿度
+      targetH: '',
+      // 起始湿度
+      startH: '',
+    }
+  },
+  watch: {
+    data: {
+      handler(newValue, oldValue){
+        console.log(77,newValue, oldValue)
+        this.dataList = newValue
+        this.getList()
+      },
+      immediate: true,
+      deep: true
     }
   },
   created () {
@@ -83,6 +126,42 @@ export default {
   mounted () {
   },
   methods: {
+    getList(){
+      // console.log(this.dataList)
+      for (var i = 0; i < this.dataList.length; i++) {
+        console.log(i,this.dataList[i].Name)
+        // 温度
+        if (this.dataList[i].Name == '当前温度值') {
+          this.template = this.dataList[i].Value
+        }
+        if (this.dataList[i].Name == '温度输出率') {
+          this.outputT = this.dataList[i].Value
+        }
+        if (this.dataList[i].Name == '温度设定值') {
+          this.targetT = this.dataList[i].Value
+        }
+        if (this.dataList[i].Name == '斜率设定') {
+          this.slopeT = this.dataList[i].Value
+        }
+        if (this.dataList[i].Name == '起始温度值') {
+          this.startT = this.dataList[i].Value
+        }
+        // 辐照
+        // 湿度
+        if (this.dataList[i].Name == '当前湿度值') {
+          this.humidity = this.dataList[i].Value
+        }
+        if (this.dataList[i].Name == '湿度输出率') {
+          this.outputH = this.dataList[i].Value
+        }
+        if (this.dataList[i].Name == '湿度设定值') {
+          this.targetH = this.dataList[i].Value
+        }
+        if (this.dataList[i].Name == '起始湿度值') {
+          this.startH = this.dataList[i].Value
+        }
+      }
+    }
   }
 }
 </script>