优化

web/src/views/HandDevice/Home/components/composables/useMapEvents.ts

@@ -190,12 +190,12 @@ export const useMapEvents = () => {
       case 'fence':
       case 'fence-label':
         // popupContent = popupGenerator.handleFence(feature)
-        return false
         break
       default:
         popupContent = popupGenerator.handleMarker(feature)
         break
     }
+    if (!popupContent) return false
     // if (!popupContent) return
     popupElement.innerHTML = popupContent
     popupOverlay.setPosition(event.coordinate)

web/src/views/HandDevice/Home/components/services/popup.service.ts

@@ -90,6 +90,7 @@ export class PopupService {
       return this.handleSingleMarkerPopup(markerData as MarkerData)
     }
 
-    return this.handleDefaultPopup()
+    // return this.handleDefaultPopup()
+    return ''
   }
 }

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

@@ -6,7 +6,7 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="120px"
+      label-width="80px"
     >
       <el-form-item label="SN" prop="sn">
         <el-input
@@ -101,6 +101,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="160px" />
       <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
           <el-button
@@ -144,6 +145,8 @@ import { DICT_TYPE } from '@/utils/dict'
 import { Fence } from '@/api/gas/fence'
 import type { Type } from '@/api/gas/gastype'
 import { useHandDetectorStore } from '@/store/modules/handDetector'
+import { dateFormatter } from '@/utils/formatTime'
+
 /** GAS手持探测器 列表 */
 defineOptions({ name: 'HandDetector' })
 const handDetectorStore = useHandDetectorStore()

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

@@ -153,7 +153,7 @@
       /> -->
 
       <el-table-column
-        label="创建时间"
+        label="上报时间"
         align="center"
         prop="ts"
         :formatter="dateFormatter"