From 5a36130ae8aa53540093f38a885b460e47c27ab8 Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Fri, 17 Oct 2025 18:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E8=A1=A8=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E5=9B=B4=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/api/gas/handdetector/index.ts | 3 ++-
web/src/views/HandDevice/Home/index.vue | 10 ++++++----
web/src/views/gas/handdetector/index.vue | 8 ++++----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/web/src/api/gas/handdetector/index.ts b/web/src/api/gas/handdetector/index.ts
index 10222ec..182f99e 100644
--- a/web/src/api/gas/handdetector/index.ts
+++ b/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 // 测量范围中的最小值
diff --git a/web/src/views/HandDevice/Home/index.vue b/web/src/views/HandDevice/Home/index.vue
index ad95c5d..2d34251 100644
--- a/web/src/views/HandDevice/Home/index.vue
+++ b/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)
diff --git a/web/src/views/gas/handdetector/index.vue b/web/src/views/gas/handdetector/index.vue
index 2fdc357..0e49682 100644
--- a/web/src/views/gas/handdetector/index.vue
+++ b/web/src/views/gas/handdetector/index.vue
@@ -73,13 +73,13 @@
-
+
{{
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('、')
}}
@@ -220,7 +220,7 @@ const handleDeleteBatch = async () => {
} catch {}
}
-const checkedIds = ref([])
+const checkedIds = ref([])
const handleRowCheckboxChange = (records: HandDetector[]) => {
checkedIds.value = records.map((item) => item.id)
}