Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

src/pages/ol/demo/no-query-detail.vue

@@ -167,7 +167,6 @@ export default {
   },
   data() {
     return {
-      params: [],
       video1: 0,
       stationId: localStorage.getItem('stationId'),
       //11=焦距变大，12=焦距变小，13=焦点前调，14=焦点后调，15=光圈扩大，16=光圈扩小
@@ -339,62 +338,71 @@ export default {
           params = this.wxyljList.filter(
             (e) => e.resource_id === this.dataForm.id
           )
-          this.dataList.forEach((element) => {
-            element.value = params.water_pressure
-          })
+          if (params && params.length > 0) {
+            this.dataList.forEach((element) => {
+              element.value = params[0].water_pressure
+            })
+          }
           break
         case 'c788ce98c1f248f590434394da485ce4': //4合1环境探测器
-          this.params = this.hjtcqList.filter(
+          params = this.hjtcqList.filter(
             (e) => e.resource_id === this.dataForm.id
           )
-          this.dataList.forEach((element) => {
-            if (element.typeName === '温度') {
-              element.value = this.params.temperature
-            } else if (element.typeName === '湿度') {
-              element.value = this.params.humidity
-            } else if (element.typeName === '一氧化碳') {
-              element.value = this.params.carbon_monoxide
-            } else if (element.typeName === '二氧化碳') {
-              element.value = this.params.carbon_dioxide
-            }
-          })
+          if (params && params.length > 0) {
+            this.dataList.forEach((element) => {
+              if (element.typeName === '温度') {
+                element.value = params[0].temperature
+              } else if (element.typeName === '湿度') {
+                element.value = params[0].humidity
+              } else if (element.typeName === '一氧化碳') {
+                element.value = params[0].carbon_monoxide
+              } else if (element.typeName === '二氧化碳') {
+                element.value = params[0].carbon_dioxide
+              }
+            })
+          }
+
           break
         case 'b45827c068254695864ee3c1d42573cb': //流量计
-          this.params = this.lljList.filter(
+          params = this.lljList.filter(
             (e) => e.resource_id === this.dataForm.id
           )
-          this.dataList.forEach((element) => {
-            element.value = this.params.flow_rate
-          })
+          if (params && params.length > 0) {
+            this.dataList.forEach((element) => {
+              element.value = params[0].flow_rate
+            })
+          }
           break
         case '303310efddb34a2e9bf269bdff8a7dc5': //无线液位仪
           params = this.wxywyList.filter(
             (e) => e.resource_id === this.dataForm.id
           )
-          console.log('params:11111----', params)
-          this.$nextTick(() => {
+          if (params && params.length > 0) {
             this.dataList.forEach((element) => {
-              this.$set(element, 'value', params.gauge_height)
-              // element.value = this.params.gauge_height
+              element.value = params[0].gauge_height
             })
-          })
+          }
 
           break
         case 'f4c840711eae4bcb9536a890cdfda493': //风速仪
-          this.params = this.fsyList.filter(
+          params = this.fsyList.filter(
             (e) => e.resource_id === this.dataForm.id
           )
-          this.dataList.forEach((element) => {
-            element.value = this.params.wind_speed
-          })
+          if (params && params.length > 0) {
+            this.dataList.forEach((element) => {
+              element.value = params[0].wind_speed
+            })
+          }
           break
         case '5b26f6c8f2a143048bd0e327ca5c186d': //风压仪
-          this.params = this.fyyList.filter(
+          params = this.fyyList.filter(
             (e) => e.resource_id === this.dataForm.id
           )
-          this.dataList.forEach((element) => {
-            element.value = this.params.wind_pressure
-          })
+          if (params && params.length > 0) {
+            this.dataList.forEach((element) => {
+              element.value = params[0].wind_pressure
+            })
+          }
           break
       }
     },