From 4f848e7ce9b36e5a723603ee34a9bc2b0ea56d8a Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Wed, 1 Apr 2026 14:48:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(emergency,healthMonitor):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为通知消息弹窗的\"保存并发送\"和\"保存\"按钮添加 loading 状态和 disabled 禁用,防止重复提交 - 优化应急管理列表页面和 AED 设备地图页面的代码格式 --- src/components/Video/VideoPreview.vue | 2 +- src/views/emergency/aed/deviceMap/index.vue | 13 +++++++++- .../emergencyManage/emergencyManageList.vue | 26 +++++++++---------- .../componets/notificationNewsModal.vue | 7 +++-- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/components/Video/VideoPreview.vue b/src/components/Video/VideoPreview.vue index 6f4c99f..a1f74d4 100644 --- a/src/components/Video/VideoPreview.vue +++ b/src/components/Video/VideoPreview.vue @@ -20,7 +20,7 @@ fontSize: props.size ?? '30px', opacity: 0.5, transition: 'opacity 0.5s', - display: 'none', + display: 'block', }); const bodyStyle = ref({ diff --git a/src/views/emergency/aed/deviceMap/index.vue b/src/views/emergency/aed/deviceMap/index.vue index bcf9acf..ebb1a26 100644 --- a/src/views/emergency/aed/deviceMap/index.vue +++ b/src/views/emergency/aed/deviceMap/index.vue @@ -40,7 +40,7 @@ />
{{ showWindowInfo?.name }}
-
距离{{ showWindowInfo?.dis ? showWindowInfo?.dis : 0 }}m
+
距离{{ formatDistance(showWindowInfo?.dis) }}
{{ showWindowInfo?.installAddress ? showWindowInfo?.installAddress : '无' }}
设备厂家:
@@ -411,6 +411,17 @@ window.open(getFileAccessHttpUrl(v), '_blank'); } + /** + * 格式化距离:超过1000米换算为千米,保留两位小数 + */ + function formatDistance(dis) { + if (!dis) return '0m'; + if (dis >= 1000) { + return (dis / 1000).toFixed(2) + 'km'; + } + return dis + 'm'; + } + function getName(val, list) { if (!val && val !== 0) return ''; for (let i = 0; i < list.length; i++) { diff --git a/src/views/emergency/emergencyManage/emergencyManageList.vue b/src/views/emergency/emergencyManage/emergencyManageList.vue index db1b021..1b90da4 100644 --- a/src/views/emergency/emergencyManage/emergencyManageList.vue +++ b/src/views/emergency/emergencyManage/emergencyManageList.vue @@ -212,17 +212,17 @@ const [registerTable, { reload, getForm, getDataSource, setTableData }] = tableContext; diff --git a/src/views/healthMonitor/healMonitorManage/monitorToll/notificationNews/componets/notificationNewsModal.vue b/src/views/healthMonitor/healMonitorManage/monitorToll/notificationNews/componets/notificationNewsModal.vue index f68ca5f..68a4559 100644 --- a/src/views/healthMonitor/healMonitorManage/monitorToll/notificationNews/componets/notificationNewsModal.vue +++ b/src/views/healthMonitor/healMonitorManage/monitorToll/notificationNews/componets/notificationNewsModal.vue @@ -7,8 +7,8 @@