From 0cbabf8d9c7e0df2d4ef2108ab34af203da670c1 Mon Sep 17 00:00:00 2001 From: xh <11675084@qq.com> Date: Tue, 28 Oct 2025 14:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/public/map.html | 360 --------------------- .../Home/components/constants/map.constants.ts | 2 +- .../Home/components/services/marker.service.ts | 4 +- web/src/views/HandDevice/Home/index.vue | 2 +- 4 files changed, 4 insertions(+), 364 deletions(-) delete mode 100644 web/public/map.html diff --git a/web/public/map.html b/web/public/map.html deleted file mode 100644 index 1db1106..0000000 --- a/web/public/map.html +++ /dev/null @@ -1,360 +0,0 @@ - - - - - - 轨迹点实现 - - - - -
- - -
轨迹信息将显示在这里
-
-
-
- - - - diff --git a/web/src/views/HandDevice/Home/components/constants/map.constants.ts b/web/src/views/HandDevice/Home/components/constants/map.constants.ts index 7abbe89..ac35546 100644 --- a/web/src/views/HandDevice/Home/components/constants/map.constants.ts +++ b/web/src/views/HandDevice/Home/components/constants/map.constants.ts @@ -21,7 +21,7 @@ export const STATUS_DICT = { ] as StatusDictItem[], fenceStatus: [ { value: '0', label: '正常', cssClass: '#67c23a' }, - { value: '1', label: '一级围栏报警', cssClass: '#e6a23c' } + { value: '1', label: '围栏报警', cssClass: '#e6a23c' } // { value: '2', label: '二级围栏报警', cssClass: '#f56c6c' } ] as StatusDictItem[] } 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 db45ae0..b21bea9 100644 --- a/web/src/views/HandDevice/Home/components/services/marker.service.ts +++ b/web/src/views/HandDevice/Home/components/services/marker.service.ts @@ -125,8 +125,8 @@ export class MarkerService { renderOrder: (a, b) => { // console.log('renderOrder',a,b.get('markerData').time); - // 按xxx属性降序排列 - return a.get('markerData').statusPriority - b.get('markerData').statusPriority + // 按xxx属性排列 + return b.get('markerData').statusPriority - a.get('markerData').statusPriority } }) } diff --git a/web/src/views/HandDevice/Home/index.vue b/web/src/views/HandDevice/Home/index.vue index 25e8e9a..86fbdb9 100644 --- a/web/src/views/HandDevice/Home/index.vue +++ b/web/src/views/HandDevice/Home/index.vue @@ -154,7 +154,7 @@ const getMarkers = async () => { statusLabel: getStatusLabel(statusStr), //状态标签 statusPriority: getStatusPriority(statusStr), //状态优先级, } - }) + }).sort((a,b) => a.statusPriority - b.statusPriority) markers.value = res2 }) }