修改图层管理

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'

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
   });

frontend/src/components/BasicTable/index.vue

@@ -189,13 +189,14 @@ const getList = async (filter?: Record<string, any>) => {
     }
 
     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;

frontend/src/views/system/map/components/LayerManagement/index.vue

@@ -23,7 +23,7 @@
             >编辑</a-button
           >
           <a-button
-            v-if="record.children.length == 0"
+            v-if="record.children && record.children.length == 0"
             class="!p-0"
             type="link"
             size="small"