update

src/views/iiot/equipment/monitor.vue

@@ -17,7 +17,7 @@
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList" :span-method="objectSpanMethod">
         <el-table-column header-align="center" type="index" label="序号" align="center" width="60" />
         <el-table-column header-align="center" align="center" prop="goafDevName" label="被测设备名称" />
-        <el-table-column header-align="center" align="center" prop="goafDevTypename" label="被测设备类型" />
+        <el-table-column header-align="center" align="center" prop="goafDevTypename" label="被测设备类型" />goafDevTypename
         <el-table-column header-align="center" align="center" prop="goafSensorName" label="传感器名称" />
         <el-table-column header-align="center" align="center" label="频率（HZ）">
           <el-table-column
@@ -241,7 +241,7 @@ export default {
     // fetch data
     NumConvertLM,
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 1) {
+      if (columnIndex === 1 || columnIndex === 2) {
         if (row.index === 0) {
           return {
             rowspan: row.len,
@@ -263,7 +263,14 @@ export default {
         if (code === 0) {
           let tableData = []
           for (let i = 0; i < data.length; i++) {
-            tableData = tableData.concat(data[i].goafSensorData.map((item, index) => { return { ...item, goafDevName: data[i].goafDevName, index, len: data[i].goafSensorData.length } }))
+            tableData = tableData.concat(data[i].goafSensorData.map((item, index) => {
+              return {
+                ...item,
+                goafDevName: data[i].goafDevName,
+                goafDevTypename: data[i].goafDevTypename,
+                index, len: data[i].goafSensorData.length
+              }
+            }))
           }
           this.dataList = tableData
           this.total = 1