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

config/defaultSettings.js

@@ -10,6 +10,6 @@ const Settings = {
   title: 'Ant Design Pro',
   pwa: false,
   logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
-  iconfontUrl: '',
+  // iconfontUrl: '//at.alicdn.com/t/font_3221810_t3g0tvsigf.js',
 };
 export default Settings;

config/routes.js

@@ -45,7 +45,7 @@ export default [
   {
     path: '/PlatformMessageManagement',
     name: '消息管理',
-    icon: 'crown',
+    icon: 'MailOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
@@ -66,7 +66,7 @@ export default [
   {
     path: '/Machinery',
     name: '农机管理',
-    icon: 'InsertRowLeftOutlined',
+    icon: 'CarOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
@@ -96,7 +96,7 @@ export default [
   {
     path: '/MonitoringScreen',
     name: '农机监控大屏',
-    icon: 'InsertRowLeftOutlined',
+    icon: 'DesktopOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
@@ -128,7 +128,7 @@ export default [
   {
     path: '/OrderManage',
     name: '订单调度',
-    icon: 'InsertRowLeftOutlined',
+    icon: 'PhoneOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
@@ -141,7 +141,7 @@ export default [
   {
     path: '/JobWarning',
     name: '作业预警',
-    icon: 'InsertRowLeftOutlined',
+    icon: 'AlertOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
@@ -154,7 +154,7 @@ export default [
   {
     path: '/JobStatistics',
     name: '作业统计',
-    icon: 'InsertRowLeftOutlined',
+    icon: 'ScheduleOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
@@ -177,7 +177,7 @@ export default [
   {
     path: '/Finance',
     name: '财务管理',
-    icon: 'InsertRowLeftOutlined',
+    icon: 'DollarOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
@@ -192,10 +192,29 @@ export default [
       },
     ],
   },
+  {
+    path: '/GPSDevice',
+    name: 'GPS设备管理',
+    icon: 'CompassOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/GPSDevice/GPS',
+        name: 'GPS管理',
+        component: './GPSDevice/GPS',
+      },
+      {
+        path: '/GPSDevice/GPS/GPSEdit',
+        name: '新增设备',
+        component: './GPSDevice/GPS/GPSEdit',
+        hideInMenu: true
+      },
+    ],
+  },
   {
     path: '/SystemManagement',
     name: '系统管理',
-    icon: 'crown',
+    icon: 'SettingOutlined',
     component: '../layouts/BasicLayout',
     routes: [
       {
@@ -235,6 +254,48 @@ export default [
       },
     ],
   },
+  {
+    path: '/ContentManagementSystem',
+    name: 'CMS管理',
+    icon: 'MediumOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/ContentManagementSystem/InformationClassification',
+        name: '资讯分类',
+        component: './ContentManagementSystem/InformationClassification',
+      },
+      {
+        path: '/ContentManagementSystem/InformationClassification/InformationClassificationEdit',
+        name: '资讯分类编辑',
+        component: './ContentManagementSystem/InformationClassification/InformationClassificationEdit',
+        hideInMenu: true
+      },
+      {
+        path: '/ContentManagementSystem/InformationList',
+        name: '资讯列表',
+        component: './ContentManagementSystem/InformationList',
+      },
+      {
+        path: '/ContentManagementSystem/InformationList/InformationListEdit',
+        name: '资讯列表编辑',
+        component: './ContentManagementSystem/InformationList/InformationListEdit',
+        hideInMenu: true
+
+      },
+      {
+        path: '/ContentManagementSystem/BannerClassification',
+        name: 'Banner资讯',
+        component: './ContentManagementSystem/BannerClassification',
+      }, {
+        path: '/ContentManagementSystem/BannerClassification/BannerClassificationEdit',
+        name: 'Banner资讯编辑',
+        component: './ContentManagementSystem/BannerClassification/BannerClassificationEdit',
+        hideInMenu: true
+
+      },
+    ],
+  },
   {
     path: '/',
     redirect: '/welcome',

src/components/Footer/index.jsx

@@ -6,32 +6,32 @@ const Footer = () => {
   const intl = useIntl();
   const defaultMessage = intl.formatMessage({
     id: 'app.copyright.produced',
-    defaultMessage: '蚂蚁集团体验技术部出品',
+    defaultMessage: '云致科技',
   });
   const currentYear = new Date().getFullYear();
   return (
     <DefaultFooter
       copyright={`${currentYear} ${defaultMessage}`}
-      links={[
-        {
-          key: 'Ant Design Pro',
-          title: 'Ant Design Pro',
-          href: 'https://pro.ant.design',
-          blankTarget: true,
-        },
-        {
-          key: 'github',
-          title: <GithubOutlined />,
-          href: 'https://github.com/ant-design/ant-design-pro',
-          blankTarget: true,
-        },
-        {
-          key: 'Ant Design',
-          title: 'Ant Design',
-          href: 'https://ant.design',
-          blankTarget: true,
-        },
-      ]}
+    // links={[
+    //   {
+    //     key: 'Ant Design Pro',
+    //     title: 'Ant Design Pro',
+    //     href: 'https://pro.ant.design',
+    //     blankTarget: true,
+    //   },
+    //   {
+    //     key: 'github',
+    //     title: <GithubOutlined />,
+    //     href: 'https://github.com/ant-design/ant-design-pro',
+    //     blankTarget: true,
+    //   },
+    //   {
+    //     key: 'Ant Design',
+    //     title: 'Ant Design',
+    //     href: 'https://ant.design',
+    //     blankTarget: true,
+    //   },
+    // ]}
     />
   );
 };

src/locales/bn-BD.js

@@ -10,7 +10,7 @@ export default {
   'layout.user.link.help': 'সহায়তা',
   'layout.user.link.privacy': 'গোপনীয়তা',
   'layout.user.link.terms': 'শর্তাদি',
-  'app.copyright.produced': 'প্রযোজনা করেছেন অ্যান্ট ফিনান্সিয়াল এক্সপেরিয়েন্স ডিপার্টমেন্ট',
+  'app.copyright.produced': 'YunZhiKeJi',
   'app.preview.down.block': 'আপনার স্থানীয় প্রকল্পে এই পৃষ্ঠাটি ডাউনলোড করুন',
   'app.welcome.link.fetch-blocks': 'সমস্ত ব্লক পান',
   'app.welcome.link.block-list':

src/locales/en-US.js

@@ -10,7 +10,7 @@ export default {
   'layout.user.link.help': 'Help',
   'layout.user.link.privacy': 'Privacy',
   'layout.user.link.terms': 'Terms',
-  'app.copyright.produced': 'Produced by Ant Financial Experience Department',
+  'app.copyright.produced': 'YunZhiKeJi',
   'app.preview.down.block': 'Download this page to your local project',
   'app.welcome.link.fetch-blocks': 'Get all block',
   'app.welcome.link.block-list': 'Quickly build standard, pages based on `block` development',

src/locales/zh-CN.js

@@ -10,7 +10,7 @@ export default {
   'layout.user.link.help': '帮助',
   'layout.user.link.privacy': '隐私',
   'layout.user.link.terms': '条款',
-  'app.copyright.produced': '蚂蚁集团体验技术部出品',
+  'app.copyright.produced': '云致科技',
   'app.preview.down.block': '下载此页面到本地项目',
   'app.welcome.link.fetch-blocks': '获取全部区块',
   'app.welcome.link.block-list': '基于 block 开发，快速构建标准页面',

src/pages/ContentManagementSystem/BannerClassification/BannerClassificationEdit/index.jsx

@@ -0,0 +1,56 @@
+import { Input, Card, Select, Button, message, Upload, Modal } from "antd"
+import { useEffect, useState } from 'react'
+import { Form } from "antd";
+import { history } from 'umi';
+import ProCard from '@ant-design/pro-card'
+import { UploadOutlined } from '@ant-design/icons';
+
+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 => {
+    message.success(`成功成功成功`);
+    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="Banner图集" name="user" rules={[{ required: true, message: '请选择' }]}>
+              <Upload {...props}>
+                <Button icon={<UploadOutlined />}>Upload</Button>
+              </Upload>
+            </FormItem>
+            <FormItem label="资讯分类名称" name="shopName" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="资讯内容" name="s1hopName" 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/ContentManagementSystem/BannerClassification/index.jsx

@@ -0,0 +1,133 @@
+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';
+
+
+export default (props) => {
+  const dataSource = [
+    {
+      id: 9,
+      key: '1',
+      name: '胡彦斌',
+      age: 32,
+      zz: '西湖区湖底公园1号',
+    },
+
+  ];
+
+
+  // 测试内容👆-------------------------
+
+  const actionRef = useRef();
+  const gotoDetail = (id) => {
+    history.push(`BannerClassification/BannerClassificationEdit`)
+  }
+
+
+  const handleDelete = (e) => {
+    deleteNote(e.noteId).then(res => {
+      message.success('删除成功');
+      actionRef.current.reload();
+    })
+  }
+
+  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: 'Banner图片',
+      key: 'zz',
+      dataIndex: 'zz',
+      search: false,
+      render: (t) => <img width={110} src={t} alt="" />,
+
+    },
+    {
+      title: '资讯详情',
+      dataIndex: 'name',
+      key: 'name',
+      search: false,
+    },
+    {
+      title: '发布状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: (t, record) => record.noteType === 1 ? '已发布' : '未发布',
+      valueEnum: {
+        online: { text: '已发布', status: 'Success' },
+        error: { text: '未发布', status: 'Error' },
+      }
+    },
+
+    {
+      title: (
+        <>
+          创建时间
+          <Tooltip placement="top">
+            <QuestionCircleOutlined style={{ marginLeft: 4 }} />
+          </Tooltip>
+        </>
+      ),
+      // hideInTable: true,
+      search: false,
+
+      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) => [
+        <Link key={2} to={`BannerClassification/BannerClassificationEdit`}>编辑</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"
+        search={false}
+        options={false}
+        toolBarRender={actions}
+        actionRef={actionRef}
+      />
+    </PageHeaderWrapper>
+  )
+}

src/pages/ContentManagementSystem/InformationClassification/InformationClassificationEdit/index.jsx

@@ -0,0 +1,57 @@
+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="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="shopName" 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/ContentManagementSystem/InformationClassification/index.jsx

@@ -0,0 +1,122 @@
+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';
+
+
+export default (props) => {
+  const dataSource = [
+    {
+      id: 9,
+      key: '1',
+      name: '胡彦斌',
+      age: 32,
+      zz: '西湖区湖底公园1号',
+    },
+
+  ];
+
+
+  // 测试内容👆-------------------------
+
+  const actionRef = useRef();
+  const gotoDetail = (id) => {
+    history.push(`InformationClassification/InformationClassificationEdit`)
+  }
+
+
+  const handleDelete = (e) => {
+    deleteNote(e.noteId).then(res => {
+      message.success('删除成功');
+      actionRef.current.reload();
+    })
+  }
+
+  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',
+      search: false,
+
+    },
+    {
+      title: '资讯分类名称',
+      dataIndex: 'name',
+      key: 'name',
+      search: false,
+    },
+
+    {
+      title: (
+        <>
+          创建时间
+          <Tooltip placement="top">
+            <QuestionCircleOutlined style={{ marginLeft: 4 }} />
+          </Tooltip>
+        </>
+      ),
+      // hideInTable: true,
+      search: false,
+
+      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) => [
+        <Link key={2} to={`InformationClassification/InformationClassificationEdit`}>编辑</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"
+        search={false}
+        options={false}
+        toolBarRender={actions}
+        actionRef={actionRef}
+      />
+    </PageHeaderWrapper>
+  )
+}

src/pages/ContentManagementSystem/InformationList/InformationListEdit/index.jsx

@@ -0,0 +1,70 @@
+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="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="shopName" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="资讯内容" name="shaopName" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="发布状态" name="usser" rules={[{ required: true, message: '请选择' }]}>
+              <Select
+                placeholder="请选择"
+                // onChange={onGenderChange}
+                allowClear
+                style={{ width: '350px' }}
+              >
+                <Option value="nongji">发布</Option>
+                <Option value="nonghu">未发布</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/ContentManagementSystem/InformationList/index.jsx

@@ -0,0 +1,136 @@
+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';
+
+
+export default (props) => {
+  const dataSource = [
+    {
+      id: 9,
+      key: '1',
+      name: '胡彦斌',
+      age: 32,
+      zz: '西湖区湖底公园1号',
+    },
+
+  ];
+
+
+  // 测试内容👆-------------------------
+
+  const actionRef = useRef();
+  const gotoDetail = (id) => {
+    history.push(`InformationList/InformationListEdit`)
+  }
+
+
+  const handleDelete = (e) => {
+    deleteNote(e.noteId).then(res => {
+      message.success('删除成功');
+      actionRef.current.reload();
+    })
+  }
+
+  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',
+      search: false,
+
+    },
+    {
+      title: '资讯名称',
+      dataIndex: 'name',
+      key: 'name',
+      search: false,
+    }, {
+      title: '资讯内容',
+      dataIndex: 'name',
+      key: 'name',
+      search: false,
+    },
+    {
+      title: (
+        <>
+          创建时间
+          <Tooltip placement="top">
+            <QuestionCircleOutlined style={{ marginLeft: 4 }} />
+          </Tooltip>
+        </>
+      ),
+      // hideInTable: true,
+      search: false,
+      key: 'createdAt',
+      dataIndex: 'createdAt',
+      valueType: 'date',
+      // render: (t) => formatterTime(t),
+      sorter: (a, b) => a.createdAt - b.createdAt,//时间排序
+    },
+    {
+      title: '发布状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: (t, record) => record.noteType === 1 ? '已发布' : '未发布',
+      valueEnum: {
+        online: { text: '已发布', status: 'Success' },
+        error: { text: '未发布', status: 'Error' },
+      }
+    },
+
+    {
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      ellipsis: true,
+      width: 200,
+      render: (_, record) => [
+        <Link key={2} to={`InformationList/InformationListEdit`}>编辑</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"
+        search={false}
+        options={false}
+        toolBarRender={actions}
+        actionRef={actionRef}
+      />
+    </PageHeaderWrapper>
+  )
+}

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

@@ -0,0 +1,49 @@
+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="设备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

@@ -0,0 +1,111 @@
+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';
+
+
+export default (props) => {
+  const dataSource = [
+    {
+      id: 9,
+      key: '1',
+      name: '胡彦斌',
+      age: 32,
+      zz: '西湖区湖底公园1号',
+    },
+
+  ];
+
+
+  // 测试内容👆-------------------------
+
+  const actionRef = useRef();
+  const gotoDetail = (id) => {
+    history.push(`./GPS/GPSEdit`)
+  }
+
+
+  const handleDelete = (e) => {
+    deleteNote(e.noteId).then(res => {
+      message.success('删除成功');
+      actionRef.current.reload();
+    })
+  }
+
+  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: 'ID',
+      key: 'zz',
+      dataIndex: 'zz',
+    },
+    {
+      title: '设备号',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: (t, record) => record.noteType === 1 ? '已启用' : '已禁用',
+      valueEnum: {
+        online: { text: '已启用', status: 'Success' },
+        error: { text: '已禁用', status: 'Error' },
+      }
+    },
+
+
+    {
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      ellipsis: true,
+      width: 200,
+      render: (_, record) => [
+        <Link key={2} to={`./GPS/GPSEdit`}>编辑</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/SystemManagement/Administrator/index.jsx

@@ -87,7 +87,6 @@ export default (props) => {
       dataIndex: 'status',
       key: 'status',
       render: (t, record) => record.noteType === 1 ? '已启用' : '已禁用',
-      initialValue: 'Success',
       valueEnum: {
         online: { text: '已启用', status: 'Success' },
         error: { text: '已禁用', status: 'Error' },