Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

frontend/src/views/home/components/test.vue

@@ -48,19 +48,19 @@
         <template v-if="chnSum<=MAX_CHN_SUM">
           <el-table-column v-for="(item,index1) in monitorList" :key="item.deviceID" :label="item.deviceName"
                            :min-width="110" align="center">
-            <el-table-column v-for="(chnItem) in item.chnNum" :key="item.deviceID+chnItem"
+            <el-table-column v-for="(chnItem,index2) in item.chnNum" :key="item.deviceID+chnItem"
                              :label="'通道'+chnItem" align="center">
               <template #default="{row}">
                 <el-tooltip
-                    :content="row.devices[index1].chnResult[chnItem].resultType==='info' ? '暂无数据' : '点击查看详情'"
+                    :content="row.devices[index1].chnResult[index2].resultType==='info' ? '暂无数据' : '点击查看详情'"
                     placement="top">
                   <el-button
-                      :disabled="row.devices[index1].chnResult[chnItem].resultType=='info'"
-                      :type="row.devices[index1].chnResult[chnItem].resultType"
+                      :disabled="row.devices[index1].chnResult[index2].resultType=='info'"
+                      :type="row.devices[index1].chnResult[index2].resultType"
                       size="small"
                       @click="handleClick(item,chnItem)"
                   >
-                    {{ row.devices[index1].chnResult[chnItem].resultValue }}
+                    {{ row.devices[index1].chnResult[index2].resultValue }}
                   </el-button>
                 </el-tooltip>
               </template>
@@ -154,7 +154,7 @@ const monitorList = reactive([
   {
     deviceID: '1',
     deviceName: '240001',
-    chnNum: 4,
+    chnNum: 1,
     monitorIdx: 1,
     label: '240001',
     prop: 'Result1',
@@ -162,7 +162,7 @@ const monitorList = reactive([
   {
     deviceID: '2',
     deviceName: '240002',
-    chnNum: 4,
+    chnNum: 1,
     monitorIdx: 2,
     label: '240002',
     prop: 'Result2',
@@ -170,7 +170,7 @@ const monitorList = reactive([
   {
     deviceID: '3',
     deviceName: '240003',
-    chnNum: 4,
+    chnNum: 2,
     monitorIdx: 1,
     label: '240003',
     prop: 'Result3',
@@ -773,15 +773,6 @@ function tableCell({row, columnIndex}) {
   }
 }
 
-const tableRowClassName = ({row, rowIndex,}: { row: any, rowIndex: number }) => {
-  if (row.rowIndex === activeIndex.value.toString()) {
-    return 'warning-row'
-  }
-  // else if (rowIndex === 3) {
-  //   return 'success-row'
-  // }
-  return ''
-}
 // 百分比
 const percentage = ref(0);