From 062afc3d7125ce9e47c914024d29fb6165977f84 Mon Sep 17 00:00:00 2001
From: zk <k12019@aliyun.com>
Date: Tue, 21 May 2024 16:11:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E6=96=87=E5=AD=97=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/body-d-right/oneR.vue                        | 6 +++---
 src/components/secondaryScreen/screen-right/threeR.vue      | 2 +-
 .../secondMap/components/basicTable/BasicTable.vue          | 2 ++
 .../secondaryScreen/secondMap/components/footerDialog.vue   | 4 ++--
 src/components/secondaryScreen/secondMap/secondMapHooks.ts  | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue
index 1855e2f..e320eee 100644
--- a/src/components/body-d-right/oneR.vue
+++ b/src/components/body-d-right/oneR.vue
@@ -43,7 +43,8 @@
                     </div>
                     <div class="con-item">
                         <span>发生地点：</span>
-                        <span>{{ userInfo?.address || userInfo?.gpsErrorMsg }}</span>
+                        <span v-if="userInfo?.address">{{ userInfo?.address }}</span>
+                        <span style="color: #eb3636" v-else>{{ userInfo?.gpsErrorMsg }}</span>
                     </div>
                 </div>
             </template>
@@ -72,7 +73,7 @@
     const classOption = ref({
         step: 0.3, // 速度
     });
-    const openInfor = ref<boolean>(false);
+    const openInfor = ref<boolean>(false); //弹窗显示
     const userInfo = ref({
         realName: '',
         orgName1: '',
@@ -210,7 +211,6 @@
     .police-con {
         color: #ffffff;
         background-color: #00152b;
-        border: 1px solid #129bff;
         padding: 2% 0 2% 5%;
 
         .con-item {
diff --git a/src/components/secondaryScreen/screen-right/threeR.vue b/src/components/secondaryScreen/screen-right/threeR.vue
index e504605..538e18c 100644
--- a/src/components/secondaryScreen/screen-right/threeR.vue
+++ b/src/components/secondaryScreen/screen-right/threeR.vue
@@ -112,7 +112,7 @@
     }
 
     const { refreshState } = useRefresh(PAGE_SWITCH, () => {
-        interval();
+        // interval();
     });
     onUnmounted(() => {
         clearInterval(timer.value);
diff --git a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
index 5371c3c..4d4e887 100644
--- a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
+++ b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
@@ -12,6 +12,7 @@
             <template v-if="column.customRender && isFunction(column.customRender)">
                 {{ column.customRender({ column, record, index, text }) }}
             </template>
+            <slot v-else-if="column.slot" :name="column.slot" v-bind="{ column, record, index, text } || {}"></slot>
             <template v-else>
                 {{ text }}
             </template>
@@ -72,6 +73,7 @@
 
     async function getRecords() {
         try {
+            dataSource.value = [];
             tableLoading.value = true;
             const { code, result } = await props.api({ ...props.apiParams, pageSize: pageSize.value, pageNo: current.value });
             if (code == 200) {
diff --git a/src/components/secondaryScreen/secondMap/components/footerDialog.vue b/src/components/secondaryScreen/secondMap/components/footerDialog.vue
index 074186b..17a4ab2 100644
--- a/src/components/secondaryScreen/secondMap/components/footerDialog.vue
+++ b/src/components/secondaryScreen/secondMap/components/footerDialog.vue
@@ -9,7 +9,7 @@
                 <div v-for="item in detailLeft" :key="item.key">
                     <template v-if="item.customRender">
                         <span class="info-label">{{ item.name }}：</span>
-                        <span class="info-value"> {{ item.customRender(item.value) }}</span>
+                        <span class="info-value" v-html="item.customRender(item.value)"> </span>
                     </template>
                     <template v-else>
                         <span class="info-label">{{ item.name }}：</span>
@@ -109,4 +109,4 @@
             }
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/secondaryScreen/secondMap/secondMapHooks.ts b/src/components/secondaryScreen/secondMap/secondMapHooks.ts
index 9907fd4..d0a47bb 100644
--- a/src/components/secondaryScreen/secondMap/secondMapHooks.ts
+++ b/src/components/secondaryScreen/secondMap/secondMapHooks.ts
@@ -147,7 +147,7 @@ export function useAlarmDetail() {
                 if (record?.lat) {
                     return `${record.lat},${record.lon}`;
                 } else {
-                    return '未知位置';
+                    return `<span style="color: #eb3636;">${record?.gpsErrorMsg || ''}</span>`;
                 }
             },
         },
@@ -369,4 +369,4 @@ export function infoContent(res) {
             </div>
         </div>
     `;
-}
\ No newline at end of file
+}