手持表完善围栏

web/src/api/gas/handdetector/index.ts

@@ -3,11 +3,12 @@ import type { Dayjs } from 'dayjs'
 
 /** GAS手持探测器信息 */
 export interface HandDetector {
-  id: number // 主键ID
+  id?: number // 主键ID
   sn?: string // SN
   name?: string // 持有人
   fenceIds?: string // 围栏ids
   fenceIdsArray?: string[] // 围栏ids数组
+  fenceType?: number // 围栏类型
   gasTypeId?: number // 气体类型ID
   gasChemical?: string // 气体化学式
   min?: number // 测量范围中的最小值

web/src/views/HandDevice/Home/index.vue

@@ -51,10 +51,12 @@ const getFences = async () => {
 onMounted(() => {
   getMarkers()
   getFences()
-  getDataTimer.value = setInterval(() => {
-    getMarkers()
-    getFences()
-  }, 5000)
+  console.log('定时器，暂时关掉，太烦了');
+  
+  // getDataTimer.value = setInterval(() => {
+  //   getMarkers()
+  //   getFences()
+  // }, 5000)
 })
 onUnmounted(() => {
   clearInterval(getDataTimer.value as NodeJS.Timeout)

web/src/views/gas/handdetector/index.vue

@@ -73,13 +73,13 @@
       <el-table-column label="SN" align="center" prop="sn" />
       <el-table-column label="持有人" align="center" prop="name" />
       <el-table-column label="应用围栏" align="center" prop="fenceIds">
-        <template #default="scope">
+        <template #default="scope"> 
           {{
             scope.row.fenceIdsArray &&
             scope.row.fenceIdsArray.length > 0 &&
             scope.row.fenceIdsArray
-              .map((item) => handDetectorStore.getFences.find((fence) => fence.id === item)?.name)
-              .join(',')
+              .map((item) => handDetectorStore.getFences.find((fence) => fence.id == item)?.name)
+              .join('、')
           }}
         </template>
       </el-table-column>
@@ -220,7 +220,7 @@ const handleDeleteBatch = async () => {
   } catch {}
 }
 
-const checkedIds = ref<number[]>([])
+const checkedIds = ref<any[]>([])
 const handleRowCheckboxChange = (records: HandDetector[]) => {
   checkedIds.value = records.map((item) => item.id)
 }