[baozhangchao] 3 vuotta sitten
vanhempi
commit
8ae60496fd

+ 3
- 0
config/defaultSettings.js Näytä tiedosto

9
   colorWeak: false,
9
   colorWeak: false,
10
   title: 'Ant Design Pro',
10
   title: 'Ant Design Pro',
11
   pwa: false,
11
   pwa: false,
12
+  menu: {
13
+    locale: false,
14
+  },
12
   logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
15
   logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
13
   // iconfontUrl: '//at.alicdn.com/t/font_3221810_t3g0tvsigf.js',
16
   // iconfontUrl: '//at.alicdn.com/t/font_3221810_t3g0tvsigf.js',
14
 };
17
 };

+ 4
- 4
src/pages/ContentManagementSystem/BannerClassification/index.jsx Näytä tiedosto

67
       search: false,
67
       search: false,
68
     },
68
     },
69
     {
69
     {
70
-      title: '发布状态',
70
+      title: '状态',
71
       dataIndex: 'status',
71
       dataIndex: 'status',
72
+      // initialValue: 'all',
72
       key: 'status',
73
       key: 'status',
73
-      render: (t, record) => record.noteType === 1 ? '已发布' : '未发布',
74
       valueEnum: {
74
       valueEnum: {
75
-        online: { text: '已发布', status: 'Success' },
76
-        error: { text: '未发布', status: 'Error' },
75
+        0: { text: '已发布', status: 'Success' },
76
+        1: { text: '未发布', status: 'Error' },
77
       }
77
       }
78
     },
78
     },
79
 
79
 

+ 4
- 4
src/pages/ContentManagementSystem/InformationList/index.jsx Näytä tiedosto

88
       sorter: (a, b) => a.createdAt - b.createdAt,//时间排序
88
       sorter: (a, b) => a.createdAt - b.createdAt,//时间排序
89
     },
89
     },
90
     {
90
     {
91
-      title: '发布状态',
91
+      title: '状态',
92
       dataIndex: 'status',
92
       dataIndex: 'status',
93
+      // initialValue: 'all',
93
       key: 'status',
94
       key: 'status',
94
-      render: (t, record) => record.noteType === 1 ? '已发布' : '未发布',
95
       valueEnum: {
95
       valueEnum: {
96
-        online: { text: '已发布', status: 'Success' },
97
-        error: { text: '未发布', status: 'Error' },
96
+        0: { text: '已发布', status: 'Success' },
97
+        1: { text: '未发布', status: 'Error' },
98
       }
98
       }
99
     },
99
     },
100
 
100
 

+ 3
- 3
src/pages/GPSDevice/GPS/index.jsx Näytä tiedosto

65
     {
65
     {
66
       title: '状态',
66
       title: '状态',
67
       dataIndex: 'status',
67
       dataIndex: 'status',
68
+      // initialValue: 'all',
68
       key: 'status',
69
       key: 'status',
69
-      render: (t, record) => record.noteType === 1 ? '已启用' : '已禁用',
70
       valueEnum: {
70
       valueEnum: {
71
-        online: { text: '已启用', status: 'Success' },
72
-        error: { text: '已禁用', status: 'Error' },
71
+        0: { text: '已启用', status: 'Success' },
72
+        1: { text: '已禁用', status: 'Error' },
73
       }
73
       }
74
     },
74
     },
75
 
75
 

+ 3
- 2
src/pages/SystemManagement/Administrator/AdminEdit/index.jsx Näytä tiedosto

21
   };
21
   };
22
 
22
 
23
   const Submit = values => {
23
   const Submit = values => {
24
+    // setLoading(true)
24
     console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
25
     console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
25
 
26
 
26
   };
27
   };
42
             </FormItem>
43
             </FormItem>
43
             <FormItem label="角色" name="user" rules={[{ required: true, message: '请选择' }]}>
44
             <FormItem label="角色" name="user" rules={[{ required: true, message: '请选择' }]}>
