Antv

config/routes.js

@@ -252,12 +252,6 @@ export default [
         access: 'org',
         component: './SystemManagement/Cooperative',
       },
-      {
-        path: '/SystemManagement/Cooperative/edit.jsx',
-        name: '机构编辑',
-        component: './SystemManagement/Cooperative/edit.jsx',
-        hideInMenu: true,
-      },
       {
         path: '/SystemManagement/UserRights',
         name: '角色管理',
@@ -270,12 +264,6 @@ export default [
         access: 'user',
         component: './SystemManagement/Administrator',
       },
-      {
-        path: '/SystemManagement/Administrator/AdminEdit',
-        name: '人员编辑',
-        component: './SystemManagement/Administrator/AdminEdit',
-        hideInMenu: true,
-      },
       {
         path: '/SystemManagement/BasicParameters',
         name: '基本参数',

src/components/CooperativeSearch/index.jsx

@@ -0,0 +1,52 @@
+import { useEffect, useState } from 'react';
+import { Select } from 'antd';
+import { getCooperativeList, getCooperativeDetail } from '@/services/cooperative';
+
+const Option = Select.Option;
+export default (props) => {
+  const { value, onChange, ...otherProps } = props;
+
+  const [list, setList] = useState([]);
+
+  const searchData = (val) => {
+    getCooperativeList({ name: val, pageSize: 9999 }).then((res) => {
+      setList(res.records || []);
+    });
+  };
+
+  const handleSearch = (text) => {
+    if (text) {
+      searchData(text);
+    }
+  };
+
+  useEffect(() => {
+    if (value) {
+      getCooperativeDetail(value).then((res) => {
+        setList([res]);
+      });
+    }
+  }, [value]);
+
+  return (
+    <Select
+      showSearch
+      value={value}
+      defaultActiveFirstOption={false}
+      showArrow={false}
+      filterOption={false}
+      onSearch={handleSearch}
+      onChange={onChange}
+      notFoundContent={null}
+      {...otherProps}
+    >
+      {list.map((item) => {
+        return (
+          <Option key={item.orgId} value={item.orgId}>
+            {item.name}
+          </Option>
+        );
+      })}
+    </Select>
+  );
+};

src/components/ScreenBox/ScreenHeader/index.jsx

@@ -0,0 +1,11 @@
+import Styles from './style.less';
+
+export default () => {
+  return (
+    <div className={Styles['screen-header-box']}>
+      <div className={Styles['screen-header-left']}></div>
+      <div className={Styles['screen-header-content']}></div>
+      <div className={Styles['screen-header-right']}></div>
+    </div>
+  );
+};

src/components/ScreenBox/ScreenHeader/style.less

@@ -0,0 +1,12 @@
+.screen-header-box {
+  display: flex;
+
+  .screen-header-left,
+  .screen-header-right {
+    flex: 1;
+  }
+
+  .screen-header-content {
+    flex: 6;
+  }
+}

src/pages/MonitoringScreen/index.jsx

@@ -11,6 +11,7 @@ import DateCommponetsBottomRight from './DateCommponetsBottomRight';
 import DateCommponetsBottomLeft from './DateCommponetsBottomLeft';
 import Styles from './style.less';
 import SquareBox from '@/components/ScreenBox/SquareBox';
+import ScreenHeader from '@/components/ScreenBox/ScreenHeader';
 
 export default (props) => {
   const { style, isFullScreen, onFullScreen } = useFullScreen();
@@ -23,25 +24,24 @@ export default (props) => {
         </Button>
       }
     >
-
-
       <div
         className={classNames(Styles['screen-page'], { [Styles['full-screen']]: isFullScreen })}
         style={style}
       >
         <div className={Styles['grail-layout']}>
           <div className={Styles['grail-header']}>
-            {/* <SquareBox>asdfasdf</SquareBox> */}
+            <ScreenHeader weather="多云 21-28 °C" />
           </div>
           <div className={Styles['grail-container']}>
-            <div className={Styles['grail-left']}></div>
-            <div className={Styles['grail-content']} >
-
-              <DateCommponetsLeft />
-              <DateCommponetsBottomRight />
-              <DateCommponetsBottomLeft />
+            <div className={Styles['grail-left']}>
+              <SquareBox>asdfasdf</SquareBox>
+            </div>
+            <div className={Styles['grail-content']}>
+              <DateCommponets />
+            </div>
+            <div className={Styles['grail-right']}>
+              <SquareBox>asdfasdf</SquareBox>
             </div>
-            <div className={Styles['grail-right']}></div>
           </div>
           <div className={Styles['grail-footer']}></div>
         </div>

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

@@ -1,76 +0,0 @@
-import { Input, Card, Select, Button, message } from "antd"
-import { useEffect, useState } from 'react'
-import { Form } from "antd";
-import { history } from 'umi';
-import ProCard from '@ant-design/pro-card'
-
-const { Option } = Select
-const goBack = () => {
-  history.goBack()
-}
-const FormItem = Form.Item
-export default (props) => {
-
-  const [form] = Form.useForm()
-  const [loading, setLoading] = useState(false)
-
-  const formItemLayout = {
-    //布局
-    labelCol: { span: 6 },
-    wrapperCol: { span: 14 },
-  };
-
-  const Submit = values => {
-    // setLoading(true)
-    console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
-
-  };
-
-  return (
-    <Card >
-      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}
-      >
-        <ProCard.TabPane key={1} tab="人员管理">
-          <Form {...formItemLayout} onFinish={Submit} form={form} >
-            <FormItem label="账号" name="shopName" rules={[{ required: true, message: '请输入' }]}>
-              <Input placeholder="请输入" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem label="姓名" name="title" rules={[{ required: true, message: '请输入' }]}>
-              <Input placeholder="请输入" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem label="邮箱" name="phone" rules={[{ required: true, message: '邮箱格式不正确或内容为空', pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/ }]}>
-              <Input placeholder="请输入" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem label="角色" name="user" rules={[{ required: true, message: '请选择' }]}>
-              <Select
-                placeholder="请选择角色"
-                // onChange={onGenderChange}
-                allowClear
-                style={{ width: '350px' }}
-              >
-                <Option value="nongji">农机手</Option>
-                <Option value="nonghu">农户</Option>
-              </Select>
-            </FormItem>
-            <FormItem label="状态" name="stry" rules={[{ required: true, message: '请选择', }]} >
-              <Select
-                placeholder="请选择状态"
-                // onChange={onGenderChange}
-                allowClear
-                style={{ width: '350px' }}
-              >
-                <Option value="0">启用</Option>
-                <Option value="1">禁用</Option>
-              </Select>
-            </FormItem>
-
-            <FormItem label=" " colon={false} >
-              <Button type='default' onClick={() => goBack()} >返回</Button>
-              <Button type='primary' loading={loading} htmlType="Submit" style={{ marginLeft: '4em' }}>保存</Button>
-            </FormItem>
-          </Form>
-        </ProCard.TabPane>
-      </ProCard>
-    </Card>
-  )
-}

src/pages/SystemManagement/Administrator/index.jsx

@@ -1,149 +1,292 @@
-import { history, Link } from 'umi';
-import { useRef } from 'react';
-import { Button, Modal, message, Popconfirm, Tooltip } from 'antd';
-import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import React, { useState, useEffect, useRef } from 'react';
+import { Button, Popconfirm, Modal, Form, Input, message, Radio, Select } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import { getCooperativeList } from '@/services/cooperative';
+import {
+  getUserList,
+  addUser,
+  deleteUser,
+  updateUser,
+  getDefaultPassword,
+  getUserDetail,
+} from '@/services/user';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import ProTable, { TableDropdown } from '@ant-design/pro-table';
+import PageTable from '@/components/PageTable';
+import Search from '@/components/CooperativeSearch';
 
+const FormItem = Form.Item;
+const { Option } = Select;
 
 export default (props) => {
-  const dataSource = [
-    {
-      id: 9,
-      key: '1',
-      name: '胡彦斌',
-      age: 32,
-      status: 0,
-      zz: '西湖区湖底公园1号',
-    },
-
-  ];
-
-
-  // 测试内容👆-------------------------
+  //编辑弹窗
+  const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+  const [form] = Form.useForm();
+  const [editModal, setEditModal] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [userId, setuserId] = useState();
+  const [password, setPassWord] = useState('');
+  const [cooperativeList, setCooperativeList] = useState([]);
 
+  //列表数据
   const actionRef = useRef();
-  const gotoDetail = (id) => {
-    history.push(`Administrator/AdminEdit`)
-  }
-
 
-  const handleDelete = (e) => {
-    deleteNote(e.noteId).then(res => {
-      message.success('删除成功');
-      actionRef.current.reload();
-    })
-  }
+  // 编辑弹窗的表单提交
+  const Submit = (values) => {
+    const newData = { ...values };
+    if (!newData.sex && newData.sex !== 0) {
+      newData.sex = 1;
+    }
+    setLoading(true);
+    if (!/^1[0-9]{10}$/.test(newData.phone)) {
+      message.warning('请输入正确的十一位手机号');
+      setLoading(false);
+      return false;
+    }
+    if (userId) {
+      updateUser(userId, newData).then(() => {
+        setLoading(false);
+        message.success(`修改成功`);
+        onCancel();
+        actionRef.current.reload();
+      });
+    } else {
+      addUser(newData)
+        .then(() => {
+          setLoading(false);
+          message.success(`保存成功`);
+          onCancel();
+          actionRef.current.reload();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
+  };
+  //表单点击取消按钮
+  const onCancel = () => {
+    setuserId();
+    form.resetFields();
+    setEditModal(false);
+  };
+  // 弹窗表单中机构搜索框改变事件目前没用
+  const handelChange = () => {};
 
+  // 列表点击编辑按钮
+  const handelEdit = (val) => {
+    setuserId(val.userId);
+    setEditModal(true);
+  };
+  //列表点击删除按钮
+  const handleDelete = (id) => {
+    deleteUser(id)
+      .then(() => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      })
+      .catch((err) => {
+        message.error(err);
+      });
+  };
+  //列表切换人员状态方法
   const handleOK = (record, data) => {
-    const titleCourse = record.status ? '您确定要禁用该用户吗? 禁用后该用户不能在后台登陆!' : '您确定要启用该用户吗? 启用后该用户将允许在后台登陆!';
+    const title = record.status
+      ? '您确定要将该人员状态变更为禁用吗? 禁用后该人员将不能登录'
+      : '您确定要将该人员状态变更为启用吗? 启用后该人员可以登录!';
     Modal.confirm({
-      title: titleCourse,
+      title: title,
       okText: '确认',
       cancelText: '取消',
-      onOk () {
-        publishNote(record.noteId, record.status ? 'off' : 'on').then(res => {
-          message.success('操作成功');
-          actionRef.current.reload()
-        })
+      onOk() {
+        updateUser(record.userId, { ...record, status: record.status === 1 ? 0 : 1 })
+          .then((res) => {
+            message.success('操作成功');
+            actionRef.current.reload();
+          })
+          .catch((err) => {
+            message.error(err);
+          });
       },
     });
-  }
+  };
+  useEffect(() => {
+    //获取账号默认密码
+    getDefaultPassword().then((res) => {
+      setPassWord(res);
+    });
+    //获取机构列表数据
+    getCooperativeList().then((res) => {
+      setCooperativeList(res.records);
+    });
+    if (userId) {
+      getUserDetail(userId).then((res) => {
+        if (res.orgId === '-1') {
+          form.setFieldsValue({ ...res, orgId: cooperativeList[0].orgId });
+        } else {
+          form.setFieldsValue(res);
+        }
+      });
+    } else {
+      form.resetFields();
+    }
+  }, [userId]);
+
   const actions = () => [
-    <Button key='add' type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>新增</Button>,
-  ]
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => setEditModal(true)}>
+      新增
+    </Button>,
+  ];
   const columns = [
     {
-      title: '账号',
-      key: 'zz',
-      dataIndex: 'zz',
+      title: '用户名',
+      dataIndex: 'userName',
+      key: 'userName',
     },
     {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      width: 80,
+      render: (_, record) => {
+        return record.sex === 1 ? '男' : record.sex === 0 ? '女' : '未知';
+      },
       search: false,
     },
     {
-      title: '邮箱',
-      dataIndex: 'a',
-      key: 'a',
-      search: false,
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      width: 120,
     },
     {
-      title: '角色',
-      dataIndex: 'weight',
-      key: 'weight',
-      valueType: 'select',
-      render: (t, record) => record.noteType === 'peseng' ? '农户' : '农机手',
-      valueEnum: {
-        'peseng': { text: '农户', },
-        'peseng': { text: '农机手', },
-      }
+      title: '邮箱',
+      dataIndex: 'email',
+      key: 'email',
     },
     {
       title: '状态',
       dataIndex: 'status',
-      // initialValue: 'all',
       key: 'status',
-      valueEnum: {
-        0: { text: '已启用', status: 'Success' },
-        1: { text: '已禁用', status: 'Error' },
-      }
-    },
-
-    {
-      title: (
-        <>
-          创建时间
-          <Tooltip placement="top">
-            <QuestionCircleOutlined style={{ marginLeft: 4 }} />
-          </Tooltip>
-        </>
-      ),
-      hideInTable: true,
-      key: 'createdAt',
-      dataIndex: 'createdAt',
-      valueType: 'date',
-      // render: (t) => formatterTime(t),
-      sorter: (a, b) => a.createdAt - b.createdAt,
+      renderFormItem: () => {
+        return (
+          <Select placeholder="请选择">
+            <Option value={1}>启用</Option>
+            <Option value={0}>禁用</Option>
+          </Select>
+        );
+      },
+      render: (_, record) => {
+        return record.status === 1 ? '启用' : '未启用';
+      },
     },
     {
       title: '操作',
       valueType: 'option',
-      key: 'option',
-      ellipsis: true,
-      width: 200,
       render: (_, record) => [
-        <Button type="link" key={1} onClick={() => handleOK(record)}>{record.status === 0 ? '启用' : '禁用'}</Button>,
-        <Link key={2} to={`Administrator/AdminEdit`}>编辑</Link>,
+        <Button type="link" key={1} onClick={() => handleOK(record)}>
+          {record.status === 0 ? '启用' : '禁用'}
+        </Button>,
+        <a key={2} onClick={() => handelEdit(record)}>
+          编辑
+        </a>,
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record)}
+          onConfirm={() => handleDelete(record.userId)}
           okText="确定"
           cancelText="取消"
         >
-          <a href="#"  >删除</a>
+          <a href="#">删除</a>
         </Popconfirm>,
-      ]
+      ],
     },
-  ]
-
-
-
+  ];
 
   return (
     <PageHeaderWrapper>
-      <ProTable
-        dataSource={dataSource}
+      <PageTable
+        request={getUserList}
+        // expfunc={exportPersonList}
         columns={columns}
-        // request={getNoteList} 请求
-        // rowKey="noteId"
+        actionRef={actionRef}
+        rowKey="userId"
         options={false}
         toolBarRender={actions}
-        actionRef={actionRef}
+        scroll={{ x: 1000 }}
       />
+      <Modal
+        title={userId ? '人员编辑' : '人员新增'}
+        visible={editModal}
+        onCancel={onCancel}
+        keyboard={false}
+        maskClosable={false}
+        destroyOnClose={true}
+        footer={null}
+      >
+        <Form {...formItemLayout} onFinish={Submit} form={form}>
+          <FormItem label="登录账号">
+            <Input.Group compact>
+              <Form.Item
+                name="loginName"
+                noStyle
+                rules={[{ required: true, message: '请输入登录账号' }]}
+              >
+                <Input placeholder="请输入" />
+              </Form.Item>
+              <span style={{ opacity: '0.7' }}>默认密码{password}</span>
+            </Input.Group>
+          </FormItem>
+          <FormItem label="用户名" name="userName" rules={[{ required: true, message: '请输入' }]}>
+            <Input placeholder="请输入" />
+          </FormItem>
+          <FormItem label="性别" name="sex">
+            <Radio.Group name="sex" defaultValue={1}>
+              <Radio value={1}>男</Radio>
+              <Radio value={0}>女</Radio>
+            </Radio.Group>
+          </FormItem>
+          <FormItem label="手机号" name="phone" rules={[{ required: true, message: '请输入' }]}>
+            <Input maxLength="11" placeholder="请输入" />
+          </FormItem>
+          <FormItem label="邮箱" name="email" rules={[{ required: true, message: '请输入' }]}>
+            <Input placeholder="请输入" />
+          </FormItem>
+          <FormItem label="所属机构" name="orgId" rules={[{ required: true, message: '请输入' }]}>
+            <Search placeholder="请选择机构" onChange={handelChange} />
+            {/* <Select
+              placeholder="请选择机构"
+              showSearch
+              onSearch={handelFormSearch}
+              onChange={handelFormSearch}
+            >
+              {cooperativeList.map((item) => (
+                <Option value={item.orgId} key={item.orgId}>
+                  {item.name}
+                </Option>
+              ))}
+            </Select> */}
+          </FormItem>
+          <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
+            <Select placeholder="请选择是否启用">
+              <Option value={1}>启用</Option>
+              <Option value={0}>禁用</Option>
+            </Select>
+          </FormItem>
+          <FormItem label=" " colon={false}>
+            <Button type="default" onClick={onCancel}>
+              取消
+            </Button>
+            <Button
+              type="primary"
+              loading={loading}
+              htmlType="Submit"
+              style={{ marginLeft: '4em' }}
+            >
+              确认
+            </Button>
+          </FormItem>
+        </Form>
+      </Modal>
     </PageHeaderWrapper>
-  )
-}
+  );
+};

