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 @@
取消
- 保存并发送
- 保存
+ 保存并发送
+ 保存