fix

config/routes.js

@@ -75,9 +75,9 @@ export default [
               },
               {
                 path: '/building/log',
-                name: '编辑日志',
+                name: '项目日志',
                 component: './building/log',
-                menuCode: '/building/Developers',
+                menuCode: '/building/log',
               },
             ],
           },
@@ -611,7 +611,7 @@ export default [
                 name: '城市管理',
                 // hideInMenu: true,
                 component: './system/city',
-                menuCode: '/carouselFigure/customImg/edit',
+                menuCode: '/system/city',
               },
             ],
           },

src/pages/system/city/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Card, Button, TreeSelect } from 'antd';
+import { Select, Card, Button, TreeSelect, Modal, message } from 'antd';
 import { Tree } from 'antd';
 
 const { TreeNode } = Tree;
@@ -7,15 +7,17 @@ import request from '@/utils/request';
 const { SHOW_CHILD } = TreeSelect;
 const { Option } = Select;
 
-function parentTree(arr, id) {   //arr 所有的树数据 id 某个子节点的id 
-  console.log(arr, id,'sss')
-  let temp ;
-  let callback = function (nowArr, id) {     //先定义个函数寻找子节点位置 找到后 再找改节点父元素位置 以此类推
+function parentTree(arr, id) {
+  //arr 所有的树数据 id 某个子节点的id
+  console.log(arr, id, 'sss');
+  let temp;
+  let callback = function(nowArr, id) {
+    //先定义个函数寻找子节点位置 找到后 再找改节点父元素位置 以此类推
     for (let i = 0; i < nowArr.length; i++) {
       let item = nowArr[i];
       if (item.value === id) {
         // temp.push(item);
-        temp=item
+        temp = item;
         // callback(arr, item.parentid);     //pid 父级ID
         break;
       } else {
@@ -26,7 +28,7 @@ function parentTree(arr, id) {   //arr 所有的树数据 id 某个子节点的i
     }
   };
   callback(arr, id);
-  return temp;  //最后返回
+  return temp; //最后返回
 }
 
 /**
@@ -42,7 +44,7 @@ const CitySelect = props => {
   const [tree, setTree] = useState([]);
   // 城市的值
   const [selectCityTree, setSelectCityTree] = useState([]);
-
+  const [loading, setLoading] = useState(true);
   // {
   //   title: 'Node1',
   //   value: '0-0',
@@ -69,9 +71,9 @@ const CitySelect = props => {
           title: x.name,
           value: x.id,
           key: x.id,
-          parentid:x.parentid,
-          selectable:false,
-          disableCheckbox:true,
+          parentid: x.parentid,
+          selectable: false,
+          disableCheckbox: true,
           children: getTree(x?.children),
         };
       } else {
@@ -79,7 +81,7 @@ const CitySelect = props => {
           title: x.name,
           value: x.id,
           key: x.id,
-          parentid:x.parentid
+          parentid: x.parentid,
         };
       }
     });
@@ -106,15 +108,16 @@ const CitySelect = props => {
   };
 
   const getCityList = e => {
+    setLoading(true)
     request({
       url: '/api/admin/tdCityList/tdCity',
       method: 'GET',
       params: { leveltype: 2, pageNum: 1, pageSize: 999 },
       action: 'select',
     }).then(data => {
-      setSelectCityTree(
-        data.map(x => x.id),
-      );
+      setSelectCityTree(data.map(x => x.id));
+      setLoading(false)
+      
     });
   };
 
@@ -129,41 +132,52 @@ const CitySelect = props => {
 
   // 选择城市
   const onChange = (checkedKeys, label, extra) => {
-    const info = parentTree(tree,extra.triggerValue)
+    const info = parentTree(tree, extra.triggerValue);
     if (checkedKeys?.length > selectCityTree.length) {
-
-      
-
       // console.log(parentTree(tree,extra.triggerValue))
       // 新增
       request({
         url: '/api/admin/city/add',
         method: 'POST',
-        data: { 
-          cityId:info.value,
-          name:info.title,
-          parentid:info.parentid,
-         },
+        data: {
+          cityId: info.value,
+          name: info.title,
+          parentid: info.parentid,
+        },
         // action: 'select',
       }).then(data => {
+        getCityList();
+        message.success('新增成功')
         // console.log(getTree(data.tdCityList), 'data.tdCityList');
         // setTree(getTree(data.tdCityList));
       });
-    }else{
-      request({
-        url: `/api/admin/org/city/${extra.triggerValue}`,
-        method: 'DELETE',
-        
-        // action: 'select',
-      }).then(data => {
-        // console.log(getTree(data.tdCityList), 'data.tdCityList');
-        // setTree(getTree(data.tdCityList));
+    } else {
+      Modal.confirm({
+        title: '确认是否关闭该城市?',
+        // content: 'Some descriptions',
+        onOk() {
+          console.log('OK');
+          request({
+            url: `/api/admin/org/city/${extra.triggerValue}`,
+            method: 'DELETE',
+
+            // action: 'select',
+          }).then(data => {
+            getCityList();
+            message.success('修改成功')
+            // console.log(getTree(data.tdCityList), 'data.tdCityList');
+            // setTree(getTree(data.tdCityList));
+          });
+        },
+        onCancel() {
+          console.log('Cancel');
+        },
       });
     }
-    setSelectCityTree(checkedKeys)
+
     console.log('onCheck', checkedKeys, label, extra);
   };
- 
+
   const tProps = {
     treeData: tree,
     value: selectCityTree,
@@ -177,6 +191,7 @@ const CitySelect = props => {
     style: {
       width: '100%',
     },
+    loading:loading
   };
 
   useEffect(() => {