.

config/routes.js

@@ -43,21 +43,20 @@ export default [
     ],
   },
   {
-    path: '/PlatformMessageManagement',
-    name: '消息管理',
-    icon: 'MailOutlined',
+    path: '/MonitoringScreen',
+    name: '农机作业监控大屏',
+    icon: 'DesktopOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
-        path: '/PlatformMessageManagement/MessageManageList',
-        name: '平台消息管理',
-        icon: 'smile',
-        component: './PlatformMessageManagement/MessageManageList',
+        path: '/MonitoringScreen/index.jsx',
+        name: '数据大屏',
+        component: './MonitoringScreen',
       },
       {
-        path: '/PlatformMessageManagement/MessageEdit',
-        name: '消息查看',
-        component: './PlatformMessageManagement/MessageEdit',
+        path: '/MonitoringScreen/detail.jsx',
+        name: '农机轨迹',
+        component: './MonitoringScreen/detail.jsx',
         hideInMenu: true,
       },
     ],
@@ -105,33 +104,30 @@ export default [
     ],
   },
   {
-    path: '/Machinery',
-    name: '农机管理',
-    icon: 'CarOutlined',
+    path: '/GPSDevice',
+    name: 'GPS设备管理',
+    icon: 'CompassOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
-        path: '/Machinery/Cooperative',
-        name: '合作社列表',
-        component: './Machinery/Cooperative',
-      },
-      {
-        path: '/Machinery/Cooperative/edit.jsx',
-        name: '合作社编辑',
-        component: './Machinery/Cooperative/edit.jsx',
-        hideInMenu: true,
-      },
-      {
-        path: '/Machinery/Employees',
-        name: '员工列表',
-        component: './Machinery/Employees',
+        path: '/GPSDevice/GPS',
+        name: 'GPS管理',
+        component: './GPSDevice/GPS',
       },
       {
-        path: '/Machinery/Employees/edit.jsx',
-        name: '员工编辑',
-        component: './Machinery/Employees/edit.jsx',
+        path: '/GPSDevice/GPS/GPSEdit',
+        name: '新增设备',
+        component: './GPSDevice/GPS/GPSEdit',
         hideInMenu: true,
       },
+    ],
+  },
+  {
+    path: '/Machinery',
+    name: '农机管理',
+    icon: 'CarOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
       {
         path: '/Machinery/MachineryType',
         name: '农机分类列表',
@@ -151,20 +147,20 @@ export default [
     ],
   },
   {
-    path: '/MonitoringScreen',
-    name: '农机监控大屏',
-    icon: 'DesktopOutlined',
+    path: '/MachineryStatistics',
+    name: '农机统计',
+    icon: 'CompassOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
-        path: '/MonitoringScreen/index.jsx',
-        name: '农机监控大屏',
-        component: './MonitoringScreen',
+        path: '/MachineryStatistics',
+        name: '农机统计',
+        component: './MachineryStatistics',
       },
       {
-        path: '/MonitoringScreen/detail.jsx',
-        name: '农机轨迹',
-        component: './MonitoringScreen/detail.jsx',
+        path: '/GPSDevice/GPS/GPSEdit',
+        name: '新增设备',
+        component: './GPSDevice/GPS/GPSEdit',
         hideInMenu: true,
       },
     ],
@@ -197,13 +193,13 @@ export default [
   },
   {
     path: '/JobWarning',
-    name: '作业预警',
+    name: '作业监管',
     icon: 'AlertOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
         path: '/JobWarning/index.jsx',
-        name: '作业预警',
+        name: '预警监管',
         component: './JobWarning',
       },
     ],
@@ -231,6 +227,26 @@ export default [
       },
     ],
   },
+  {
+    path: '/PlatformMessageManagement',
+    name: '消息管理',
+    icon: 'MailOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/PlatformMessageManagement/MessageManageList',
+        name: '平台消息管理',
+        icon: 'smile',
+        component: './PlatformMessageManagement/MessageManageList',
+      },
+      {
+        path: '/PlatformMessageManagement/MessageEdit',
+        name: '消息查看',
+        component: './PlatformMessageManagement/MessageEdit',
+        hideInMenu: true,
+      },
+    ],
+  },
   {
     path: '/Finance',
     name: '财务管理',
@@ -249,40 +265,33 @@ export default [
       },
     ],
   },
+
   {
-    path: '/GPSDevice',
-    name: 'GPS设备管理',
-    icon: 'CompassOutlined',
+    path: '/SystemManagement',
+    name: '系统管理',
+    icon: 'SettingOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
-        path: '/GPSDevice/GPS',
-        name: 'GPS管理',
-        component: './GPSDevice/GPS',
+        path: '/SystemManagement/Cooperative',
+        name: '机构列表',
+        component: './SystemManagement/Cooperative',
       },
       {
-        path: '/GPSDevice/GPS/GPSEdit',
-        name: '新增设备',
-        component: './GPSDevice/GPS/GPSEdit',
+        path: '/SystemManagement/Cooperative/edit.jsx',
+        name: '机构编辑',
+        component: './SystemManagement/Cooperative/edit.jsx',
         hideInMenu: true,
       },
