From 8c5a9813921f59eb7fb235bb5319532fa0b8f09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com> Date: Fri, 26 Jun 2026 17:52:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=80=81=E8=B0=83=E6=9F=A5-=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/select/index.ts | 8 + frontend/src/api/stdc/index.ts | 139 ++++ frontend/src/components/BasicTable/index.vue | 15 +- .../src/components/SidePanelItem/index.vue | 41 +- frontend/src/main.ts | 1 - frontend/src/modules/Ysdwjc/index.vue | 731 +++++++++++------ .../alongFishMod/TwoLayers/Yanchengyulei.vue | 615 ++++++++++++++ frontend/src/modules/alongFishMod/index.vue | 764 ++++++++++++++---- frontend/src/modules/jidiSelectorMod.vue | 2 +- .../lushengshengtaijiance/LsstjkTk.vue | 234 ++++++ .../modules/lushengshengtaijiance/index.vue | 402 +++++++-- .../shuishengshengtaijiance/SsstdcgkTk.vue | 362 +++++++++ .../modules/shuishengshengtaijiance/index.vue | 439 ++++++++-- frontend/src/store/modules/jidiSelectEvent.ts | 122 ++- .../views/home/shuiDianKaiFaZhuangKuang.vue | 2 +- 15 files changed, 3178 insertions(+), 699 deletions(-) create mode 100644 frontend/src/api/stdc/index.ts create mode 100644 frontend/src/modules/alongFishMod/TwoLayers/Yanchengyulei.vue create mode 100644 frontend/src/modules/lushengshengtaijiance/LsstjkTk.vue create mode 100644 frontend/src/modules/shuishengshengtaijiance/SsstdcgkTk.vue diff --git a/frontend/src/api/select/index.ts b/frontend/src/api/select/index.ts index 337a03f2..dc4d5f78 100644 --- a/frontend/src/api/select/index.ts +++ b/frontend/src/api/select/index.ts @@ -1,4 +1,12 @@ import request from '@/utils/request'; +//水电基地数据获取 +export function wbsbGetKendoList(data: any) { + return request({ + url: '/env/hydrobase/wbsb/GetKendoList', + method: 'post', + data + }); +} // 基地下拉列表 export function getBaseDropdown(data: any) { diff --git a/frontend/src/api/stdc/index.ts b/frontend/src/api/stdc/index.ts new file mode 100644 index 00000000..ce9c8d6e --- /dev/null +++ b/frontend/src/api/stdc/index.ts @@ -0,0 +1,139 @@ +import request from '@/utils/request'; + +//水生生态调查情况-下拉选择框 +export function wbsbGetKendoList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/wbsb/GetKendoList', + method: 'post', + data + }); +} + +// 水生生态调查情况-获取默认年份 +export function getDftYear(data: any) { + return request({ + url: '/api/wmp-env-server/env/we/fisht/year/qgc/GetKendoListCust', + method: 'post', + data + }); +} + +// 水生生态调查情况-获取统计数据 +export function getWeFisht(data: any) { + return request({ + url: '/api/wmp-env-server/env/we/fisht/statics/GetKendoListCust', + method: 'post', + data + }); +} + +// 水生生态调查概况-表格数据接口 +export function getWeStaticsSecond(data: any) { + return request({ + url: '/api/wmp-env-server/env/we/fisht/statics/getWeStaticsSecond', + method: 'post', + data + }); +} + +// 沿程鱼类变化-图表数据接口 +export function fishChanges2(data: any) { + return request({ + url: '/api/wmp-env-server/env/we/fisht/stat/GetKendoListCust', + method: 'post', + data + }); +} + +// 沿程鱼类变化-详情表格接口 +export function fishDetail(data: any) { + return request({ + url: '/api/wmp-env-server/env/we/fisht/detail/GetKendoListCust', + method: 'post', + data + }); +} + +// 沿程鱼类变化-Tab数量统计接口 +export function getTabNum(data: any) { + return request({ + url: '/api/wmp-env-server/env/we/fisht/statTab/GetKendoListCust', + method: 'post', + data + }); +} + +// 沿程鱼类变化-获取断面列表 +export function getStcdList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/vmsstbprpt/noWqDtinType0Auth/GetKendoList', + method: 'post', + data: { + filter: data, + orders: JSON.stringify({ siteStepSort: 'asc' }) + } + }); +} + +// 沿程鱼类变化-基地模式详情表格接口 +export function fishQgcDetail(data: any) { + return request({ + url: '/api/wmp-env-server/env/we/fisht/qgcDetail/GetKendoListCust', + method: 'post', + data + }); +} + +// 陆生生态监测情况-获取统计数据 +export function getEvnmAutoMonitor(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/evnmAutoMonitor/GetKendoListCust', + method: 'post', + data + }); +} + +// 陆生生态监测-红外相机信息表格 +export function getVmsstbprptList(data: any) { + return request({ + url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + method: 'post', + data + }); +} + +// 陆生生态监测-重点陆生动物表格 +export function getTetSpecList(data: any) { + return request({ + url: '/api/wmp-env-server/te/tet/spec/GetKendoListCust', + method: 'post', + data + }); +} + +// 野生动物监测-获取运行数据 +export function getWvaData(data: any) { + return request({ + url: '/api/wmp-env-server/env/wva/GetKendoListCust', + method: 'post', + data + }); +} + +// 野生动物监测-获取默认数据 +export function getWvaDftData(data: any) { + return request({ + url: '/api/wmp-env-server/env/wva/default/GetKendoListCust', + method: 'post', + data + }); +} + +// 野生动物监测-获取默认年份列表 +export function getWvaDftTm(data: any) { + return request({ + url: '/api/wmp-env-server/env/wva/year/GetKendoListCust', + method: 'post', + data + }); +} diff --git a/frontend/src/components/BasicTable/index.vue b/frontend/src/components/BasicTable/index.vue index 8e1e6fdf..49e4eede 100644 --- a/frontend/src/components/BasicTable/index.vue +++ b/frontend/src/components/BasicTable/index.vue @@ -587,22 +587,23 @@ const enhancedColumns = computed(() => { // 处理 merge 配置 if (col.merge && col.dataIndex) { - const baseCol = { - ...col, - customCell: createMergeCellHandler(col) - }; - - // 如果有 slots.customRender,移除 slots + // 如果有 slots.customRender,移除 slots 但保留 customCell if (enhancedCol.slots?.customRender) { const { slots, ...restCol } = enhancedCol; return { ...restCol, + customCell: createMergeCellHandler(col), _slotName: slots.customRender, ...(props.enableEllipsis ? { ellipsis: true } : {}) }; } - return enhancedCol; + // 没有 slots 时,返回包含 customCell 的列配置 + return { + ...enhancedCol, + customCell: createMergeCellHandler(col), + ...(props.enableEllipsis ? { ellipsis: true } : {}) + }; } // 如果有 slots.customRender,移除 slots(由 bodyCell 处理),保留 dataIndex 用于匹配 diff --git a/frontend/src/components/SidePanelItem/index.vue b/frontend/src/components/SidePanelItem/index.vue index c9e04764..abbfc6d5 100644 --- a/frontend/src/components/SidePanelItem/index.vue +++ b/frontend/src/components/SidePanelItem/index.vue @@ -47,26 +47,7 @@
@@ -96,6 +77,26 @@
@expand="handleTreeExpand"
>
+