From e55be0b182455bb3461a87a41cad8f090fc00d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com> Date: Tue, 9 Jun 2026 11:17:07 +0800 Subject: [PATCH] =?UTF-8?q?jidilist=E5=8F=96=E5=80=BC=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/gyss/index.ts | 13 ++- .../EnvironmentalQualityTwoLayers.vue | 8 +- .../modules/EnvironmentalQuality/index.vue | 79 +--------------- .../src/modules/churukushuiwenMod/index.vue | 84 +---------------- ...eixingzuchengjijieruqingkuangTwoLayers.vue | 6 +- .../index.vue | 79 +--------------- .../src/modules/guoyusheshijieshao/index.vue | 6 +- .../TwoLayers/monthlyAverageMaxModal.vue | 90 ++----------------- .../index.vue | 89 ++---------------- .../monthlyAverage.vue | 4 +- .../qixidiheduanjianceqingkuangEJ/index.vue | 72 ++------------- frontend/src/modules/qixidijchuXx/index.vue | 69 ++------------ .../src/modules/shuiWenNianNeiFenBu/index.vue | 83 +---------------- .../TwoLayer/ShuiDianKaiFQKTwoLayer.vue | 21 ++--- .../yanchengshuiwenChangeMod/index.vue | 85 +----------------- 15 files changed, 67 insertions(+), 721 deletions(-) diff --git a/frontend/src/api/gyss/index.ts b/frontend/src/api/gyss/index.ts index 55813673..ab92f77a 100644 --- a/frontend/src/api/gyss/index.ts +++ b/frontend/src/api/gyss/index.ts @@ -2,7 +2,14 @@ import request from '@/utils/request'; //过鱼设施介绍 export function vmsstbprptGetKendoList(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + url: '/vd/vmsstbprpt/GetKendoList', + method: 'post', + data + }); +} +export function fpVmsstbprptGetKendoList(data: any) { + return request({ + url: '/fp/vmsstbprpt/GetKendoList', method: 'post', data }); @@ -10,7 +17,7 @@ export function vmsstbprptGetKendoList(data: any) { //过鱼设施 export function buildGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/env/fp/build/GetKendoListCust', + url: '/fp/build/GetKendoListCust', method: 'post', data }); @@ -18,7 +25,7 @@ export function buildGetKendoListCust(data: any) { //过鱼总量 export function yearGetYearFpStatistics(data: any) { return request({ - url: '/api/wmp-env-server/env/fp/run/qgc/year/GetYearFpStatistics', + url: '/fp/run/qgc/year/GetYearFpStatistics', method: 'get', params:data }); diff --git a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue index 7174a72e..b9d6fa3b 100644 --- a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue +++ b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue @@ -7,9 +7,9 @@ - - {{ item.basename }} + + {{ item.wbsName }} @@ -115,7 +115,7 @@ dayjs.extend(isSameOrAfter) // Props 定义 const props = defineProps<{ - datas?: Array<{ baseid: string; basename: string }> // 基地列表 + datas?: Array<{ wbsCode: string; wbsName: string }> // 基地列表 type?: string // 时间维度 modalData?: string // 模态框数据 dateValue?: string | Dayjs // 日期值 diff --git a/frontend/src/modules/EnvironmentalQuality/index.vue b/frontend/src/modules/EnvironmentalQuality/index.vue index cee6c652..2d3c4279 100644 --- a/frontend/src/modules/EnvironmentalQuality/index.vue +++ b/frontend/src/modules/EnvironmentalQuality/index.vue @@ -23,7 +23,7 @@ - @@ -80,83 +80,6 @@ const datetimePicker = ref({ options: [], }); const baseid = ref("") -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]) const fieldOne = ref('') // 解析API返回的嵌套数据(支持两种结构) const parseApiResponse = (items: any[], currentValueForApi: string, lastYearValue: string) => { diff --git a/frontend/src/modules/churukushuiwenMod/index.vue b/frontend/src/modules/churukushuiwenMod/index.vue index 27ac8e3b..b565b801 100644 --- a/frontend/src/modules/churukushuiwenMod/index.vue +++ b/frontend/src/modules/churukushuiwenMod/index.vue @@ -76,86 +76,6 @@ const baseid = ref(''); // 当前选中的基地ID const modalVisible = ref(false); // 弹框显示状态 const clickDataInfo = ref(null); // 点击的数据点信息 const stationName = ref(''); // 站点名称 - -// ==================== 基地列表数据(硬编码) ==================== -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]) - // ==================== 数据处理函数 ==================== /** @@ -735,8 +655,8 @@ const getselsectData = async () => { let treeData: any = [] const dataMapNameArr: any = Object.entries(obj).map(([, v]) => v) treeData = dataMapNameArr?.sort((a: any, b: any) => { - const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); - const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); + const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value); + const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value); return indexA - indexB; }) console.log('treeData', treeData) diff --git a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue index e7a6ac04..655055fd 100644 --- a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue +++ b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue @@ -5,8 +5,8 @@ - - {{ item.basename }} + + {{ item.wbsName }} @@ -77,7 +77,7 @@ import { useModelStore } from "@/store/modules/model"; const modelStore = useModelStore(); // Props const props = defineProps<{ - datas?: Array<{ baseid: string; basename: string }> // 基地列表 + datas?: Array<{ wbsCode: string; wbsName: string }> // 基地列表 BID?: string // 基地ID data?: { name: string } // 设施类型名称 res?: { bldstt: string; hydrodtin: string } // 初始筛选条件 diff --git a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/index.vue b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/index.vue index df77fb78..e650e89f 100644 --- a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/index.vue +++ b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/index.vue @@ -23,7 +23,7 @@ @@ -58,83 +58,6 @@ const iconMap: Record = { '4': 'icon-dwsjhQita' }; -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]); const res = ref({ hydrodtin: '', bldstt: '' diff --git a/frontend/src/modules/guoyusheshijieshao/index.vue b/frontend/src/modules/guoyusheshijieshao/index.vue index 78bb7e98..1e30aa44 100644 --- a/frontend/src/modules/guoyusheshijieshao/index.vue +++ b/frontend/src/modules/guoyusheshijieshao/index.vue @@ -46,7 +46,7 @@ import { ref, onMounted, onUnmounted, computed, watch } from 'vue'; import SidePanelItem from '@/components/SidePanelItem/index.vue'; import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent"; -import { vmsstbprptGetKendoList } from '@/api/gyss'; +import { fpVmsstbprptGetKendoList } from '@/api/gyss'; import ArtsDetail from '@/components/carouselIntroduce/ArtsDetail.vue'; import { Empty } from 'ant-design-vue'; @@ -75,7 +75,7 @@ defineOptions({ const JidiSelectEventStore = useJidiSelectEventStore(); const baseid = ref('all'); // 默认值为 'all' -const baseUrl = import.meta.env.VITE_APP_PREVIEW_URL; +const baseUrl = import.meta.env.VITE_APP_ATTACHMENT_URL; // 弹框控制 const modalVisible = ref(false); const currentItem = ref(null); @@ -259,7 +259,7 @@ const getCarouselData = async () => { sort: [{ field: 'rstcdStepSort', dir: 'asc' }] }; - const res = await vmsstbprptGetKendoList(params); + const res = await fpVmsstbprptGetKendoList(params); const data = res?.data?.data || []; if (data.length > 0) { diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue index 2f471328..9f31b064 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue @@ -55,7 +55,7 @@ :dataDimensionVal="detailModalData.baseid" :rvcd="detailModalData.rvcd" :stcd="detailModalData.stcd" - :jdList="jiDiList" /> + :jdList="JidiSelectEventStore.jidiData" /> @@ -98,86 +98,6 @@ const showChart = ref(true); // 详情弹框相关状态 const detailModalVisible = ref(false); const detailModalData = ref(null); - -// 基地列表(与父组件保持一致) -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]); - // 选择器相关 - 内部状态管理 const selectValue = ref(''); const selectOptions = ref([]); @@ -445,8 +365,8 @@ const getSelectConfig = async () => { if (dataOne.length > 0) { let dataMapNameMap: any = {} let jiDiListMap: any = {} - jiDiList.value.forEach((item: any) => { - jiDiListMap[item.baseid] = item.basename + JidiSelectEventStore.jidiData.forEach((item: any) => { + jiDiListMap[item.wbsCode] = item.wbsName }) dataOne.map((item: any, index: number) => { @@ -475,8 +395,8 @@ const getSelectConfig = async () => { }) }) dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { - const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); - const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); + const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value); + const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value); return indexA - indexB; }) diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue index 6a327568..8038f574 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue @@ -19,7 +19,7 @@ @@ -69,85 +69,6 @@ const stationName = ref(''); // 图表放大展示弹框状态 const zoomModalVisible = ref(false); -// 基地列表 -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]); - // 选择器配置 const select = ref({ show: true, @@ -238,8 +159,8 @@ const getSelectConfig = async () => { if (dataOne.length > 0) { let dataMapNameMap: any = {} let jiDiListMap: any = {} - jiDiList.value.forEach((item: any) => { - jiDiListMap[item.baseid] = item.basename + JidiSelectEventStore.jidiData.forEach((item: any) => { + jiDiListMap[item.wbsCode] = item.wbsName }) dataOne.map((item: any, index: number) => { @@ -268,8 +189,8 @@ const getSelectConfig = async () => { }) }) dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { - const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); - const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); + const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value); + const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value); return indexA - indexB; }) select.value.options = filterSelectOptions(dataMapNameArr) diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue index d3fd8bbd..723ba4a8 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/monthlyAverage.vue @@ -5,8 +5,8 @@ - - {{ item.basename }} + + {{ item.wbsName }} diff --git a/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue b/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue index 6c04ace9..34a9fbfe 100644 --- a/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue +++ b/frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue @@ -69,7 +69,8 @@ import { ref, computed, watch, onMounted, nextTick } from 'vue'; import { msstbprptGetKendoList, fhGetKendoListCust } from '@/api/qxd'; import BasicTable from '@/components/BasicTable/index.vue'; import { useModelStore } from '@/store/modules/model'; - +import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent"; +const JidiSelectEventStore = useJidiSelectEventStore(); // ==================== Props 定义 ==================== const props = defineProps<{ baseId?: string; @@ -89,68 +90,7 @@ const tableRef = ref(); const stationOptions: any = ref([]); // ==================== 基地列表数据(硬编码) ==================== -const jiDiList: any = ref([ - { - value: 'all', - label: '当前全部' - }, - { - value: '01', - label: '金沙江干流' - }, - { - value: '02', - label: '雅砻江干流' - }, - { - value: '03', - label: '大渡河干流' - }, - { - value: '04', - label: '乌江干流' - }, - { - value: '05', - label: '长江上游干流' - }, - { - value: '10', - label: '湘西' - }, - { - value: '08', - label: '黄河上游干流' - }, - { - value: '09', - label: '黄河中游干流' - }, - { - value: '06', - label: '南盘江-红水河' - }, - { - value: '12', - label: '东北' - }, - { - value: '07', - label: '澜沧江干流' - }, - { - value: '13', - label: '怒江干流' - }, - { - value: '11', - label: '闽浙赣' - }, - { - value: 'other', - label: '其他' - } -]); +const jiDiList: any = ref([]); // 表格列定义 const columns = [ { @@ -439,6 +379,12 @@ const handleViewDetail = (record: any, type: any) => { onMounted(() => { getselectTwo(); handleSearch(); + JidiSelectEventStore.jidiData.forEach(element => { + jiDiList.value.push({ + label: element.wbsName, + value: element.wbsCode + }) + }); }); diff --git a/frontend/src/modules/qixidijchuXx/index.vue b/frontend/src/modules/qixidijchuXx/index.vue index 74e92a9f..6d070a83 100644 --- a/frontend/src/modules/qixidijchuXx/index.vue +++ b/frontend/src/modules/qixidijchuXx/index.vue @@ -49,68 +49,7 @@ defineOptions({ // ==================== 响应式变量定义 ==================== const JidiSelectEventStore = useJidiSelectEventStore(); // ==================== 基地列表数据(硬编码) ==================== -const jiDiList: any = ref([ - { - value: 'all', - label: '当前全部' - }, - { - value: '01', - label: '金沙江干流' - }, - { - value: '02', - label: '雅砻江干流' - }, - { - value: '03', - label: '大渡河干流' - }, - { - value: '04', - label: '乌江干流' - }, - { - value: '05', - label: '长江上游干流' - }, - { - value: '10', - label: '湘西' - }, - { - value: '08', - label: '黄河上游干流' - }, - { - value: '09', - label: '黄河中游干流' - }, - { - value: '06', - label: '南盘江-红水河' - }, - { - value: '12', - label: '东北' - }, - { - value: '07', - label: '澜沧江干流' - }, - { - value: '13', - label: '怒江干流' - }, - { - value: '11', - label: '闽浙赣' - }, - { - value: 'other', - label: '其他' - } -]); +const jiDiList: any = ref([]); const select = ref({ show: true, value: 'all', @@ -420,6 +359,12 @@ const handlePanelChange1 = async data => { // 页面加载时执行 onMounted(() => { // 延迟初始化,确保容器已渲染 + JidiSelectEventStore.jidiData.forEach(element => { + jiDiList.value.push({ + label: element.wbsName, + value: element.wbsCode + }) + }); }); // 组件卸载时清理 diff --git a/frontend/src/modules/shuiWenNianNeiFenBu/index.vue b/frontend/src/modules/shuiWenNianNeiFenBu/index.vue index 69779628..de788324 100644 --- a/frontend/src/modules/shuiWenNianNeiFenBu/index.vue +++ b/frontend/src/modules/shuiWenNianNeiFenBu/index.vue @@ -34,83 +34,7 @@ const showemit = ref(true) // 弹框相关状态 const modalVisible = ref(false) const currentData = ref({}) -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]); + const chartRef = ref(null) let chartInstance: echarts.ECharts | null = null @@ -258,10 +182,9 @@ const getselectData = async () => { } }) - // 按 jiDiList 顺序排序普通基地 dataMapNameArr.sort((a, b) => { - const indexA = jiDiList.value.findIndex((item: any) => item.baseid === a.value) - const indexB = jiDiList.value.findIndex((item: any) => item.baseid === b.value) + const indexA = JidiSelectEventStore.jidiData.findIndex((item: any) => item.wbsCode === a.value) + const indexB = JidiSelectEventStore.jidiData.findIndex((item: any) => item.wbsCode === b.value) return indexA - indexB }) diff --git a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue index 4a43f2a0..974a3508 100644 --- a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue +++ b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue @@ -11,7 +11,7 @@ import { message } from 'ant-design-vue' import { useModelStore } from '@/store/modules/model' import { handleTabs } from '@/components/MapModal/setting.config' import { getKendoList, getKendoListCust, getIntroduce } from '@/api/shuidiankaifa' - +import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent'; // ==================== 开发配置 ==================== const USE_MOCK_DATA = true // 开发时使用模拟数据,生产时改为 false @@ -62,7 +62,7 @@ interface ModalData { // 引入 modelStore 用于控制全局 MapModal const modelStore = useModelStore() - +const JidiSelectEventStore = useJidiSelectEventStore(); // 基地相关 const qid = ref('') const jiDiList = ref([]) @@ -1190,17 +1190,12 @@ watch( */ onMounted(() => { // 模拟加载基地列表(更真实的基地数据) - jiDiList.value = [ - { baseid: 'all', basename: '全部基地' }, - { baseid: 'cj', basename: '长江流域' }, - { baseid: 'hh', basename: '黄河流域' }, - { baseid: 'zj', basename: '珠江流域' }, - { baseid: 'hh2', basename: '淮河流域' }, - { baseid: 'hj', basename: '海河流域' }, - { baseid: 'sj', basename: '松花江流域' }, - { baseid: 'lj', basename: '辽河流域' }, - { baseid: 'other', basename: '其他' } - ] + JidiSelectEventStore.jidiData.forEach(element => { + jiDiList.value.push({ + label: element.wbsName, + value: element.wbsCode + }) + }); // 设置默认选中"全部基地" if (!qid.value) { diff --git a/frontend/src/modules/yanchengshuiwenChangeMod/index.vue b/frontend/src/modules/yanchengshuiwenChangeMod/index.vue index 2b0380e2..4f74f749 100644 --- a/frontend/src/modules/yanchengshuiwenChangeMod/index.vue +++ b/frontend/src/modules/yanchengshuiwenChangeMod/index.vue @@ -53,83 +53,6 @@ const prompts = computed(() => ({ show: true, value: `注:最新数据时间为${dataOne.value || getCurrentHourTime()}`, })); -const jiDiList: any = ref([ - { - "baseid": "all", - "basename": "当前全部", - "id": "9BFEC848-83EA-AD22-6DE2-10E969476693" - }, - { - "baseid": "01", - "basename": "金沙江干流", - "id": "A33040B7-8977-D9F1-5E02-D7F0241AB8AA" - }, - { - "baseid": "02", - "basename": "雅砻江干流", - "id": "C63D6020-995D-FE97-2F4A-F619A7142C79" - }, - { - "baseid": "03", - "basename": "大渡河干流", - "id": "CCB0766B-F1D4-7DD6-650F-5C556B7231B3" - }, - { - "baseid": "04", - "basename": "乌江干流", - "id": "E8A66641-B4F4-CC85-0815-38C5B2F93DBD" - }, - { - "baseid": "05", - "basename": "长江上游干流", - "id": "E02C11E9-CEA5-A030-202F-3BFE84465D03" - }, - { - "baseid": "10", - "basename": "湘西", - "id": "B1D1D52D-CEEF-6DC4-27DF-9990EB572F8D" - }, - { - "baseid": "08", - "basename": "黄河上游干流", - "id": "BC6AF135-263D-09A9-D5CA-C99B2598FE6E" - }, - { - "baseid": "09", - "basename": "黄河中游干流", - "id": "60EEEC28-128F-A2A8-44F3-6EAAC8FD8BB6" - }, - { - "baseid": "06", - "basename": "南盘江-红水河", - "id": "7BB9A8F4-34B5-42B4-A7FC-CE910AD7F203" - }, - { - "baseid": "12", - "basename": "东北", - "id": "47F8EF06-924E-E161-FCAF-62A66BBF252D" - }, - { - "baseid": "07", - "basename": "澜沧江干流", - "id": "A966A4C9-278C-B0DA-2B97-2D10B7A6E96A" - }, - { - "baseid": "13", - "basename": "怒江干流", - "id": "FA89E8CB-67A8-76DA-DC1E-23AE4C54F9E4" - }, - { - "baseid": "11", - "basename": "闽浙赣", - "id": "CD98F995-EEB2-1021-D807-DA1B1AD9E49A" - }, - { - "baseid": "other", - "basename": "其他", - "id": "AFBDFC67-B955-4EFD-959A-014CFB59EBFC" - } -]) const showemit = ref(false) const loading = ref(false) // const selectOptions: any = ref([]) @@ -462,8 +385,8 @@ const getSelectConfig = async () => { if (dataOne.length > 0) { let dataMapNameMap: any = {} let jiDiListMap: any = {} - jiDiList.value.forEach((item: any) => { - jiDiListMap[item.baseid] = item.basename + JidiSelectEventStore.jidiData.forEach((item: any) => { + jiDiListMap[item.wbsCode] = item.wbsName }) dataOne.map((item: any, index: number) => { @@ -492,8 +415,8 @@ const getSelectConfig = async () => { }) }) dataMapNameArr = dataMapNameArr.sort((a: any, b: any) => { - const indexA = jiDiList.value.findIndex(item => item.baseid === a.value); - const indexB = jiDiList.value.findIndex(item => item.baseid === b.value); + const indexA = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === a.value); + const indexB = JidiSelectEventStore.jidiData.findIndex(item => item.wbsCode === b.value); return indexA - indexB; }) select.value.options = filterSelectOptions(dataMapNameArr)