src/pages/SystemManagement/Cooperative/edit.jsx

@@ -1,182 +0,0 @@
-import { Form, Input, Card, Select, message, Button } from 'antd';
-import { history } from 'umi';
-import ProCard from '@ant-design/pro-card';
-import { useState, useEffect } from 'react';
-import POI from '@/components/POI/POI';
-
-import { getRegionList } from '@/services/region';
-import { addCooperative, getCooperativeDetail, updateCooperative } from '@/services/cooperative';
-
-const { TextArea } = Input;
-const { Option } = Select;
-const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
-
-const goBack = () => {
-  history.goBack();
-};
-const FormItem = Form.Item;
-export default (props) => {
-  const { location } = props;
-  const { id } = location.query;
-  const [form] = Form.useForm();
-  const [listForm, setListForm] = useState({});
-  const [loading, setLoading] = useState(false);
-  const [newLocName, setLocName] = useState('');
-  const [newAddress, setAddress] = useState('');
-  const [regionList, setRegionList] = useState([]);
-
-  const Submit = (data) => {
-    console.log(data);
-    setLoading(true);
-    if (id) {
-      updateCooperative(id, {
-        ...listForm,
-        ...data,
-        lng: data.location.split(',')[0],
-        lat: data.location.split(',')[1],
-      })
-        .then(() => {
-          setLoading(false);
-          message.success('数据更新成功');
-          goBack();
-        })
-        .catch((err) => {
-          setLoading(false);
-          message.error(err.message || err);
-        });
-    } else {
-      addCooperative({
-        ...data,
-        lng: data.location.split(',')[0],
-        lat: data.location.split(',')[1],
-      })
-        .then((res) => {
-          setLoading(false);
-          message.success('数据保存成功');
-          history.goBack();
-        })
-        .catch((err) => {
-          setLoading(false);
-          message.error(err.message || err);
-        });
-    }
-  };
-
-  useEffect(() => {
-    getRegionList()
-      .then((res) => {
-        setRegionList(res.records || []);
-      })
-      .catch((err) => {});
-  }, []);
-  useEffect(() => {
-    if (id) {
-      getCooperativeDetail(id)
-        .then((res) => {
-          setListForm(res || []);
-          form.setFieldsValue({ ...res, location: res.lng + ',' + res.lat });
-        })
-        .catch((err) => {
-          message.error(err.message || err);
-        });
-    }
-  }, [id]);
-
-  return (
-    <Card>
-      <ProCard tabs={{ type: 'card' }}>
-        <ProCard.TabPane key={1} tab="合作社编辑">
-          <Form {...formItemLayout} onFinish={Submit} form={form}>
-            <FormItem
-              label="机构名"
-              name="name"
-              rules={[{ required: true, message: '请输入机构名称16个字符以内' }]}
-            >
-              <Input
-                placeholder="请输入机构名称16个字符以内"
-                maxLength="16"
-                style={{ width: '350px' }}
-              />
-            </FormItem>
-            <FormItem
-              label="信用代码"
-              name="creditCode"
-              rules={[{ required: true, message: '请输入信用代码' }]}
-            >
-              <Input placeholder="请输入信用代码" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="联系人"
-              name="contactPerson"
-              rules={[{ required: true, message: '请输入联系人' }]}
-            >
-              <Input placeholder="请输入联系人" rows={4} style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="联系方式"
-              name="phone"
-              rules={[{ required: true, message: '请输入联系方式' }]}
-            >
-              <Input placeholder="请输入联系方式" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="定位经纬"
-              name="location"
-              rules={[{ required: true, message: '请定位' }]}
-            >
-              <POI
-                placeholder="定位"
-                setLocName={setLocName}
-                setAddress={setAddress}
-                roomBoole={true}
-              />
-            </FormItem>
-            <FormItem
-              label="地址"
-              name="address"
-              rules={[{ required: true, message: '请输入地址' }]}
-            >
-              <TextArea placeholder="请输入地址" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="区域"
-              name="regionId"
-              rules={[{ required: true, message: '请输入区域' }]}
-            >
-              <Select placeholder="请选择区域" style={{ width: '350px' }}>
-                {regionList.map((item) => (
-                  <Option value={item.regionId} key={item.regionId}>
-                    {item.name}
-                  </Option>
-                ))}
-              </Select>
-            </FormItem>
-            <FormItem label="身份" name="role" rules={[{ required: true, message: '请选择身份' }]}>
-              <Select placeholder="请选择身份" style={{ width: '350px' }}>
-                <Option value="合作社" key="合作社" />
-                <Option value="个体户" key="个体户" />
-              </Select>
-            </FormItem>
-            <FormItem label="员工数">{listForm?.workerNum || 0}</FormItem>
-            <FormItem label="农机数">{listForm?.machineryNum || 0}</FormItem>
-            <FormItem label="订单完成数">{listForm?.orderNum || 0}</FormItem>
-            <FormItem label="评分">{listForm?.score || 0}</FormItem>
-            <FormItem label=" " colon={false}>
-              <Button type="default" onClick={() => goBack()}>
-                返回
-              </Button>
-              <Button
-                type="primary"
-                loading={loading}
-                htmlType="submit"
-                style={{ marginLeft: '4em' }}
-              >
-                保存
-              </Button>
-            </FormItem>
-          </Form>
-        </ProCard.TabPane>
-      </ProCard>
-    </Card>
-  );
-};