44
               <Select
45
               <Select
45
-                placeholder="请选择方式"
46
+                placeholder="请选择角色"
46
                 // onChange={onGenderChange}
47
                 // onChange={onGenderChange}
47
                 allowClear
48
                 allowClear
48
                 style={{ width: '350px' }}
49
                 style={{ width: '350px' }}
53
             </FormItem>
54
             </FormItem>
54
             <FormItem label="状态" name="stry" rules={[{ required: true, message: '请选择', }]} >
55
             <FormItem label="状态" name="stry" rules={[{ required: true, message: '请选择', }]} >
55
               <Select
56
               <Select
56
-                placeholder="请选择方式"
57
+                placeholder="请选择状态"
57
                 // onChange={onGenderChange}
58
                 // onChange={onGenderChange}
58
                 allowClear
59
                 allowClear
59
                 style={{ width: '350px' }}
60
                 style={{ width: '350px' }}

+ 7
- 5
src/pages/SystemManagement/Administrator/index.jsx Näytä tiedosto

13
       key: '1',
13
       key: '1',
14
       name: '胡彦斌',
14
       name: '胡彦斌',
15
       age: 32,
15
       age: 32,
16
+      status: 0,
16
       zz: '西湖区湖底公园1号',
17
       zz: '西湖区湖底公园1号',
17
     },
18
     },
18
 
19
 
62
       dataIndex: 'name',
63
       dataIndex: 'name',
63
       key: 'name',
64
       key: 'name',
64
       search: false,
65
       search: false,
65
-
66
-
67
     },
66
     },
68
     {
67
     {
69
       title: '邮箱',
68
       title: '邮箱',
85
     {
84
     {
86
       title: '状态',
85
       title: '状态',
87
       dataIndex: 'status',
86
       dataIndex: 'status',
87
+      // initialValue: 'all',
88
       key: 'status',
88
       key: 'status',
89
-      render: (t, record) => record.noteType === 1 ? '已启用' : '已禁用',
90
       valueEnum: {
89
       valueEnum: {
91
-        online: { text: '已启用', status: 'Success' },
92
-        error: { text: '已禁用', status: 'Error' },
90
+        0: { text: '已启用', status: 'Success' },
91
+        1: { text: '已禁用', status: 'Error' },
93
       }
92
       }
94
     },
93
     },
95
 
94
 
131
     },
130
     },
132
   ]
131
   ]
133
 
132
 
