diff --git a/frontend/.env.development b/frontend/.env.development index 75f7dec..32956c3 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -10,6 +10,7 @@ VITE_APP_BASE_API = '/dev-api' # VITE_APP_BASE_URL = 'http://localhost:8093' # 测试环境 # VITE_APP_BASE_URL = 'http://172.16.21.142:8096' +# VITE_APP_BASE_URL = 'http://172.16.21.142:8096' # 汤伟 VITE_APP_BASE_URL = 'http://10.84.121.21:8093' diff --git a/frontend/src/api/shuidiankaifa/index.ts b/frontend/src/api/shuidiankaifa/index.ts new file mode 100644 index 0000000..c46f8d2 --- /dev/null +++ b/frontend/src/api/shuidiankaifa/index.ts @@ -0,0 +1,62 @@ +import request from '@/utils/request'; + +/** + * 获取 Kendo 列表数据(支持聚合和分组) + * @param params 过滤条件 + * @param sortConfig 排序配置 + */ +export function getKendoList(params: any, sortConfig?: any[]) { + return request({ + url: '/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + method: 'post', + data: { + filters: params, + sorts: sortConfig || [] + } + }); +} + +/** + * 获取自定义 Kendo 列表数据(用于全基地模式) + * @param params 过滤条件 + * @param sortConfig 排序配置 + */ +export function getKendoListCust(params: any, sortConfig?: any[]) { + return request({ + url: '/dec-lygk-base-server/base/vmsstbprpt/GetKendoListCust', + method: 'post', + data: { + filters: params, + sorts: sortConfig || [] + } + }); +} + +/** + * 获取介绍信息(用于 other 类型排序) + * @param filters 过滤条件 + * @param sorts 排序配置 + * @param needTotal 是否需要总数 + * @param fields 返回字段 + * @param defaultSort 默认排序 + */ +export function getIntroduce( + filters: any[], + sorts?: any[], + needTotal?: boolean, + fields?: string[], + defaultSort?: any +) { + return request({ + url: '/dec-lygk-base-server/base/introduce/getIntroduce', + method: 'post', + data: { + logic: 'and', + filters: filters, + sorts: sorts || [], + needTotal: needTotal || false, + fields: fields || [], + defaultSort: defaultSort + } + }); +} diff --git a/frontend/src/components/SidePanelItem/index.vue b/frontend/src/components/SidePanelItem/index.vue index d721fa2..72908eb 100644 --- a/frontend/src/components/SidePanelItem/index.vue +++ b/frontend/src/components/SidePanelItem/index.vue @@ -15,6 +15,12 @@ + + + + +
@@ -36,7 +42,7 @@
@@ -73,6 +79,7 @@ import dayjs, { Dayjs } from 'dayjs'; interface PromptConfig { show: boolean; value: string; + icon?: string; } interface SelectConfig { @@ -112,6 +119,14 @@ const props = defineProps({ value: '', }) }, + iconmap: {//自定义图标浮动 + type: Object as () => PromptConfig, + default: () => ({ + show: false, + value: '', + icon:'iconfont icon-time', + }) + }, select: { // 选择框 type: Object as () => SelectConfig, default: () => ({ diff --git a/frontend/src/modules/jidiInfoMod/index.vue b/frontend/src/modules/jidiInfoMod/index.vue index b70cda2..351181b 100644 --- a/frontend/src/modules/jidiInfoMod/index.vue +++ b/frontend/src/modules/jidiInfoMod/index.vue @@ -13,24 +13,13 @@ import { ref, onMounted, watch } from "vue"; import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent"; import SidePanelItem from "@/components/SidePanelItem/index.vue"; -import { getBaseKenWbsbdoList } from "@/api/home"; +import { getBaseWbsb } from "@/api/home"; const JidiSelectEventStore = useJidiSelectEventStore(); // 定义组件名(便于调试和递归) defineOptions({ name: "jidiInfoMod", }); -const title_text = ref(""); -watch( - () => JidiSelectEventStore.selectedItem, - (newVal) => { - console.log(newVal); - if (newVal.name == "当前全部") { - } - initText(); - }, - { deep: true } -); const initText = () => { const params = { filter: { @@ -46,15 +35,26 @@ const initText = () => { ], }, }; - getBaseKenWbsbdoList(params).then((res) => { + getBaseWbsb(params).then((res) => { console.log(res); title_text.value = res.data.data[0].introduce; + // debugger }); }; +const title_text = ref(""); +watch( + () => JidiSelectEventStore.selectedItem, + (newVal) => { + initText(); + }, + { deep: true, immediate: true } +); + // 页面加载时执行的逻辑 onMounted(() => { initText(); console.log(JidiSelectEventStore.selectedItem); + }); diff --git a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue index 14feaf7..4a43f2a 100644 --- a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue +++ b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue @@ -1,6 +1,6 @@