.

config/routes.js

@@ -47,14 +47,7 @@ export default [
     name: '数据大屏',
     icon: 'DesktopOutlined',
     component: './MonitoringScreen',
-    routes: [
-      {
-        path: '/MonitoringScreen/detail.jsx',
-        name: '农机轨迹',
-        component: './MonitoringScreen/detail.jsx',
-        hideInMenu: true,
-      },
-    ],
+    access: 'screen',
   },
   {
     path: '/ContentManagementSystem',
@@ -96,6 +89,17 @@ export default [
         component: './ContentManagementSystem/BannerClassification/BannerClassificationEdit',
         hideInMenu: true,
       },
+      {
+        path: '/ContentManagementSystem/Advertisement',
+        name: '广告位管理',
+        component: './ContentManagementSystem/Advertisement',
+      },
+      {
+        path: '/ContentManagementSystem/Advertisement/edit.jsx',
+        name: '广告位编辑',
+        component: './ContentManagementSystem/Advertisement/edit.jsx',
+        hideInMenu: true,
+      },
     ],
   },
   {
@@ -131,31 +135,10 @@ export default [
         component: './Machinery/Machinery/edit.jsx',
         hideInMenu: true,
       },
-    ],
-  },
-  {
-    path: '/MachineryStatistics',
-    name: '农机统计',
-    icon: 'CompassOutlined',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/MachineryStatistics',
-        name: '农机统计',
-        component: './MachineryStatistics',
-      },
-    ],
-  },
-  {
-    path: '/MachineryGIS',
-    name: '农机GIS',
-    icon: 'InsertRowLeftOutlined',
-    component: '../layouts/BasicLayout',
-    routes: [
       {
-        path: '/MachineryGIS/index.jsx',
+        path: '/Machinery/GIS',
         name: '农机GIS',
-        component: './MachineryGIS',
+        component: './Machinery/GIS',
       },
     ],
   },

src/pages/ContentManagementSystem/Advertisement/edit.jsx

@@ -0,0 +1,73 @@
+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 { UploadImage } from '@/components/Upload';
+import ExtendContent from '@/components/ExtendContent';
+
+const { Option } = Select;
+const goBack = () => {
+  history.goBack();
+};
+const FormItem = Form.Item;
+export default (props) => {
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+  const [image, setImage] = useState();
+
+  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="名称" name="title" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="图片" name="thumb" rules={[{ required: true, message: '请选择' }]}>
+              <UploadImage value={image} onChange={setImage} />
+            </FormItem>
+            <FormItem label="位置" name="position" rules={[{ required: true, message: '请选择' }]}>
+              <Select>
+                <Option value="index">首次引导页</Option>
+                <Option value="index">app启动页</Option>
+                <Option value="banner">banner</Option>
+              </Select>
+            </FormItem>
+            <FormItem label="详细信息" colon={false}>
+              <ExtendContent
+                targetType="tourist"
+                targetId={'66'}
+                onCancel={() => history.goBack()}
+              />
+            </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/Advertisement/index.jsx

@@ -0,0 +1,141 @@
+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号',
+      status: 1,
+    },
+  ];
+
+  // 测试内容👆-------------------------
+
+  const actionRef = useRef();
+  const gotoDetail = (id) => {
+    history.push(`Advertisement/edit.jsx`);
+  };
+
+  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: 'title',
+      dataIndex: 'title',
+      search: false,
+    },
+    {
+      title: '图片',
+      key: 'thumb',
+      dataIndex: 'thumb',
+      search: false,
+      render: (t) => <img width={110} src={t} alt="" />,
+    },
+    {
+      title: '位置',
+      key: 'position',
+      dataIndex: 'position',
+      search: false,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      // initialValue: 'all',
+      key: 'status',
+      valueEnum: {
+        0: { text: '已发布', status: 'Success' },
+        1: { 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={`Advertisement/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"
+        search={false}
+        options={false}
+        toolBarRender={actions}
+        actionRef={actionRef}
+      />
+    </PageHeaderWrapper>
+  );
+};

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

@@ -40,8 +40,9 @@ export default (props) => {
             </FormItem>
             <FormItem label="位置" name="position" rules={[{ required: true, message: '请选择' }]}>
               <Select>
-                <Option value="index">首屏</Option>
-                <Option value="banner">banner页面</Option>
+                <Option value="index">首次引导页</Option>
+                <Option value="index">app启动页</Option>
+                <Option value="banner">banner</Option>
               </Select>
             </FormItem>
             <FormItem label="详细信息" colon={false}>

src/pages/MachineryStatistics/index.jsx

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