update 设备监控

src/views/device-management/device-monitoring/index.vue

@@ -47,6 +47,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="queryData">查询</el-button>
+          <el-button v-if="false" @click="clearIntervalT">clear</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -74,7 +75,7 @@
         v-for="(property, index) in dataModelDetail"
         :key="index"
         :label="property.propertyName"
-        :value="`${property.propertyValue} ${property.propertyUnit}`"
+        :value="formatProperty(property)"
       />
     </el-card>
     <el-card class="margin-top-20">
@@ -195,6 +196,9 @@ export default {
     this.timer && clearInterval(this.timer)
   },
   methods: {
+    clearIntervalT() {
+      this.timer && clearInterval(this.timer)
+    },
     async init(deviceTypeId, deviceInstanceId) {
       // 获取所有设备类型
       const deviceTypeList = await getAllDeviceModel()
@@ -243,15 +247,19 @@ export default {
           }]
         })
         .then(params => {
+          const { dataMode, deviceInstance } = this.form
           this.timer && clearInterval(this.timer)
           this.timer = setInterval(async() => {
-            await this.getPropertyDetail(this.form.dataMode, this.form.deviceInstance)
+            await this.getPropertyDetail(dataMode, deviceInstance)
             const chartData = await getModelInstanceChart(params)
             this.tableData = chartData.data[0].dataList
             this.property.data = [...this.getChartData(this.activeProperty)]
           }, this.form.refresh * 1000)
         })
-        .catch(_ => {})
+        .catch(e => console.error(e))
+    },
+    formatProperty(property) {
+      return property.propertyValue ? `${property.propertyValue} ${property.propertyUnit}` : ''
     },
     getDeviceInstanceDetail(id) {
       getDeviceInstanceDetail({ id })
@@ -270,8 +278,8 @@ export default {
     getPropertyDetail(dataModelId, deviceId) {
       getPropertyDetail({ dataModelId, deviceId })
         .then(res => {
-          this.dataModelDetail = res.data.propertyList
-          this.dataModelReportTime = res.data.reportTime
+          this.dataModelDetail = res.data.propertyList.length ? res.data.propertyList : []
+          this.dataModelReportTime = res.data.reportTime ? res.data.reportTime : null
         })
         .catch(_ => {})
     },