update

src/views/iiot/equipment/monitor.vue

@@ -28,7 +28,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.frequencyX/10).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.frequencyX)">{{ parseFloat((row.frequencyX/10).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -39,7 +39,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.frequencyY/10).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.frequencyY)">{{ parseFloat((row.frequencyY/10).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -50,7 +50,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.frequencyZ/10).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.frequencyZ)">{{ parseFloat((row.frequencyZ/10).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -63,7 +63,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.velX/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.velX)">{{ parseFloat((row.velX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -74,7 +74,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.velY/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.velY)">{{ parseFloat((row.velY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -85,7 +85,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.velZ/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.velZ)">{{ parseFloat((row.velZ/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -98,7 +98,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.accX/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.accX)">{{ parseFloat((row.accX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -109,7 +109,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.accY/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.accY)">{{ parseFloat((row.accY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -120,7 +120,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.accZ/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.accZ)">{{ parseFloat((row.accZ/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -168,7 +168,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.angX/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.angX)">{{ parseFloat((row.angX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -179,7 +179,7 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.angY/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.angY)">{{ parseFloat((row.angY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -190,19 +190,20 @@
             width="80"
           >
             <template v-slot="{row}">
-              <span>{{ parseFloat((row.angZ/100).toFixed(2)) }}</span>
+              <span v-if="isNotNull(row.angZ)">{{ parseFloat((row.angZ/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column header-align="center" align="center" prop="sensorTemperature" label="温度（℃）">
           <template v-slot="{row}">
-            <span>{{ parseFloat((row.sensorTemperature/10).toFixed(2)) }}</span>
+            <span v-if="isNotNull(row.sensorTemperature)">{{ parseFloat((row.sensorTemperature/10).toFixed(2)) }}</span>
           </template>
         </el-table-column>
         <el-table-column header-align="center" align="center" prop="goafDatareportTime" label="上传时间" />
         <el-table-column label="操作" header-align="center" align="center" min-width="60">
           <template v-slot="{row}">
-            <el-button size="mini" type="text" style="color:#1B81FF" @click="showDetail(row)">波形</el-button>
+            <el-button v-if="isNotNull(row.goafDataId)" size="mini" type="text" style="color:#1B81FF" @click="showDetail(row)">波形</el-button>
+            <span v-else style="color:#b6bec7">无数据</span>
           </template>
         </el-table-column>
       </el-table>
@@ -239,6 +240,10 @@ export default {
   },
   methods: {
     // fetch data
+    isNotNull(val) {
+      if (val === null || val === '' || val === undefined || val === 'undefined') return false
+      return true
+    },
     NumConvertLM,
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 1 || columnIndex === 2) {