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 @@
- + @@ -53,7 +59,11 @@ - +