From d9c68af85440995b5c0dcc7d1aff994d2bf231ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=88=E5=85=86=E5=A2=9E?= <你的邮箱@example.com> Date: Wed, 17 Jun 2026 14:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E5=B1=82=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/.env.development | 5 +++-- .../api/system/map/LayerManagement/index.ts | 14 +++----------- frontend/src/components/BasicTable/index.vue | 18 +++++++++++------- .../map/components/LayerManagement/index.vue | 2 +- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/frontend/.env.development b/frontend/.env.development index 7383bdd5..1a3a1d2e 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -7,13 +7,14 @@ VITE_APP_TITLE = '水电水利建设项目全过程环境管理信息平台' VITE_APP_PORT = 3000 VITE_APP_BASE_API = '/dev-api' # 本地环境 -VITE_APP_BASE_URL = 'http://localhost:8093' +# VITE_APP_BASE_URL = 'http://localhost:8093' # 测试环境 # VITE_APP_BASE_URL = 'http://172.16.21.142:8093' # VITE_APP_BASE_URL = 'http://172.16.21.142:8096' # 汤伟 # VITE_APP_BASE_URL = 'http://10.84.121.21:8093' -# VITE_APP_BASE_URL = 'http://192.168.1.162:8093' +# 李林 +VITE_APP_BASE_URL = 'http://10.84.121.43:8093' # 测试环境线上10.84.121.122: VITE_APP_TEST_ONLINE_URL = 'https://211.99.26.225:12122' diff --git a/frontend/src/api/system/map/LayerManagement/index.ts b/frontend/src/api/system/map/LayerManagement/index.ts index b24fe72d..76e02bce 100644 --- a/frontend/src/api/system/map/LayerManagement/index.ts +++ b/frontend/src/api/system/map/LayerManagement/index.ts @@ -3,7 +3,7 @@ import request from '@/utils/request'; // 获取所有地图 图层树 export function getAllMapLayerTree(data: any) { return request({ - url: '/api/wmp-sys-server/mapLayer/getAllMapLayerTree', + url: '/mapLayer/getAllMapLayerTree', method: 'post', data: data }); @@ -11,7 +11,7 @@ export function getAllMapLayerTree(data: any) { // 保存地图 图层 export function saveMapLayer(data: any) { return request({ - url: '/api/wmp-sys-server/mapLayer/save', + url: '/mapLayer/save', method: 'post', data: data }); @@ -19,15 +19,7 @@ export function saveMapLayer(data: any) { // 删除地图 图层 export function deleteMapLayer(data: any) { return request({ - url: '/api/wmp-sys-server/mapLayer/delete', - method: 'post', - data: data - }); -} -// 获取所有地图 图层树 -export function getAllMapLayerParentIdTree(data: any) { - return request({ - url: '/api/wmp-sys-server/mapLayer/getAllMapLayerTree', + url: '/mapLayer/delete', method: 'post', data: data }); diff --git a/frontend/src/components/BasicTable/index.vue b/frontend/src/components/BasicTable/index.vue index 87cb3b1c..e40d99e1 100644 --- a/frontend/src/components/BasicTable/index.vue +++ b/frontend/src/components/BasicTable/index.vue @@ -189,13 +189,14 @@ const getList = async (filter?: Record) => { } const res = await props.listUrl(params); + console.log(res); let finalRecords: any[] = []; let finalTotal = 0; if (props.transformData) { const result = props.transformData(res); - finalRecords = result.records || []; + finalRecords = result.records || result.data || []; finalTotal = result.total || 0; } else { finalRecords = res?.data?.records || res?.data?.data || res?.data || []; @@ -296,6 +297,9 @@ const processData = (records: any[]) => { for (const key in processedRecord) { if (Object.prototype.hasOwnProperty.call(processedRecord, key)) { const val = processedRecord[key]; + // children 字段不处理，保持原值（包括 null） + if (key === 'children') continue; + // 空数组不替换，只替换 null、undefined、空字符串 if (val === null || val === undefined || val === '') { processedRecord[key] = props.emptyPlaceholder; } @@ -309,7 +313,7 @@ const processData = (records: any[]) => { const createMergeCellHandler = (dataIndex: string) => { return (record: any, index: number) => { const currentValue = record[dataIndex]; - + // 检查当前行是否是该值的起始行 let isStartRow = true; if (index > 0) { @@ -318,7 +322,7 @@ const createMergeCellHandler = (dataIndex: string) => { isStartRow = false; } } - + if (!isStartRow) { // 不是起始行，设置 rowSpan 为 0（隐藏该单元格） return { rowSpan: 0 }; @@ -332,7 +336,7 @@ const createMergeCellHandler = (dataIndex: string) => { break; } } - + return rowSpan > 1 ? { rowSpan } : {}; } }; @@ -347,7 +351,7 @@ const enhancedColumns = computed(() => { ...col, customCell: createMergeCellHandler(col.dataIndex) }; - + // 如果有 slots.customRender，移除 slots if (baseCol.slots?.customRender) { const { slots, ...restCol } = baseCol; @@ -357,10 +361,10 @@ const enhancedColumns = computed(() => { ...(props.enableEllipsis ? { ellipsis: true } : {}) }; } - + return baseCol; } - + // 如果有 slots.customRender，移除 slots（由 bodyCell 处理），保留 dataIndex 用于匹配 if (col.slots?.customRender) { const { slots, ...restCol } = col; diff --git a/frontend/src/views/system/map/components/LayerManagement/index.vue b/frontend/src/views/system/map/components/LayerManagement/index.vue index 4105301c..9d3dda83 100644 --- a/frontend/src/views/system/map/components/LayerManagement/index.vue +++ b/frontend/src/views/system/map/components/LayerManagement/index.vue @@ -23,7 +23,7 @@ >编辑