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, });