zlisen 3 anos atrás
pai
commit
45fa85d919
2 arquivos alterados com 53 adições e 38 exclusões
  1. 3
    3
      config/routes.js
  2. 50
    35
      src/pages/system/city/index.jsx

+ 3
- 3
config/routes.js Ver arquivo

75
               },
75
               },
76
               {
76
               {
77
                 path: '/building/log',
77
                 path: '/building/log',
78
-                name: '编辑日志',
78
+                name: '项目日志',
79
                 component: './building/log',
79
                 component: './building/log',
80
-                menuCode: '/building/Developers',
80
+                menuCode: '/building/log',
81
               },
81
               },
82
             ],
82
             ],
83
           },
83
           },
611
                 name: '城市管理',
611
                 name: '城市管理',
612
                 // hideInMenu: true,
612
                 // hideInMenu: true,
613
                 component: './system/city',
613
                 component: './system/city',
614
-                menuCode: '/carouselFigure/customImg/edit',
614
+                menuCode: '/system/city',
615
               },
615
               },
616
             ],
616
             ],
617
           },
617
           },

+ 50
- 35
src/pages/system/city/index.jsx Ver arquivo

1
 import React, { useState, useEffect } from 'react';
1
 import React, { useState, useEffect } from 'react';
2
-import { Select, Card, Button, TreeSelect } from 'antd';
2
+import { Select, Card, Button, TreeSelect, Modal, message } from 'antd';
3
 import { Tree } from 'antd';
3
 import { Tree } from 'antd';
4
 
4
 
5
 const { TreeNode } = Tree;
5
 const { TreeNode } = Tree;
7
 const { SHOW_CHILD } = TreeSelect;
7
 const { SHOW_CHILD } = TreeSelect;
8
 const { Option } = Select;
8
 const { Option } = Select;
9
 
9
 
