.

config/routes.js

@@ -98,26 +98,23 @@ export default [
       },
     ],
   },
-  {
-    path: '/GPSDevice/GPS',
-    name: '设备管理',
-    icon: 'CompassOutlined',
-    component: './GPSDevice/GPS',
-    routes: [
-      {
-        path: '/GPSDevice/GPS/GPSEdit',
-        name: '新增设备',
-        component: './GPSDevice/GPS/GPSEdit',
-        hideInMenu: true,
-      },
-    ],
-  },
   {
     path: '/Machinery',
     name: '农机管理',
     icon: 'CarOutlined',
     component: '../layouts/BasicLayout',
     routes: [
+      {
+        path: '/Machinery/GPS',
+        name: '设备管理',
+        component: './Machinery/GPS',
+      },
+      {
+        path: '/Machinery/GPS/edit.jsx',
+        name: '设备编辑',
+        component: './Machinery/GPS/edit.jsx',
+        hideInMenu: true,
+      },
       {
         path: '/Machinery/MachineryType',
         name: '农机分类列表',
@@ -147,12 +144,6 @@ export default [
         name: '农机统计',
         component: './MachineryStatistics',
       },
-      {
-        path: '/GPSDevice/GPS/GPSEdit',
-        name: '新增设备',
-        component: './GPSDevice/GPS/GPSEdit',
-        hideInMenu: true,
-      },
     ],
   },
   {

src/pages/GPSDevice/GPS/GPSEdit/index.jsx

@@ -1,50 +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)
-    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="设备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/edit.jsx

@@ -0,0 +1,60 @@
+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);
+    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="设备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/GPSDevice/GPS/index.jsx → src/pages/Machinery/GPS/index.jsx

@@ -1,11 +1,10 @@
 import { history, Link } from 'umi';
 import { useRef } from 'react';
-import { Button, message, Popconfirm, } from 'antd';
-import { PlusOutlined, } from '@ant-design/icons';
+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 = [
     {
@@ -16,27 +15,27 @@ export default (props) => {
       status: 1,
       zz: '西湖区湖底公园1号',
     },
-
   ];
 
   // 测试内容👆-------------------------
 
   const actionRef = useRef();
   const gotoDetail = (id) => {
-    history.push(`./GPS/GPSEdit`)
-  }
-
+    history.push(`./GPS/edit.jsx`);
+  };
 
   const handleDelete = (e) => {
-    deleteNote(e.noteId).then(res => {
+    deleteNote(e.noteId).then((res) => {
       message.success('删除成功');
       actionRef.current.reload();
-    })
-  }
+    });
+  };
 
   const actions = () => [
-    <Button key='add' type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>新增</Button>,
-  ]
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>
+      新增
+    </Button>,
+  ];
   const columns = [
     {
       title: 'ID',
@@ -56,10 +55,9 @@ export default (props) => {
       valueEnum: {
         0: { text: '已启用', status: 'Success' },
         1: { text: '已禁用', status: 'Error' },
-      }
+      },
     },
 
-
     {
       title: '操作',
       valueType: 'option',
@@ -67,7 +65,9 @@ export default (props) => {
       ellipsis: true,
       width: 200,
       render: (_, record) => [
-        <Link key={2} to={`./GPS/GPSEdit`}>编辑</Link>,
+        <Link key={2} to={`./GPS/edit.jsx`}>
+          编辑
+        </Link>,
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
@@ -75,11 +75,11 @@ export default (props) => {
           okText="确定"
           cancelText="取消"
         >
-          <a href="#"  >删除</a>
+          <a href="#">删除</a>
         </Popconfirm>,
-      ]
+      ],
     },
-  ]
+  ];
 
   return (
     <PageHeaderWrapper>
@@ -93,5 +93,5 @@ export default (props) => {
         actionRef={actionRef}
       />
     </PageHeaderWrapper>
-  )
-}
+  );
+};