git

config/routes.js

@@ -192,6 +192,25 @@ 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: '系统管理',

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

@@ -31,7 +31,7 @@ export default (props) => {
     <Card >
       <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}
       >
-        <ProCard.TabPane key={1} tab="人员管理">
+        <ProCard.TabPane key={1} tab="资讯管理">
           <Form {...formItemLayout} onFinish={Submit} form={form} >
             <FormItem label="Banner图集" name="user" rules={[{ required: true, message: '请选择' }]}>
               <Upload {...props}>

src/pages/ContentManagementSystem/BannerClassification/index.jsx

@@ -71,7 +71,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' },

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

@@ -29,7 +29,7 @@ export default (props) => {
     <Card >
       <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}
       >
-        <ProCard.TabPane key={1} tab="人员管理">
+        <ProCard.TabPane key={1} tab="资讯管理">
           <Form {...formItemLayout} onFinish={Submit} form={form} >
             <FormItem label="资讯分类" name="user" rules={[{ required: true, message: '请选择' }]}>
               <Select

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

@@ -27,9 +27,8 @@ export default (props) => {
 
   return (
     <Card >
-      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}
-      >
-        <ProCard.TabPane key={1} tab="人员管理">
+      <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

src/pages/ContentManagementSystem/InformationList/index.jsx

@@ -92,7 +92,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' },

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' },