From 58d3b5a9330c0d642160602ae6f0f2c7cf83a883 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Tue, 25 Mar 2025 15:34:10 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E4=BF=AE=E6=94=B9table=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E6=94=B9=E5=9B=9E=E5=8E=9F=E6=9C=89=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/basicTable/BasicTable.vue      | 14 ++++++-------
 .../components/terminalAlarmDialog.vue        | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
index c6e58d1..315eeef 100644
--- a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
+++ b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
@@ -95,14 +95,12 @@
 
     watch(
         props,
-        (v, o) => {
-            if (JSON.stringify(v) !== JSON.stringify(o)) {
-                nextTick(() => {
-                    pageSize.value = 10;
-                    current.value = 1;
-                    getRecords();
-                });
-            }
+        () => {
+            nextTick(() => {
+                pageSize.value = 10;
+                current.value = 1;
+                getRecords();
+            });
         },
         {
             immediate: true,
diff --git a/src/views/centralScreen/components/terminalAlarmDialog.vue b/src/views/centralScreen/components/terminalAlarmDialog.vue
index 3db29a8..e698f73 100644
--- a/src/views/centralScreen/components/terminalAlarmDialog.vue
+++ b/src/views/centralScreen/components/terminalAlarmDialog.vue
@@ -80,19 +80,23 @@
     const userStore = useUserStore();
 
     console.log(props.timeInterval);
-    const formState = computed(() => ({
-        dataType: props.setting.dataType,
+    // const formState = computed(() => ({
+    //     dataType: props.setting.dataType,
+    //     // orgCode: props.setting?.orgCode,
+    //     orgCodeList: userStore.getCenterInfo?.serviceScope,
+    //     ...props.timeInterval,
+    // }));
+    const formState = ref({
+        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, (v, o) => {
-        if (JSON.stringify(v) !== JSON.stringify(o)) {
-            registerTable.value?.getRecords();
-        }
-    });
+    // watch(props, (v, o) => {
+    //     registerTable.value?.getRecords();
+    // });
     defineExpose({
         openDialog,
     });