src/pages/SystemManagement/Cooperative/index.jsx

@@ -38,7 +38,6 @@ export default (props) => {
 
   //选中左侧列表右侧显示详情
   const handleslect = (val) => {
-    console.log(666);
     setOrgId(val);
   };
   const handleDelete = (val) => {
@@ -78,7 +77,7 @@ export default (props) => {
           okText="确定"
           cancelText="取消"
         >
-          <CloseOutlined style={{ color: 'red', marginTop: '6px' }} />
+          <CloseOutlined style={{ color: 'red', display: 'grid', placeItems: 'center' }} />
         </Popconfirm>
       </div>
     );

src/pages/SystemManagement/Region/index.jsx

@@ -120,7 +120,7 @@ export default (props) => {
         scroll={{ x: 1000 }}
       />
       <Modal
-        title="区域新增"
+        title={regionId ? '区域编辑' : '区域新增'}
         visible={editModal}
         onCancel={onCancel}
         keyboard={false}

src/services/user.js

@@ -3,3 +3,41 @@ import request from '@/utils/request';
 export const currentUser = () => request('/currentUser', { showType: 0 });
 
 export const changePassword = (data) => request('/change-password', { data, method: 'PUT' });
+
+/**
+ * 保存用户
+ * @param {*} data
+ * @returns
+ */
+export const addUser = (data) => request('/user', { method: 'post', data });
+
+/**
+ * 修改用户
+ * @param {*} data
+ * @returns
+ */
+export const updateUser = (id, data) => request(`/user/${id}`, { method: 'put', data });
+
+/**
+ * 查询用户列表
+ * @param {*} params
+ * @returns
+ */
+export const getUserList = (params) => request('/user', { params });
+
+/**
+ * 删除用户
+ * @param {*} data
+ * @returns
+ */
+export const deleteUser = (id) => request(`/user/${id}`, { method: 'delete' });
+
+/**
+ * 查询用户详情
+ */
+export const getUserDetail = (id) => request(`/user/${id}`);
+
+/**
+ * 查询默认密码
+ */
+export const getDefaultPassword = () => request('/user/default/password');