diff --git a/frontend/src/api/select/index.ts b/frontend/src/api/select/index.ts index 724b2303..647e773e 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 a95f5ebc..2b4ea885 100644 --- a/frontend/src/components/BasicTable/index.vue +++ b/frontend/src/components/BasicTable/index.vue @@ -596,12 +596,18 @@ const enhancedColumns = computed(() => { 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 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"
>
+