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 @@
发生地点:
- {{ userInfo?.address || userInfo?.gpsErrorMsg }}
+ {{ userInfo?.address }}
+ {{ userInfo?.gpsErrorMsg }}
@@ -72,7 +73,7 @@
const classOption = ref({
step: 0.3, // 速度
});
- const openInfor = ref(false);
+ const openInfor = ref(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 @@
{{ column.customRender({ column, record, index, text }) }}
+
{{ text }}
@@ -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 @@
{{ item.name }}:
- {{ item.customRender(item.value) }}
+
{{ item.name }}:
@@ -109,4 +109,4 @@
}
}
}
-
\ No newline at end of file
+
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 `${record?.gpsErrorMsg || ''}`;
}
},
},
@@ -369,4 +369,4 @@ export function infoContent(res) {
`;
-}
\ No newline at end of file
+}