-    ],
-  },
-  {
-    path: '/SystemManagement',
-    name: '系统管理',
-    icon: 'SettingOutlined',
-    component: '../layouts/BasicLayout',
-    routes: [
       {
         path: '/SystemManagement/Administrator',
-        name: '管理员',
+        name: '人员管理',
         icon: 'smile',
         component: './SystemManagement/Administrator',
       },
       {
         path: '/SystemManagement/Administrator/AdminEdit',
-        name: '管理员编辑页',
+        name: '人员编辑',
         icon: 'smile',
         component: './SystemManagement/Administrator/AdminEdit',
         hideInMenu: true,

src/pages/Machinery/Employees/edit.jsx

@@ -1,153 +0,0 @@
-import { Form, Input, Card, InputNumber, Select, message, Button } from 'antd';
-import { history } from 'umi';
-import ProCard from '@ant-design/pro-card';
-import { useState, useEffect } from 'react';
-// import { getTagList } from '@/services/tag';
-// import { addAttaList, gettaTouristForm, EditaddAttaList } from '@/services/AttaList'
-
-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 [imageList, setImageList] = useState([]);
-
-  const Submit = (data) => {
-    const typeList = (data.typeList || []).map((x) => {
-      return { ...x, targetId: id, targetType: 'tourist' };
-    });
-    setLoading(true);
-
-    // if (id) {
-    //   EditaddAttaList(id, { ...listForm, ...data, imageList, typeList }).then(() => {
-    //     setLoading(false);
-    //     message.success('数据更新成功');
-    //     goBack();
-    //   })
-    //     .catch(err => {
-    //       setLoading(false);
-    //       message.error(err.message || err);
-    //     });
-    // } else {
-    //   addAttaList({ ...data, imageList, typeList }).then((res) => {
-    //     setLoading(false);
-    //     message.success('数据保存成功');
-    //     history.replace(`/Attractions/Edit?id=${res.touristId}`)
-    //   })
-    //     .catch(err => {
-    //       setLoading(false);
-    //       message.error(err.message || err);
-    //     });
-    // }
-  };
-
-  //地址--占位
-  const [newLocName, setLocName] = useState('');
-  const [newAddress, setAddress] = useState('');
-
-  const selectTagList = (params) => {
-    // return getTagList({
-    // }).then((res) => {
-    // }).catch((err) => {
-    //   return {
-    //     success: false,
-    //   }
-    // })
-  };
-
-  const imageInput = (image) => {
-    return {
-      uid: image.imageId,
-      url: image.url,
-    };
-  };
-
-  const imageOutput = (image) => {
-    return {
-      imageId: image?.raw?.imageId,
-      shopId: id,
-      url: image.url,
-    };
-  };
-  useEffect(() => {
-    selectTagList();
-    // if (id) {
-    //   gettaTouristForm(id).then((res) => {
-    //     setListForm(res)
-    //     form.setFieldsValue(res)
-    //     setImageList(res?.imageList || [])
-    //   })
-    // }
-  }, [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: '请输入姓名' }]}>
-              <Input placeholder="请输入姓名" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="手机号"
-              name="phone"
-              rules={[{ required: true, message: '请输入手机号' }]}
-            >
-              <Input placeholder="请输入手机号" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="所属机构"
-              name="cooperative_id"
-              rules={[{ required: true, message: '请选择所属机构' }]}
-            >
-              <Select style={{ width: '350px' }}>
-                <Option value="6" key="6">
-                  {6}
-                </Option>
-                <Option value="7" key="7">
-                  {7}
-                </Option>
-              </Select>
-            </FormItem>
-            <FormItem
-              label="身份"
-              name="identity"
-              rules={[{ required: true, message: '请选择身份' }]}
-            >
-              <Select style={{ width: '350px' }}>
-                <Option value="6" key="6">
-                  农机手
-                </Option>
-                <Option value="7" key="7">
-                  合作社负责人
-                </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/Machinery/Employees/index.jsx

@@ -1,88 +0,0 @@
-import React from 'react';
-import { history, Link } from 'umi';
-import { Button, Popconfirm, message, Tooltip } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-// import { getPersonList, exportPersonList } from '@/services/person';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import moment from 'moment';
-import PageTable from '@/components/PageTable';
-
-const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
-};
-
-export default (props) => {
-  const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
-      新增员工
-    </Button>,
-  ];
-  const gotoEdit = (id) => {
-    const queryStr = id ? `?id=${id}` : '';
-    history.push(`./Employees/edit.jsx${queryStr}`);
-  };
-  const columns = [
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '所属机构',
-      dataIndex: 'title',
-      key: 'title',
-    },
-    {
-      title: '身份',
-      dataIndex: 'identity',
-      key: 'identity',
-    },
-    {
-      title: '工作状态',
-      dataIndex: 'status',
-      key: 'status',
-    },
-    {
-      title: '注册时间',
-      dataIndex: 'createData',
-      key: 'createData',
-    },
-    {
-      title: '操作',
-      valueType: 'option',
-      render: (_, record) => [
-        <Link key={1} to={`./edit.jsx`}>
-          编辑
-        </Link>,
-        <Popconfirm
-          key={2}
-          title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.cooperativeId)}
-          okText="确定"
-          cancelText="取消"
-        >
-          <a href="#">删除</a>
-        </Popconfirm>,
-      ],
-    },
-  ];
-  const handleDelete = () => {};
-  return (
-    <PageHeaderWrapper>
-      <PageTable
-        // request={getPersonList}
-        // expfunc={exportPersonList}
-        toolBarRender={actions}
-        columns={columns}
-        rowKey="employeesId"
-        options={false}
-        scroll={{ x: 1000 }}
-      />
-    </PageHeaderWrapper>
-  );
-};

src/pages/MachineryStatistics/index.jsx

@@ -0,0 +1,3 @@
+export default (props) => {
+  return <div>农机统计</div>;
+};