hub

config/defaultSettings.js

@@ -9,6 +9,9 @@ const Settings = {
   colorWeak: false,
   title: 'Ant Design Pro',
   pwa: false,
+  menu: {
+    locale: false,
+  },
   logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
   // iconfontUrl: '//at.alicdn.com/t/font_3221810_t3g0tvsigf.js',
 };

src/pages/ContentManagementSystem/BannerClassification/index.jsx

@@ -67,13 +67,13 @@ export default (props) => {
       search: false,
     },
     {
-      title: '发布状态',
+      title: '状态',
       dataIndex: 'status',
+      // initialValue: 'all',
       key: 'status',
-      render: (t, record) => record.noteType === 1 ? '已发布' : '未发布',
       valueEnum: {
-        online: { text: '已发布', status: 'Success' },
-        error: { text: '未发布', status: 'Error' },
+        0: { text: '已发布', status: 'Success' },
+        1: { text: '未发布', status: 'Error' },
       }
     },
 

src/pages/ContentManagementSystem/InformationList/index.jsx

@@ -88,13 +88,13 @@ export default (props) => {
       sorter: (a, b) => a.createdAt - b.createdAt,//时间排序
     },
     {
-      title: '发布状态',
+      title: '状态',
       dataIndex: 'status',
+      // initialValue: 'all',
       key: 'status',
-      render: (t, record) => record.noteType === 1 ? '已发布' : '未发布',
       valueEnum: {
-        online: { text: '已发布', status: 'Success' },
-        error: { text: '未发布', status: 'Error' },
+        0: { text: '已发布', status: 'Success' },
+        1: { text: '未发布', status: 'Error' },
       }
     },
 

src/pages/GPSDevice/GPS/index.jsx

@@ -65,11 +65,11 @@ export default (props) => {
     {
       title: '状态',
       dataIndex: 'status',
+      // initialValue: 'all',
       key: 'status',
-      render: (t, record) => record.noteType === 1 ? '已启用' : '已禁用',
       valueEnum: {
-        online: { text: '已启用', status: 'Success' },
-        error: { text: '已禁用', status: 'Error' },
+        0: { text: '已启用', status: 'Success' },
+        1: { text: '已禁用', status: 'Error' },
       }
     },
 

src/pages/SystemManagement/Administrator/AdminEdit/index.jsx

@@ -21,6 +21,7 @@ export default (props) => {
   };
 
   const Submit = values => {
+    // setLoading(true)
     console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
 
   };
@@ -42,7 +43,7 @@ export default (props) => {
             </FormItem>
             <FormItem label="角色" name="user" rules={[{ required: true, message: '请选择' }]}>
               <Select
-                placeholder="请选择方式"
+                placeholder="请选择角色"
                 // onChange={onGenderChange}
                 allowClear
                 style={{ width: '350px' }}
@@ -53,7 +54,7 @@ export default (props) => {
             </FormItem>
             <FormItem label="状态" name="stry" rules={[{ required: true, message: '请选择', }]} >
               <Select
-                placeholder="请选择方式"
+                placeholder="请选择状态"
                 // onChange={onGenderChange}
                 allowClear
                 style={{ width: '350px' }}

src/pages/SystemManagement/Administrator/index.jsx

@@ -13,6 +13,7 @@ export default (props) => {
       key: '1',
       name: '胡彦斌',
       age: 32,
+      status: 0,
       zz: '西湖区湖底公园1号',
     },
 
@@ -62,8 +63,6 @@ export default (props) => {
       dataIndex: 'name',
       key: 'name',
       search: false,
-
-
     },
     {
       title: '邮箱',
@@ -85,11 +84,11 @@ export default (props) => {
     {
       title: '状态',
       dataIndex: 'status',
+      // initialValue: 'all',
       key: 'status',
-      render: (t, record) => record.noteType === 1 ? '已启用' : '已禁用',
       valueEnum: {
-        online: { text: '已启用', status: 'Success' },
-        error: { text: '已禁用', status: 'Error' },
+        0: { text: '已启用', status: 'Success' },
+        1: { text: '已禁用', status: 'Error' },
       }
     },
 
@@ -131,6 +130,9 @@ export default (props) => {
     },
   ]
 
+
+
+
   return (
     <PageHeaderWrapper>
       <ProTable

src/pages/SystemManagement/MapExtent/index.jsx

@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
-import { Tag, Space, Button, Popconfirm, Form, Modal, Input } from 'antd';
+import { Tag, Space, Button, Popconfirm, Form, Modal, Input, message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
 
 import ProList from '@ant-design/pro-list';
-
+import './index.less'
 const FormItem = Form.Item
 const defaultData = [
   {
@@ -12,21 +12,7 @@ const defaultData = [
     name: '赵村',
     desc: '赵村较大，多人协作',
   },
-  {
-    id: '2',
-    name: '钱村',
-    desc: '钱村头以南二百米',
-  },
-  {
-    id: '3',
-    name: '孙孙村',
-    desc: '',
-  },
-  {
-    id: '4',
-    name: '李村',
-    desc: '村民拒不配合，暂停',
-  },
+
 ];
 export default () => {
   const [form2] = Form.useForm()
@@ -42,7 +28,8 @@ export default () => {
   const Submit = (values) => {
     console.log('editdetail', editdetail, values);
     message.success(`修改成功`);
-    setLoading2(false)
+    setDataSource([...dataSource, values])
+    // setLoading2(false)
     onCancel()
 
   }
@@ -57,24 +44,29 @@ export default () => {
   return (
     <PageHeaderWrapper>
       <ProList
+
         toolBarRender={actions}
-        rowKey="id" headerTitle="区域范围" dataSource={dataSource} showActions="hover" editable={{
+        rowKey="id"
+        headerTitle="区域范围"
+        dataSource={dataSource}
+        showActions="hover"
+        editable={{
           onSave: async (key, record, originRow) => {
-            console.log(key, record, originRow);
+            console.log('修改后的', key, record, originRow);
             return true;
           },
-        }} onDataSourceChange={setDataSource} metas={{
-          title: {
+        }}
+        onDataSourceChange={setDataSource}
+        metas={{
+          title: {//标题
             dataIndex: 'name',
           },
-          // avatar: {
-          //   dataIndex: 'image',
-          //   editable: false,
-          // },
-          description: {
+
+          description: {//简介
             dataIndex: 'desc',
           },
           subTitle: {
+            editable: false,
             render: () => {
               return (<Space size={0}>
                 {/* <Tag color="blue"></Tag> */}
@@ -101,12 +93,12 @@ export default () => {
             ],
           },
         }} />,
-      <Modal title="套餐权重修改" visible={editModal} onCancel={onCancel} destroyOnClose={true} footer={null}>
+      <Modal title="套餐权重修改" visible={editModal} onCancel={onCancel} keyboard={false} maskClosable={false} destroyOnClose={true} footer={null}>
         < Form {...formItemLayout} onFinish={Submit} form={form2} >
-          <FormItem label="范围名称" name="shopNam12e" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="范围名称" name="name" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" style={{ width: '350px' }} />
           </FormItem>
-          <FormItem label="备注" name="shopName" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="备注" name="desc" >
             <Input placeholder="请输入" style={{ width: '350px' }} />
           </FormItem>
           <FormItem label=" " colon={false} >

src/pages/SystemManagement/MapExtent/index.less

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