From 7ab91f158e6e0f17fea4c1b928893986225cf0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=88=E5=85=86=E5=A2=9E?= <你的邮箱@example.com> Date: Mon, 11 May 2026 17:45:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9B=BE=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=9F=BA=E5=9C=B0=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MapModal/components/BasicInfo.vue | 18 +- frontend/src/components/MapModal/index.vue | 18 +- .../src/components/MapModal/setting.config.ts | 3 +- frontend/src/components/gis/GisView.vue | 100380 ++++++++------- frontend/src/components/gis/map.ol.ts | 289 +- frontend/src/layout/components/AppMain.vue | 3 +- frontend/src/permission.ts | 35 +- frontend/src/store/modules/permission.ts | 32 +- frontend/src/utils/request.ts | 16 +- .../views/home/shuiDianKaiFaZhuangKuang.vue | 4 +- .../guoYuSheShiShuJuTianBao/index.vue | 1 + frontend/src/views/system/review/index.vue | 2181 +- 12 files changed, 51718 insertions(+), 51262 deletions(-) diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index 2e8e163..3dca341 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -22,7 +22,9 @@ 保存信息 - 修改记录 + + 修改记录 +
@@ -69,6 +71,15 @@
+ + 123 + @@ -87,7 +98,7 @@ const props = defineProps({ default: "", }, }); -const value1 = ref(dayjs("2009-04-01")); +const visible = ref(false); const loading = ref(false); const tabledata = ref([]); console.log(BasicColumns); @@ -114,6 +125,9 @@ const saveBtn = () => { isEdit.value = false; console.log(tabledata.value); }; +const recordBtn = () => { + visible.value = true; +}; onMounted(() => { loading.value = true; const data = { diff --git a/frontend/src/components/MapModal/index.vue b/frontend/src/components/MapModal/index.vue index cab5d7d..3232755 100644 --- a/frontend/src/components/MapModal/index.vue +++ b/frontend/src/components/MapModal/index.vue @@ -24,12 +24,12 @@ @@ -68,12 +68,11 @@ const props = defineProps<{ // 添加 'update:activeKey' 以支持 v-model:active-key const emit = defineEmits<{ (e: "update:visible", value: boolean): void; - (e: "update:activeKey", key: string): void; (e: "change", key: string): void; }>(); // 内部维护的 activeKey -const currentActiveKey = ref(props.activeKey || ""); +const currentActiveKey = ref(""); // 监听外部传入的 activeKey 变化，同步到内部状态 watch( @@ -89,6 +88,8 @@ watch( () => modelStore.params, (newVal) => { tabsConfig.value = handleTabs(newVal); + let value = tabsConfig.value.find((item: any) => item.default); + currentActiveKey.value = value?.key; }, { deep: true, immediate: true } ); @@ -96,7 +97,6 @@ watch( const onTabChange = (key: string) => { currentActiveKey.value = key; // 通知父组件更新 activeKey (支持 v-model) - emit("update:activeKey", key); // 通知父组件发生了切换事件 (用于业务逻辑，如加载数据) emit("change", key); }; diff --git a/frontend/src/components/MapModal/setting.config.ts b/frontend/src/components/MapModal/setting.config.ts index 9184ff7..4df2541 100644 --- a/frontend/src/components/MapModal/setting.config.ts +++ b/frontend/src/components/MapModal/setting.config.ts @@ -17,7 +17,8 @@ const ENGTabs: Array = [ name: '基础信息', key: 'basicInfo', type: 'basic', - url: '/bbi/siteBipc/getSiteBasicInfo' + url: '/bbi/siteBipc/getSiteBasicInfo', + default: true // 默认显示 }, { name: '阶段属性', diff --git a/frontend/src/components/gis/GisView.vue b/frontend/src/components/gis/GisView.vue index 398b8ae..2437d04 100644 --- a/frontend/src/components/gis/GisView.vue +++ b/frontend/src/components/gis/GisView.vue @@ -25,7 +25,7 @@