.

config/routes.js

@@ -125,18 +125,6 @@ export default [
         hideInMenu: true,
       },
       // {
-      //   path: '/Machinery/GPS',
-      //   name: '设备管理',
-      //   access: 'device',
-      //   component: './Machinery/GPS',
-      // },
-      // {
-      //   path: '/Machinery/GPS/edit.jsx',
-      //   name: '设备编辑',
-      //   component: './Machinery/GPS/edit.jsx',
-      //   hideInMenu: true,
-      // },
-      // {
       //   path: '/Machinery/GIS',
       //   name: '农机GIS',
       //   access: 'gis',
@@ -204,12 +192,6 @@ export default [
         access: 'st-work',
         component: './JobStatistics/Job',
       },
-      // {
-      //   path: '/JobStatistics/RevenueExpenditure',
-      //   name: '收支统计',
-      //   access: 'st-finance',
-      //   component: './JobStatistics/RevenueExpenditure',
-      // },
     ],
   },
   {

src/pages/JobStatistics/RevenueExpenditure/index.jsx

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

src/pages/Machinery/GPS/edit.jsx

@@ -1,59 +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(false);
-  };
-
-  return (
-    <Card>
-      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}>
-        <ProCard.TabPane key={1} tab="设备管理">
-          <Form {...formItemLayout} onFinish={Submit} form={form}>
-            <FormItem
-              label="设备ID"
-              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=" " 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/GPS/index.jsx

@@ -1,99 +0,0 @@
-import { history, Link } from 'umi';
-import { useRef } from 'react';
-import { Button, message, Popconfirm } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import ProTable, { TableDropdown } from '@ant-design/pro-table';
-
-export default (props) => {
-  const dataSource = [
-    {
-      id: 9,
-      key: '1',
-      name: '胡彦斌',
-      age: 32,
-      status: 1,
-      zz: '西湖区湖底公园1号',
-    },
-  ];
-
-  // 测试内容👆-------------------------
-
-  const actionRef = useRef();
-  const gotoDetail = (id) => {
-    history.push(`./GPS/edit.jsx`);
-  };
-
-  const handleDelete = (e) => {
-    deleteNote(e.noteId).then((res) => {
-      message.success('删除成功');
-      actionRef.current.reload();
-    }).catch((err) => {
-      console.log(err.message)
-    });
-  };
-
-  const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>
-      新增
-    </Button>,
-  ];
-  const columns = [
-    {
-      title: 'ID',
-      key: 'zz',
-      dataIndex: 'zz',
-    },
-    {
-      title: '设备号',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      // initialValue: 'all',
-      key: 'status',
-      valueEnum: {
-        0: { text: '已启用', status: 'Success' },
-        1: { text: '已禁用', status: 'Error' },
-      },
-    },
-
-    {
-      title: '操作',
-      valueType: 'option',
-      key: 'option',
-      ellipsis: true,
-      width: 200,
-      render: (_, record) => [
-        <Link key={2} to={`./GPS/edit.jsx`}>
-          编辑
-        </Link>,
-        <Popconfirm
-          key={3}
-          title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record)}
-          okText="确定"
-          cancelText="取消"
-        >
-          <a href="#">删除</a>
-        </Popconfirm>,
-      ],
-    },
-  ];
-
-  return (
-    <PageHeaderWrapper>
-      {/* <ProTable
-        dataSource={dataSource}
-        columns={columns}
-        // request={getNoteList} 请求
-        // rowKey="noteId"
-        options={false}
-        toolBarRender={actions}
-        actionRef={actionRef}
-      /> */}
-    </PageHeaderWrapper>
-  );
-};

src/pages/Machinery/Org/index.jsx

@@ -225,20 +225,9 @@ export default (props) => {
                   ))}
                 </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="primary" loading={loading} htmlType="submit">
                   保存