133
+
134
+
135
+
134
   return (
136
   return (
135
     <PageHeaderWrapper>
137
     <PageHeaderWrapper>
136
       <ProTable
138
       <ProTable

+ 22
- 30
src/pages/SystemManagement/MapExtent/index.jsx Näytä tiedosto

1
 import React, { useState } from 'react';
1
 import React, { useState } from 'react';
2
-import { Tag, Space, Button, Popconfirm, Form, Modal, Input } from 'antd';
2
+import { Tag, Space, Button, Popconfirm, Form, Modal, Input, message } from 'antd';
3
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
3
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
4
 import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
4
 import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
5
 
5
 
6
 import ProList from '@ant-design/pro-list';
6
 import ProList from '@ant-design/pro-list';
7
-
7
+import './index.less'
8
 const FormItem = Form.Item
8
 const FormItem = Form.Item
9
 const defaultData = [
9
 const defaultData = [
10
   {
10
   {
12
     name: '赵村',
12
     name: '赵村',
13
     desc: '赵村较大,多人协作',
13
     desc: '赵村较大,多人协作',
14
   },
14
   },
15
-  {
16
-    id: '2',
17
-    name: '钱村',
18
-    desc: '钱村头以南二百米',
19
-  },
20
-  {
21
-    id: '3',
22
-    name: '孙孙村',
23
-    desc: '',
24
-  },
25
-  {
26
-    id: '4',
27
-    name: '李村',
28
-    desc: '村民拒不配合,暂停',
29
-  },
15
+
30
 ];
16
 ];
31
 export default () => {
17
 export default () => {
32
   const [form2] = Form.useForm()
18
   const [form2] = Form.useForm()
42
   const Submit = (values) => {
28
   const Submit = (values) => {
43
     console.log('editdetail', editdetail, values);
29
     console.log('editdetail', editdetail, values);
44
     message.success(`修改成功`);
30
     message.success(`修改成功`);
45
-    setLoading2(false)
31
+    setDataSource([...dataSource, values])
32
+    // setLoading2(false)
46
     onCancel()
33
     onCancel()
47
 
34
 
48
   }
35
   }
57
   return (
44
   return (
58
     <PageHeaderWrapper>
45
     <PageHeaderWrapper>
59
       <ProList
46
       <ProList
47
+
60
         toolBarRender={actions}
48
         toolBarRender={actions}
61
-        rowKey="id" headerTitle="区域范围" dataSource={dataSource} showActions="hover" editable={{
49
+        rowKey="id"
50
+        headerTitle="区域范围"
51
+        dataSource={dataSource}
52
+        showActions="hover"
53
+        editable={{
62
           onSave: async (key, record, originRow) => {
54
           onSave: async (key, record, originRow) => {
63
-            console.log(key, record, originRow);
55
+            console.log('修改后的', key, record, originRow);
64
             return true;
56
             return true;
65
           },
57
           },
66
-        }} onDataSourceChange={setDataSource} metas={{
67
-          title: {
58
+        }}
59
+        onDataSourceChange={setDataSource}
60
+        metas={{
61
+          title: {//标题
68
             dataIndex: 'name',
62
             dataIndex: 'name',
69
           },
63
           },
70
-          // avatar: {
71
-          //   dataIndex: 'image',
72
-          //   editable: false,
73
-          // },
74
-          description: {
64
+
65
+          description: {//简介
75
             dataIndex: 'desc',
66
             dataIndex: 'desc',
76
           },
67
           },
77
           subTitle: {
68
           subTitle: {
69
+            editable: false,
78
             render: () => {
70
             render: () => {
79
               return (<Space size={0}>
71
               return (<Space size={0}>
80
                 {/* <Tag color="blue"></Tag> */}
72
                 {/* <Tag color="blue"></Tag> */}
101
             ],
93
             ],
102
           },
94
           },
103
         }} />,
95
         }} />,
104
-      <Modal title="套餐权重修改" visible={editModal} onCancel={onCancel} destroyOnClose={true} footer={null}>
96
+      <Modal title="套餐权重修改" visible={editModal} onCancel={onCancel} keyboard={false} maskClosable={false} destroyOnClose={true} footer={null}>
105
         < Form {...formItemLayout} onFinish={Submit} form={form2} >
97
         < Form {...formItemLayout} onFinish={Submit} form={form2} >
106
-          <FormItem label="范围名称" name="shopNam12e" rules={[{ required: true, message: '请输入' }]}>
98
+          <FormItem label="范围名称" name="name" rules={[{ required: true, message: '请输入' }]}>
107
             <Input placeholder="请输入" style={{ width: '350px' }} />
99
             <Input placeholder="请输入" style={{ width: '350px' }} />
108
           </FormItem>
100
           </FormItem>
109
-          <FormItem label="备注" name="shopName" rules={[{ required: true, message: '请输入' }]}>
101
+          <FormItem label="备注" name="desc" >
110
             <Input placeholder="请输入" style={{ width: '350px' }} />
102
             <Input placeholder="请输入" style={{ width: '350px' }} />
111
           </FormItem>
103
           </FormItem>
112
           <FormItem label=" " colon={false} >
104
           <FormItem label=" " colon={false} >

+ 3
- 0
src/pages/SystemManagement/MapExtent/index.less Näytä tiedosto

1
+// .ant-form-item-control {
2
+//   display: none;
3
+// }