10
-function parentTree(arr, id) {   //arr 所有的树数据 id 某个子节点的id 
11
-  console.log(arr, id,'sss')
12
-  let temp ;
13
-  let callback = function (nowArr, id) {     //先定义个函数寻找子节点位置 找到后 再找改节点父元素位置 以此类推
10
+function parentTree(arr, id) {
11
+  //arr 所有的树数据 id 某个子节点的id
12
+  console.log(arr, id, 'sss');
13
+  let temp;
14
+  let callback = function(nowArr, id) {
15
+    //先定义个函数寻找子节点位置 找到后 再找改节点父元素位置 以此类推
14
     for (let i = 0; i < nowArr.length; i++) {
16
     for (let i = 0; i < nowArr.length; i++) {
15
       let item = nowArr[i];
17
       let item = nowArr[i];
16
       if (item.value === id) {
18
       if (item.value === id) {
17
         // temp.push(item);
19
         // temp.push(item);
18
-        temp=item
20
+        temp = item;
19
         // callback(arr, item.parentid);     //pid 父级ID
21
         // callback(arr, item.parentid);     //pid 父级ID
20
         break;
22
         break;
21
       } else {
23
       } else {
26
     }
28
     }
27
   };
29
   };
28
   callback(arr, id);
30
   callback(arr, id);
29
-  return temp;  //最后返回
31
+  return temp; //最后返回
30
 }
32
 }
31
 
33
 
32
 /**
34
 /**
42
   const [tree, setTree] = useState([]);
44
   const [tree, setTree] = useState([]);
43
   // 城市的值
45
   // 城市的值
44
   const [selectCityTree, setSelectCityTree] = useState([]);
46
   const [selectCityTree, setSelectCityTree] = useState([]);
45
-
47
+  const [loading, setLoading] = useState(true);
46
   // {
48
   // {
47
   //   title: 'Node1',
49
   //   title: 'Node1',
48
   //   value: '0-0',
50
   //   value: '0-0',
69
           title: x.name,
71
           title: x.name,
70
           value: x.id,
72
           value: x.id,
71
           key: x.id,
73
           key: x.id,
72
-          parentid:x.parentid,
73
-          selectable:false,
74
-          disableCheckbox:true,
74
+          parentid: x.parentid,
75
+          selectable: false,
76
+          disableCheckbox: true,
75
           children: getTree(x?.children),
77
           children: getTree(x?.children),
76
         };
78
         };
77
       } else {
79
       } else {
79
           title: x.name,
81
           title: x.name,
80
           value: x.id,
82
           value: x.id,
81
           key: x.id,
83
           key: x.id,
82
-          parentid:x.parentid
84
+          parentid: x.parentid,
83
         };
85
         };
84
       }
86
       }
85
     });
87
     });
106
   };
108
   };
107
 
109
 
108
   const getCityList = e => {
110
   const getCityList = e => {
111
+    setLoading(true)
109
     request({
112
     request({
110
       url: '/api/admin/tdCityList/tdCity',
113
       url: '/api/admin/tdCityList/tdCity',
111
       method: 'GET',
114
       method: 'GET',
112
       params: { leveltype: 2, pageNum: 1, pageSize: 999 },
115
       params: { leveltype: 2, pageNum: 1, pageSize: 999 },
113
       action: 'select',
116
       action: 'select',
114
     }).then(data => {
117
     }).then(data => {
115
-      setSelectCityTree(
116
-        data.map(x => x.id),
117
-      );
118
+      setSelectCityTree(data.map(x => x.id));
119
+      setLoading(false)
120
+      
118
     });
121
     });
119
   };
122
   };
120
 
123
 
129
 
132
 
130
   // 选择城市
133
   // 选择城市
131
   const onChange = (checkedKeys, label, extra) => {
134
   const onChange = (checkedKeys, label, extra) => {
132
-    const info = parentTree(tree,extra.triggerValue)
135
+    const info = parentTree(tree, extra.triggerValue);
133
     if (checkedKeys?.length > selectCityTree.length) {
136
     if (checkedKeys?.length > selectCityTree.length) {
134
-
135
-      
136
-
137
       // console.log(parentTree(tree,extra.triggerValue))
137
       // console.log(parentTree(tree,extra.triggerValue))
138
       // 新增
138
       // 新增
139
       request({
139
       request({
140
         url: '/api/admin/city/add',
140
         url: '/api/admin/city/add',
141
         method: 'POST',
141
         method: 'POST',
142
-        data: { 
143
-          cityId:info.value,
144
-          name:info.title,
145
-          parentid:info.parentid,
146
-         },
142
+        data: {
143
+          cityId: info.value,
144
+          name: info.title,
145
+          parentid: info.parentid,
146
+        },
147
         // action: 'select',
147
         // action: 'select',
148
       }).then(data => {
148
       }).then(data => {
149
+        getCityList();
150
+        message.success('新增成功')
149
         // console.log(getTree(data.tdCityList), 'data.tdCityList');
151
         // console.log(getTree(data.tdCityList), 'data.tdCityList');
150
         // setTree(getTree(data.tdCityList));
152
         // setTree(getTree(data.tdCityList));
151
       });
153
       });
152
-    }else{
153
-      request({
154
-        url: `/api/admin/org/city/${extra.triggerValue}`,
155
-        method: 'DELETE',
156
-        
157
-        // action: 'select',
158
-      }).then(data => {
159
-        // console.log(getTree(data.tdCityList), 'data.tdCityList');
160
-        // setTree(getTree(data.tdCityList));
154
+    } else {
155
+      Modal.confirm({
156
+        title: '确认是否关闭该城市?',
157
+        // content: 'Some descriptions',
158
+        onOk() {
159
+          console.log('OK');
160
+          request({
161
+            url: `/api/admin/org/city/${extra.triggerValue}`,
162
+            method: 'DELETE',
163
+
164
+            // action: 'select',
165
+          }).then(data => {
166
+            getCityList();
167
+            message.success('修改成功')
168
+            // console.log(getTree(data.tdCityList), 'data.tdCityList');
169
+            // setTree(getTree(data.tdCityList));
170
+          });
171
+        },
172
+        onCancel() {
173
+          console.log('Cancel');
174
+        },
161
       });
175
       });
162
     }
176
     }
163
-    setSelectCityTree(checkedKeys)
177
+
164
     console.log('onCheck', checkedKeys, label, extra);
178
     console.log('onCheck', checkedKeys, label, extra);
165
   };
179
   };
166
- 
180
+
167
   const tProps = {
181
   const tProps = {
168
     treeData: tree,
182
     treeData: tree,
169
     value: selectCityTree,
183
     value: selectCityTree,
177
     style: {
191
     style: {
178
       width: '100%',
192
       width: '100%',
179
     },
193
     },
194
+    loading:loading
180
   };
195
   };
181
 
196
 
182
   useEffect(() => {
197
   useEffect(() => {