From 988c2365de715c8c67e4b6543c9cf000dd4383f6 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Tue, 25 Mar 2025 11:59:16 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=BA=86=E9=98=B3?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=A4=A9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=85=B6=E4=BD=99=E5=A4=A7=E5=B1=8F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=202.=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9table=E6=A8=A1=E5=9D=97=EF=BC=8C=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E5=90=8E=EF=BC=8C=E6=89=8D=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/basicTable/BasicTable.vue      | 14 +++++++------
 src/views/centralScreen/centralScreen.vue     |  2 +-
 src/views/centralScreen/centralScreenD.vue    | 21 ++++++++++++++++---
 .../centralScreen/centralScreenYinChuan.vue   |  6 ++++--
 .../components/terminalAlarm.vue              | 10 ++++-----
 .../components/terminalAlarmDialog.vue        | 12 +++++++++--
 6 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
index 315eeef..c6e58d1 100644
--- a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
+++ b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
@@ -95,12 +95,14 @@
 
     watch(
         props,
-        () => {
-            nextTick(() => {
-                pageSize.value = 10;
-                current.value = 1;
-                getRecords();
-            });
+        (v, o) => {
+            if (JSON.stringify(v) !== JSON.stringify(o)) {
+                nextTick(() => {
+                    pageSize.value = 10;
+                    current.value = 1;
+                    getRecords();
+                });
+            }
         },
         {
             immediate: true,
diff --git a/src/views/centralScreen/centralScreen.vue b/src/views/centralScreen/centralScreen.vue
index 8add11b..c2e62d6 100644
--- a/src/views/centralScreen/centralScreen.vue
+++ b/src/views/centralScreen/centralScreen.vue
@@ -117,7 +117,7 @@
         dayTimeT.value = timeRight;
     }
 
-    const setting = getSettings(DataType.yinChuan);
+    const setting = getSettings(DataType.xian);
     onMounted(async () => {
         try {
             options.value = {
diff --git a/src/views/centralScreen/centralScreenD.vue b/src/views/centralScreen/centralScreenD.vue
index a04e041..cbf1d1e 100644
--- a/src/views/centralScreen/centralScreenD.vue
+++ b/src/views/centralScreen/centralScreenD.vue
@@ -37,7 +37,13 @@
                 </div>
                 <div class="body-d-right body-d-right-s">
                     <!--健康终端报警-->
-                    <TerminalAlarm :refreshState="refreshState" :setting="setting" :set-inter="true" @emit-view-detail="handleEmployeeDialog" />
+                    <TerminalAlarm
+                        :refreshState="refreshState"
+                        :setting="setting"
+                        :set-inter="true"
+                        :time-interval="getTimeInterval()"
+                        @emit-view-detail="handleEmployeeDialog"
+                    />
                     <!--员工队伍健康状况-->
                     <EmployeeHealth theme="dark" :refreshState="refreshState" :setting="setting" />
                     <!--体检数据-->
@@ -53,7 +59,11 @@
         <!--呼入电话、受理电话-->
         <PhoneDialog ref="phoneDialogRef" :phoneType="phoneType" :setting="setting" :title="phoneDialogTitle" :useForm="true" />
         <!--健康终端查看详情-->
-        <TerminalAlarmDialog ref="terminalAlarmDialogRef" :setting="setting" />
+        <TerminalAlarmDialog
+            ref="terminalAlarmDialogRef"
+            :setting="setting"
+            :time-interval="{ startDate: dayjs().format('YYYY-MM-DD'), endDate: dayjs().format('YYYY-MM-DD') }"
+        />
     </div>
 </template>
 <script setup lang="ts">
@@ -79,6 +89,7 @@
     import { basicPath, emergencyPath, useSocket, yinChuanPath } from '/@/utils/socket.ts';
     import { handleSocketUrl } from '/@/views/centralScreen/components/centerMapHooks.ts';
     import LoginOutButton from '/@/views/components/loginOutButton.vue';
+    import dayjs from 'dayjs';
 
     const userStore = useUserStore();
     let { simpleName, centerTel, screenTitle } = userStore.getCenterInfo || { simpleName: '', centerTel: '', screenTitle: '' };
@@ -111,6 +122,10 @@
         }, 1000);
     }
 
+    function getTimeInterval() {
+        return { startDate: dayjs().format('YYYY-MM-DD'), endDate: dayjs().format('YYYY-MM-DD') };
+    }
+
     const { getCenterInfo } = useUserStore();
     function getTime() {
         const { timeLeft, timeRight } = useTopTime(getCenterInfo?.commissioningTime);
@@ -118,7 +133,7 @@
         dayTimeT.value = timeRight;
     }
 
-    const setting = getSettings(DataType.yinChuan);
+    const setting = getSettings(DataType.xian);
     onMounted(async () => {
         try {
             screenPath.value = getCenterInfo?.screenPath;
diff --git a/src/views/centralScreen/centralScreenYinChuan.vue b/src/views/centralScreen/centralScreenYinChuan.vue
index 80dd904..9af2190 100644
--- a/src/views/centralScreen/centralScreenYinChuan.vue
+++ b/src/views/centralScreen/centralScreenYinChuan.vue
@@ -55,6 +55,7 @@
         <PhoneDialog ref="phoneDialogRef" :phoneType="phoneType" :setting="setting" :title="phoneDialogTitle" :useForm="true" />
         <!--健康终端查看详情-->
         <TerminalAlarmDialog ref="terminalAlarmDialogRef" :setting="setting" />
+        <emergency-data-dialog ref="emergencyDataDialog" />
     </div>
 </template>
 <script setup lang="ts">
@@ -81,6 +82,8 @@
     import { handleSocketUrl } from '/@/views/centralScreen/components/centerMapHooks.ts';
     import LoginOutButton from '/@/views/components/loginOutButton.vue';
     import EmergencyData from '/@/views/centralScreen/components/emergencyData/emergencyData.vue';
+    import dayjs from 'dayjs';
+    import EmergencyDataDialog from '/@/views/yinChuan/componetns/emergencyData/components/emergencyDataDialog.vue';
 
     const userStore = useUserStore();
     let { simpleName, centerTel, screenTitle } = userStore.getCenterInfo || { simpleName: '', centerTel: '', screenTitle: '' };
@@ -119,7 +122,7 @@
         dayTimeT.value = timeRight;
     }
 
-    const setting = getSettings(DataType.yinChuan);
+    const setting = getSettings(DataType.xian);
     onMounted(async () => {
         try {
             options.value = {
@@ -131,7 +134,6 @@
             console.log(e);
         }
 
-        console.log([getCenterInfo?.longitude || 106.32, getCenterInfo?.latitude || 38.45]);
         init();
         document.title = title.value;
         openTestModal();
diff --git a/src/views/centralScreen/components/terminalAlarm.vue b/src/views/centralScreen/components/terminalAlarm.vue
index 494e12e..50a0a2d 100644
--- a/src/views/centralScreen/components/terminalAlarm.vue
+++ b/src/views/centralScreen/components/terminalAlarm.vue
@@ -105,6 +105,10 @@
             type: Boolean,
             default: () => false,
         },
+        timeInterval: {
+            type: Object,
+            default: () => {},
+        },
     });
     const { themeType } = useTheme();
     const emit = defineEmits(['emit-view-detail']);
@@ -175,15 +179,11 @@
                 codeList = props.setting?.orgCode;
             }
             // 如果为庆阳应急中心，需要拼上当天的日期
-            let p = {
-                startDate: dayjs().format('YYYY-MM-DD'),
-                endDate: dayjs().format('YYYY-MM-DD'),
-            };
             const { code, result } = await getMonitorList({
                 pageSize: 10,
                 pageNo: 1,
                 orgCodeList: codeList,
-                ...(props.setInter ? p : {}),
+                ...(props.setInter ? props.timeInterval : {}),
             });
             if (code == 200) {
                 setSession(RIGHT_KEY1_NEW, JSON.stringify(result.records));
diff --git a/src/views/centralScreen/components/terminalAlarmDialog.vue b/src/views/centralScreen/components/terminalAlarmDialog.vue
index 18521a7..3db29a8 100644
--- a/src/views/centralScreen/components/terminalAlarmDialog.vue
+++ b/src/views/centralScreen/components/terminalAlarmDialog.vue
@@ -26,6 +26,10 @@
         wrapperCol: Object,
         setting: Object,
         phoneType: String,
+        timeInterval: {
+            type: Object,
+            default: () => {},
+        },
     });
 
     const columns = [
@@ -75,15 +79,19 @@
     ];
     const userStore = useUserStore();
 
+    console.log(props.timeInterval);
     const formState = computed(() => ({
         dataType: props.setting.dataType,
         // orgCode: props.setting?.orgCode,
         orgCodeList: userStore.getCenterInfo?.serviceScope,
+        ...props.timeInterval,
     }));
     const { visible, closeDialog, openDialog } = useDialog({ title: props.title });
     const registerTable = ref();
-    watch(props, () => {
-        registerTable.value?.getRecords();
+    watch(props, (v, o) => {
+        if (JSON.stringify(v) !== JSON.stringify(o)) {
+            registerTable.value?.getRecords();
+        }
     });
     defineExpose({
         openDialog,