From e4a5135eb9b4b9994ffda0510570b9b3afc75791 Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Fri, 24 Oct 2025 12:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E4=BD=93=E6=8A=A5=E8=AD=A6=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandDevice/Home/components/services/marker.service.ts  |  4 ++--
 web/src/views/HandDevice/Home/index.vue                    | 14 ++++++++++----
 web/src/views/gas/handalarm/index.vue                      |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/web/src/views/HandDevice/Home/components/services/marker.service.ts b/web/src/views/HandDevice/Home/components/services/marker.service.ts
index 0d5ec71..f9d86f5 100644
--- a/web/src/views/HandDevice/Home/components/services/marker.service.ts
+++ b/web/src/views/HandDevice/Home/components/services/marker.service.ts
@@ -135,8 +135,8 @@ export class MarkerService {
     this.map?.addLayer(this.markerLayer)
 
     // 获取所有图层
-    const layers = this.map?.getLayers().getArray() || []
-    console.log('this.currentLayerMode', this.currentLayerMode, layers)
+    // const layers = this.map?.getLayers().getArray() || []
+    // console.log('this.currentLayerMode', this.currentLayerMode, layers)
   }
 
   /**
diff --git a/web/src/views/HandDevice/Home/index.vue b/web/src/views/HandDevice/Home/index.vue
index 639e0df..6c507dc 100644
--- a/web/src/views/HandDevice/Home/index.vue
+++ b/web/src/views/HandDevice/Home/index.vue
@@ -18,7 +18,7 @@
     <div class="markerList">
       <el-scrollbar height="100%">
         <!--marker列表  -->
-        <el-collapse accordion>
+        <el-collapse accordion @change="collapseChange">
           <el-collapse-item :name="item.name" v-for="item in filterMarkers" :key="item.id">
             <template #title>
               <div class="flex flex-row w-100%">
@@ -40,6 +40,10 @@
               <!-- <div> <span>在线状态：</span>{{ item.onlineStatus }}</div> -->
               <div> <span>数值：</span>{{ item.value }} {{ item.unit }}</div>
               <div> <span>时间：</span>{{ dayjs(item.time).format('YYYY-MM-DD HH:mm:ss') }}</div>
+              <!-- <div>
+                <el-button type="primary" size="small">定位</el-button>
+                <el-button type="primary" size="small">轨迹</el-button>
+              </div> -->
 
               <!-- {{ item }} -->
             </div>
@@ -74,6 +78,9 @@ const fences = ref<FenceData[]>([])
 
 const mapRef = ref<typeof OpenLayerMap>()
 const search = ref('')
+function collapseChange(name: string) {
+  console.log('collapseChange', name)
+}
 watch(
   () => search.value,
   (newSearch, oldSearch) => {
@@ -121,7 +128,7 @@ const getMarkers = async () => {
       }
     })
     markers.value = res2 as unknown as any[]
-      getMarkersHistory()
+    getMarkersHistory()
   })
 }
 const getFences = async () => {
@@ -154,7 +161,7 @@ const getMarkersHistory = async () => {
             ...j,
             lng: j.longitude,
             lat: j.latitude,
-            time:dayjs(j.ts).format('YYYY-MM-DD HH:mm:ss'),
+            time: dayjs(j.ts).format('YYYY-MM-DD HH:mm:ss'),
             timeStr: dayjs(j.ts).format('YYYY-MM-DD HH:mm:ss')
           }
         })
@@ -169,7 +176,6 @@ onMounted(() => {
 
   getFences()
 
-
   console.log('定时器，暂时关掉，太烦了')
 
   getDataTimer.value = setInterval(() => {
diff --git a/web/src/views/gas/handalarm/index.vue b/web/src/views/gas/handalarm/index.vue
index 48330b5..e7a662f 100644
--- a/web/src/views/gas/handalarm/index.vue
+++ b/web/src/views/gas/handalarm/index.vue
@@ -227,7 +227,7 @@
         <template #default="scope">
           <!-- <el-button link type="primary" @click="openForm('update', scope.row.id)">
             查看位置
-          </el-button>
+          </el-button>-->
 
           <el-button
             link
@@ -236,7 +236,7 @@
             v-hasPermi="['gas:hand-alarm:update']"
           >
             编辑
-          </el-button> -->
+          </el-button> 
           <!-- <el-button
             link
             type="danger"