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" > +
+
+
diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 48e4d1a4..69c40277 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -48,7 +48,6 @@ app .use(router) .use(ElementPlus) .use(Antd) - .use(Antd) .use(WujieVue) .use(i18n) .mount('#app'); diff --git a/frontend/src/modules/Ysdwjc/index.vue b/frontend/src/modules/Ysdwjc/index.vue index 63451fcc..76ad8bfa 100644 --- a/frontend/src/modules/Ysdwjc/index.vue +++ b/frontend/src/modules/Ysdwjc/index.vue @@ -1,320 +1,541 @@ - + \ No newline at end of file + diff --git a/frontend/src/modules/alongFishMod/TwoLayers/Yanchengyulei.vue b/frontend/src/modules/alongFishMod/TwoLayers/Yanchengyulei.vue new file mode 100644 index 00000000..8d7f6e9f --- /dev/null +++ b/frontend/src/modules/alongFishMod/TwoLayers/Yanchengyulei.vue @@ -0,0 +1,615 @@ + + + + + + diff --git a/frontend/src/modules/alongFishMod/index.vue b/frontend/src/modules/alongFishMod/index.vue index 91763f43..937433fa 100644 --- a/frontend/src/modules/alongFishMod/index.vue +++ b/frontend/src/modules/alongFishMod/index.vue @@ -1,209 +1,631 @@ - + \ No newline at end of file + +.empty-placeholder { + width: 100%; + min-height: 231px; + display: flex; + background: #fff; + flex-direction: column; + justify-content: center; + align-items: center; +} + +:deep(.ant-empty-description) { + text-indent: 0em !important; +} + diff --git a/frontend/src/modules/jidiSelectorMod.vue b/frontend/src/modules/jidiSelectorMod.vue index 79b7984c..d0d19ebe 100644 --- a/frontend/src/modules/jidiSelectorMod.vue +++ b/frontend/src/modules/jidiSelectorMod.vue @@ -14,7 +14,7 @@ onMounted(() => {}); + + + + diff --git a/frontend/src/modules/lushengshengtaijiance/index.vue b/frontend/src/modules/lushengshengtaijiance/index.vue index e67352da..3b2b33d9 100644 --- a/frontend/src/modules/lushengshengtaijiance/index.vue +++ b/frontend/src/modules/lushengshengtaijiance/index.vue @@ -1,133 +1,361 @@ \ No newline at end of file + +:deep(.ant-spin-nested-loading) { + min-height: 72px; +} + diff --git a/frontend/src/modules/shuishengshengtaijiance/SsstdcgkTk.vue b/frontend/src/modules/shuishengshengtaijiance/SsstdcgkTk.vue new file mode 100644 index 00000000..dbab8517 --- /dev/null +++ b/frontend/src/modules/shuishengshengtaijiance/SsstdcgkTk.vue @@ -0,0 +1,362 @@ + + + + + diff --git a/frontend/src/modules/shuishengshengtaijiance/index.vue b/frontend/src/modules/shuishengshengtaijiance/index.vue index 6a965c25..723cb7dc 100644 --- a/frontend/src/modules/shuishengshengtaijiance/index.vue +++ b/frontend/src/modules/shuishengshengtaijiance/index.vue @@ -1,133 +1,400 @@ \ No newline at end of file + +:deep(.ant-spin-nested-loading) { + min-height: 72px; +} + diff --git a/frontend/src/store/modules/jidiSelectEvent.ts b/frontend/src/store/modules/jidiSelectEvent.ts index 39ed9496..6364b530 100644 --- a/frontend/src/store/modules/jidiSelectEvent.ts +++ b/frontend/src/store/modules/jidiSelectEvent.ts @@ -1,81 +1,15 @@ import { defineStore } from 'pinia'; -import { ref } from 'vue'; - +import { ref, onMounted } from 'vue'; +import { wbsbGetKendoList } from '@/api/select'; export const useJidiSelectEventStore = defineStore('jidiSelectEvent', () => { const jidiData: any = ref([ { wbsCode: 'all', wbsName: '当前全部', selected: true - }, - { - wbsCode: '01', - wbsName: '金沙江干流', - selected: false - }, - { - wbsCode: '02', - wbsName: '雅砻江干流', - selected: false - }, - { - wbsCode: '03', - wbsName: '大渡河干流', - selected: false - }, - { - wbsCode: '04', - wbsName: '乌江干流', - selected: false - }, - { - wbsCode: '05', - wbsName: '长江上游干流', - selected: false - }, - { - wbsCode: '10', - wbsName: '湘西', - selected: false - }, - { - wbsCode: '08', - wbsName: '黄河上游干流', - selected: false - }, - { - wbsCode: '09', - wbsName: '黄河中游干流', - selected: false - }, - { - wbsCode: '06', - wbsName: '南盘江-红水河', - selected: false - }, - { - wbsCode: '12', - wbsName: '东北', - selected: false - }, - { - wbsCode: '07', - wbsName: '澜沧江干流', - selected: false - }, - { - wbsCode: '13', - wbsName: '怒江干流' - }, - { - wbsCode: '11', - wbsName: '闽浙赣' - }, - { - wbsCode: 'other', - wbsName: '其他' } ]); + const loading = ref(false); const selectedItem = ref(jidiData.value[0]); const updataJidiData = (index: any) => { console.log(index); @@ -85,10 +19,58 @@ export const useJidiSelectEventStore = defineStore('jidiSelectEvent', () => { }); jidiData.value[index].selected = true; }; + const getJidiData = async () => { + loading.value = true; + let params = { + filter: { + logic: 'and', + filters: [ + { + field: 'wbsType', + operator: 'eq', + dataType: 'string', + value: 'PSB' + }, + { + field: 'treeLevel', + operator: 'eq', + dataType: 'string', + value: '1' + } + ] + }, + sort: [ + { + field: 'orderIndex', + dir: 'asc' + } + ], + select: ['wbsCode', 'wbsName'] + }; + const res = await wbsbGetKendoList(params); + let data = res?.data?.data || [ + { + wbsCode: 'all', + wbsName: '当前全部', + selected: true + } + ]; + jidiData.value = data.map((item: any) => { + return { + ...item, + selected: item.wbsCode == 'all' ? true : false + }; + }); + loading.value = false; + }; + onMounted(() => { + getJidiData(); + }); return { jidiData, selectedItem, - updataJidiData + updataJidiData, + loading }; }); diff --git a/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue b/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue index 18222986..4d629c9c 100644 --- a/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue +++ b/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue @@ -154,7 +154,7 @@ const showMapModal17 = () => { - + 打开野生动物监测弹窗