Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

config/routes.js

@@ -204,6 +204,14 @@ export default [
         icon: 'smile',
         component: './SystemManagement/Administrator',
       },
+      {
+        path: '/SystemManagement/Administrator/AdminEdit',
+        name: '管理员编辑页',
+        icon: 'smile',
+        component: './SystemManagement/Administrator/AdminEdit',
+        hideInMenu: true,
+
+      },
       {
         path: '/SystemManagement/UserRights',
         name: '角色权限',

package.json

@@ -51,6 +51,7 @@
     "@ant-design/pro-descriptions": "^1.10.0",
     "@ant-design/pro-form": "^1.52.0",
     "@ant-design/pro-layout": "^6.32.0",
+    "@ant-design/pro-list": "^1.21.32",
     "@ant-design/pro-table": "^2.61.0",
     "@umijs/route-utils": "^2.0.0",
     "antd": "^4.17.0",

src/pages/PlatformMessageManagement/MessageEdit/index.jsx

@@ -1,10 +1,10 @@
-import { Input, Card, InputNumber, Button, message } from "antd"
+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()
 }
@@ -37,8 +37,17 @@ export default (props) => {
             <FormItem label="农户" name="title" rules={[{ required: true, message: '请输入' }]}>
               <Input placeholder="请输入" style={{ width: '350px' }} />
             </FormItem>
-            <FormItem label="推送方式" name="phone" >
-              <Input placeholder="请输入" style={{ width: '350px' }} />
+            <FormItem label="推送方式" name="phone" rules={[{ required: true, message: '请输入' }]} >
+              <Select
+                placeholder="请选择方式"
+                // onChange={onGenderChange}
+                allowClear
+                style={{ width: '350px' }}
+              >
+                <Option value="male">通知栏推送</Option>
+                <Option value="female">APP内消息中心推送</Option>
+                <Option value="other">短信推送</Option>
+              </Select>
             </FormItem>
             <FormItem label=" " colon={false} >
               <Button type='default' onClick={() => goBack()} >返回</Button>

src/pages/PlatformMessageManagement/MessageManageList/index.jsx

@@ -8,20 +8,17 @@ import ProTable from '@ant-design/pro-table';
 export default (props) => {
   const dataSource = [
     {
-      id: 9,
-      key: '1',
+      id: 2121329,
+      title: '这是是一个标题标题',
       name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
-    },
-    {
-      id: 10,
-      key: '2',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      pushPerson: '农机手',
+      status: 'APP内消息中心推送',
     },
+
   ];
+  const gotoDetail = (id) => {
+    history.push(`./MessageEdit`)
+  }
 
   const actions = () => [
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>

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

@@ -0,0 +1,75 @@
+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 => {
+    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,52 +1,148 @@
-import { Input, Card, InputNumber, Button, message } from "antd"
-import { useEffect, useState } from 'react'
-import { Form } from "antd";
-import { history } from 'umi';
-import ProCard from '@ant-design/pro-card'
+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 { PageHeaderWrapper } from '@ant-design/pro-layout';
+import ProTable, { TableDropdown } from '@ant-design/pro-table';
 
 
-const goBack = () => {
-  history.goBack()
-}
-const FormItem = Form.Item
 export default (props) => {
+  const dataSource = [
+    {
+      id: 9,
+      key: '1',
+      name: '胡彦斌',
+      age: 32,
+      zz: '西湖区湖底公园1号',
+    },
+
+  ];
+
+
+  // 测试内容👆-------------------------
+
+  const actionRef = useRef();
+  const gotoDetail = (id) => {
+    history.push(`Administrator/AdminEdit`)
+  }
+
+
+  const handleDelete = (e) => {
+    deleteNote(e.noteId).then(res => {
+      message.success('删除成功');
+      actionRef.current.reload();
+    })
+  }
 
-  const [form] = Form.useForm()
-  const [loading, setLoading] = useState(false)
+  const handleOK = (record, data) => {
+    const titleCourse = record.status ? '您确定要禁用该用户吗? 禁用后该用户不能在后台登陆!' : '您确定要启用该用户吗? 启用后该用户将允许在后台登陆!';
+    Modal.confirm({
+      title: titleCourse,
+      okText: '确认',
+      cancelText: '取消',
+      onOk () {
+        publishNote(record.noteId, record.status ? 'off' : 'on').then(res => {
+          message.success('操作成功');
+          actionRef.current.reload()
+        })
+      },
+    });
+  }
+  const actions = () => [
+    <Button key='add' type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>新增</Button>,
+  ]
+  const columns = [
+    {
+      title: '账号',
+      key: 'zz',
+      dataIndex: 'zz',
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      search: false,
 
-  const formItemLayout = {
-    //布局
-    labelCol: { span: 6 },
-    wrapperCol: { span: 14 },
-  };
 
-  const Submit = values => {
-    console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
+    },
+    {
+      title: '邮箱',
+      dataIndex: 'a',
+      key: 'a',
+      search: false,
+    },
+    {
+      title: '角色',
+      dataIndex: 'weight',
+      key: 'weight',
+      valueType: 'select',
+      render: (t, record) => record.noteType === 'peseng' ? '农户' : '农机手',
+      valueEnum: {
+        'peseng': { text: '农户', },
+        'peseng': { text: '农机手', },
+      }
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: (t, record) => record.noteType === 1 ? '已启用' : '已禁用',
+      initialValue: 'Success',
+      valueEnum: {
+        online: { text: '已启用', status: 'Success' },
+        error: { 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,
+    },
+    {
+      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>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <a href="#"  >删除</a>
+        </Popconfirm>,
+      ]
+    },
+  ]
 
   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" >
-              <Input placeholder="请输入" style={{ width: '350px' }} />
-            </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>
+    <PageHeaderWrapper>
+      <ProTable
+        dataSource={dataSource}
+        columns={columns}
+        // request={getNoteList} 请求
+        // rowKey="noteId"
+        options={false}
+        toolBarRender={actions}
+        actionRef={actionRef}
+      />
+    </PageHeaderWrapper>
   )
 }

src/pages/SystemManagement/BasicParameters/index.jsx

@@ -1,5 +1,46 @@
+import { Input, Card, InputNumber, 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 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 => {
+    console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
+
+  };
+
   return (
-    <div>基本参数</div>
+    <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="请输入" type={"number"} maxLength={11} style={{ width: '350px' }} />
+            </FormItem>
+
+            <FormItem label=" " colon={false} >
+              <Button type='primary' loading={loading} htmlType="Submit" style={{ marginLeft: '4em' }}>保存</Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+      </ProCard>
+    </Card>
   )
-}
+}

src/pages/SystemManagement/MapExtent/index.jsx

@@ -1,7 +1,119 @@
+import React, { useState } from 'react';
+import { Tag, Space, Button, Popconfirm, Form, Modal, Input } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
 
+import ProList from '@ant-design/pro-list';
 
-export default (props) => {
+const FormItem = Form.Item
+const defaultData = [
+  {
+    id: '1',
+    name: '赵村',
+    desc: '赵村较大，多人协作',
+  },
+  {
+    id: '2',
+    name: '钱村',
+    desc: '钱村头以南二百米',
+  },
+  {
+    id: '3',
+    name: '孙孙村',
+    desc: '',
+  },
+  {
+    id: '4',
+    name: '李村',
+    desc: '村民拒不配合，暂停',
+  },
+];
+export default () => {
+  const [form2] = Form.useForm()
+  const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 }, };
+  const [dataSource, setDataSource] = useState(defaultData);
+  const [editModal, setEditModal] = useState(false)
+  const [editdetail, setEditDetail] = useState()
+
+  const changeWeight = (record) => {
+    setEditDetail(record)
+    setEditModal(true)
+  }
+  const Submit = (values) => {
+    console.log('editdetail', editdetail, values);
+    message.success(`修改成功`);
+    setLoading2(false)
+    onCancel()
+
+  }
+
+  const onCancel = () => {
+    form2.resetFields()
+    setEditModal(false)
+  }
+  const actions = () => [
+    <Button key='add' type="primary" icon={<PlusOutlined />} onClick={() => setEditModal(true)}>新增</Button>,
+  ]
   return (
-    <div>区域范围</div>
-  )
-}
+    <PageHeaderWrapper>
+      <ProList
+        toolBarRender={actions}
+        rowKey="id" headerTitle="区域范围" dataSource={dataSource} showActions="hover" editable={{
+          onSave: async (key, record, originRow) => {
+            console.log(key, record, originRow);
+            return true;
+          },
+        }} onDataSourceChange={setDataSource} metas={{
+          title: {
+            dataIndex: 'name',
+          },
+          // avatar: {
+          //   dataIndex: 'image',
+          //   editable: false,
+          // },
+          description: {
+            dataIndex: 'desc',
+          },
+          subTitle: {
+            render: () => {
+              return (<Space size={0}>
+                {/* <Tag color="blue"></Tag> */}
+                <Tag color="#5BD8A6">区域名称</Tag>
+              </Space>);
+            },
+          },
+          actions: {
+            render: (text, row, index, action) => [
+              <a onClick={() => {
+                action === null || action === void 0 ? void 0 : action.startEditable(row.id);
+              }} key="link">
+                编辑
+              </a>,
+              <Popconfirm
+                key={3}
+                title="您是否确认删除 ?"
+                onConfirm={() => handleDelete(record)}
+                okText="确定"
+                cancelText="取消"
+              >
+                <a href="#"  >删除</a>
+              </Popconfirm>,
+            ],
+          },
+        }} />,
+      <Modal title="套餐权重修改" visible={editModal} onCancel={onCancel} destroyOnClose={true} footer={null}>
+        < Form {...formItemLayout} onFinish={Submit} form={form2} >
+          <FormItem label="范围名称" name="shopNam12e" rules={[{ required: true, message: '请输入' }]}>
+            <Input placeholder="请输入" style={{ width: '350px' }} />
+          </FormItem>
+          <FormItem label="备注" name="shopName" rules={[{ required: true, message: '请输入' }]}>
+            <Input placeholder="请输入" style={{ width: '350px' }} />
+          </FormItem>
+          <FormItem label=" " colon={false} >
+            <Button type='default' onClick={onCancel} >取消</Button>
+            <Button type='primary' htmlType="Submit" style={{ marginLeft: '4em' }}>修改</Button>
+          </FormItem>
+        </Form>
+      </Modal>
+    </PageHeaderWrapper>);
+};