Merge branch 'master' of http://git.ycjcjy.com/medical-plat/pc-admin

config/routes.js

@@ -65,18 +65,32 @@ export default [
                 component: '../layouts/BlankLayout',
                 routes: [
                   {
-                    path: '/cms/banner',
+                    path: '/cms/banner/list',
                     name: 'Banner管理',
                     menuCode: 'cms.banner',
-                    component: '../layouts/BlankLayout',
+                    component: './Cms/Banner/List',
                   },
                   {
-                    path: '/cms/hot',
+                    path: '/cms/banner/edit',
+                    name: 'Banner编辑',
+                    menuCode: 'cms.banner',
+                    component: './Cms/Banner/Edit',
+                    hideInMenu: true,
+                  },
+                  {
+                    path: '/cms/hot/list',
                     name: '热门管理',
                     menuCode: 'cms.hot',
-                    component: '../layouts/BlankLayout',
+                    component: './Cms/Hot/List',
                   },
-                ]
+                  {
+                    path: '/cms/hot/edit',
+                    name: 'Banner编辑',
+                    menuCode: 'cms.hot',
+                    component: './Cms/Hot/Edit',
+                    hideInMenu: true,
+                  },
+                ],
               },
               {
                 path: '/post',
@@ -98,7 +112,7 @@ export default [
                     component: './Post/Edit',
                     hideInMenu: true,
                   },
-                ]
+                ],
               },
               {
                 path: '/student',
@@ -111,9 +125,22 @@ export default [
                     path: '/student/student',
                     name: '学生管理',
                     menuCode: 'student.student',
-                    component: '../layouts/BlankLayout',
+                    component: './Student/Student/List',
                   },
-                ]
+                  {
+                    path: '/student/school',
+                    name: '学校管理',
+                    menuCode: 'student.student',
+                    component: './Student/School/List',
+                  },
+                  {
+                    path: '/student/school/edit',
+                    name: '学校编辑',
+                    menuCode: 'student.student',
+                    hideInMenu: true,
+                    component: './Student/School/Edit',
+                  },
+                ],
               },
               {
                 path: '/medical',
@@ -134,7 +161,7 @@ export default [
                     menuCode: 'medical.test',
                     component: '../layouts/BlankLayout',
                   },
-                ]
+                ],
               },
               {
                 path: '/report',
@@ -155,7 +182,7 @@ export default [
                     menuCode: 'report.student',
                     component: '../layouts/BlankLayout',
                   },
-                ]
+                ],
               },
               {
                 path: '/system',
@@ -194,7 +221,7 @@ export default [
                     menuCode: 'system.clinic',
                     component: '../layouts/BlankLayout',
                   },
-                ]
+                ],
               },
               {
                 component: './404',

package.json

@@ -52,6 +52,7 @@
     "@umijs/route-utils": "^1.0.33",
     "ali-oss": "^6.15.2",
     "antd": "^4.12.0",
+    "array-move": "^3.0.1",
     "classnames": "^2.2.6",
     "lodash": "^4.17.11",
     "md5": "^2.3.0",
@@ -62,6 +63,7 @@
     "react-dom": "^17.0.0",
     "react-helmet-async": "^1.0.4",
     "react-player": "^2.9.0",
+    "react-sortable-hoc": "^2.0.0",
     "umi": "^3.4.1",
     "umi-request": "^1.0.8",
     "wangeditor": "^4.6.15"

src/common/constants.js

@@ -0,0 +1,6 @@
+const stateOptions = {
+  0: { text: '未上架' },
+  1: { text: '已上架' },
+};
+
+export { stateOptions };

src/pages/Cms/Banner/Edit/index.jsx

@@ -0,0 +1,133 @@
+import React, { useEffect, useState } from 'react';
+import { connect, history } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import Container from '@/components/Container';
+import request from '@/utils/request';
+
+import ProForm, { ProFormText, ProFormSelect } from '@ant-design/pro-form';
+import UploadImage from '@/components/UploadImage';
+import { notification, Form } from 'antd';
+
+const BannerEdit = (props) => {
+  const { id } = props.location.query;
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  //   const [bannerData, setBannerData] = useState({});
+
+  useEffect(() => {
+    if (id) {
+      setLoading(true);
+      request(`/banner/${id}`)
+        .then((res) => {
+          form.setFieldsValue(res);
+          //   setBannerData(res);
+          //   set
+          setLoading(false);
+        })
+        .catch((e) => {
+          setLoading(false);
+          notification.error({ message: e.message });
+        });
+    }
+  }, [form, id]);
+
+  const handleSubmit = (values) => {
+    console.log(values, form.getFieldsValue(), 'handleSubmit');
+    if (!id) {
+      setLoading(true);
+      return request('/banner', { method: 'post', data: values })
+        .then(() => {
+          // props.onChange(res)
+          // form.setFieldsValue(res)
+          notification.info({ message: '添加成功' });
+          setLoading(false);
+          history.go('-1');
+        })
+        .catch((e) => {
+          notification.error({ message: e.message });
+          setLoading(false);
+          return Promise.reject(e.message);
+        });
+    }
+    setLoading(true);
+    return request(`/banner/${id}`, { method: 'put', data: { serialNo: id, ...values } })
+      .then(() => {
+        // props.onChange(res)
+        // form.setFieldsValue(res)
+        notification.info({ message: '修改成功' });
+        setLoading(false);
+        history.go('-1');
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+        setLoading(false);
+        return Promise.reject(e.message);
+      });
+  };
+
+  return (
+    <PageContainer>
+      <Container loading={loading}>
+        <ProForm form={form} onFinish={handleSubmit}>
+          <Form.Item
+            name="image"
+            label="图片"
+            placeholder="请选择图片"
+            extra="支持jpg/png文件，且不超过500kb"
+            rules={[{ required: true, message: '请上传图片' }]}
+          >
+            <UploadImage />
+          </Form.Item>
+
+          <ProFormText
+            label="标题"
+            placeholder="输入标题"
+            name="title"
+            rules={[{ required: true, message: '请填写标题' }]}
+          />
+
+          <ProFormSelect
+            label="板块"
+            placeholder="请选择板块"
+            initialValue={'post'}
+            name="targetType"
+            options={[
+              {
+                value: 'post',
+                label: '科普',
+              },
+            ]}
+            rules={[{ required: true, message: '请选择板块' }]}
+          />
+
+          <ProFormSelect
+            label="链接文章"
+            placeholder="请选择链接文章"
+            name="targetId"
+            showSearch
+            request={async ({ keyWords }) => {
+              // console.log()
+              // if (keyWords) {
+              return request('/post', {
+                method: 'get',
+                params: { name: keyWords, pageNum: 1, pageSize: 1000 },
+              })
+                .then((res) => {
+                  return res?.records?.map((x) => {
+                    return { label: x.name, value: x.postId };
+                  });
+                })
+                .catch((e) => {
+                  notification.error({ message: e.message });
+                  return Promise.reject(e.message);
+                });
+              // }
+            }}
+          />
+        </ProForm>
+      </Container>
+    </PageContainer>
+  );
+};
+
+export default connect(() => ({}))(BannerEdit);

src/pages/Cms/Banner/List/index.jsx

@@ -0,0 +1,173 @@
+import React, { useRef, useCallback, useState } from 'react';
+import { connect, history } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@ant-design/pro-table';
+import { PlusOutlined, MenuOutlined } from '@ant-design/icons';
+import { Button, Popconfirm, Image, Space, notification } from 'antd';
+import { sortableContainer, sortableElement, sortableHandle } from 'react-sortable-hoc';
+import request, { queryTable } from '@/utils/request';
+import arrayMove from 'array-move';
+
+const DragHandle = sortableHandle(() => <MenuOutlined style={{ cursor: 'grab', color: '#999' }} />);
+
+const SortableItem = sortableElement((props) => <tr {...props} />);
+const SortableContainer = sortableContainer((props) => <tbody {...props} />);
+
+const typeList = { post: '科普' };
+// const stateList = { post: '科普' };
+
+const BannerList = () => {
+  const [, setLoading] = useState(false);
+  const [dataSource, setDataSource] = useState([]);
+  const ref = useRef();
+  const handleBannerClick = useCallback((id) => {
+    history.push(id ? `/cms/banner/edit?id=${id}` : '/cms/banner/edit');
+  }, []);
+
+  const actions = [
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => handleBannerClick()}>
+      新建
+    </Button>,
+  ];
+
+  const deleteBannerClick = (id) => {
+    setLoading(true);
+    console.log(ref, 'ref');
+
+    request(`/banner/${id}`, { method: 'delete' })
+      .then(() => {
+        notification.success({ message: '删除成功' });
+        ref.current.submit();
+      })
+      .catch((e) => {
+        setLoading(false);
+        notification.error({ message: e.message });
+      });
+  };
+
+  const columns = [
+    {
+      title: '排序',
+      dataIndex: 'sort',
+      width: 60,
+      className: 'drag-visible',
+      hideInSearch: true,
+      align: 'center',
+      render: () => <DragHandle />,
+    },
+    {
+      title: '主图',
+      dataIndex: 'image',
+      hideInSearch: true,
+
+      align: 'center',
+      render: (text) => <Image width={64} height={64} src={text} />,
+    },
+    {
+      title: '名称',
+      dataIndex: 'title',
+      align: 'center',
+      className: 'drag-visible',
+    },
+    {
+      title: '板块',
+      dataIndex: 'targetType',
+      hideInSearch: true,
+      align: 'center',
+      render: (text) => typeList[text] || '',
+    },
+
+    {
+      title: '状态',
+      dataIndex: 'status',
+      align: 'center',
+      hideInSearch: true,
+      // render: (text) => <Image src={text} />,
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      align: 'center',
+      hideInSearch: true,
+      render: (text, record) => (
+        <Space size="middle">
+          <a onClick={() => handleBannerClick(record.serialNo)}>编辑</a>
+          <Popconfirm
+            key="popconfirm"
+            title={`确认删除吗?`}
+            onConfirm={() => deleteBannerClick(record.serialNo)}
+            okText="是"
+            cancelText="否"
+          >
+            <a>删除</a>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  const onSortEnd = ({ oldIndex, newIndex }) => {
+    // const { dataSource } = this.state;
+    console.log('Sorted items: ', dataSource, oldIndex, newIndex);
+    if (oldIndex !== newIndex) {
+      const newData = arrayMove([].concat(dataSource), oldIndex, newIndex).filter((el) => !!el);
+      console.log('Sorted items: ', newData);
+      //   this.setState({ dataSource: newData });
+      setDataSource(newData);
+    }
+  };
+
+  const DraggableContainer = (props) => (
+    <SortableContainer
+      useDragHandle
+      disableAutoscroll
+      helperClass="row-dragging"
+      onSortEnd={onSortEnd}
+      {...props}
+    />
+  );
+
+  const DraggableBodyRow = ({ className, style, ...restProps }) => {
+    // const { dataSource } = this.state;
+    // function findIndex base on Table rowKey props and should always be a right array index
+    console.log(restProps, dataSource, 'restProps');
+    const index = dataSource?.findIndex((x) => x.serialNo === restProps['data-row-key']);
+    return <SortableItem index={index} {...restProps} />;
+  };
+
+  const getData = (params, sort, filter) => {
+    return queryTable('/banner')(params, sort, filter).then((res) => {
+      console.log(res, 'getData');
+      setDataSource(res.data);
+      return res;
+    });
+  };
+
+  return (
+    <PageContainer>
+      <ProTable
+        columns={columns}
+        dataSource={dataSource}
+        request={getData}
+        postData={(data) => data}
+        formRef={ref}
+        rowKey="serialNo"
+        headerTitle="科普列表"
+        search={{
+          labelWidth: '4em',
+        }}
+        components={{
+          body: {
+            wrapper: DraggableContainer,
+            row: DraggableBodyRow,
+          },
+        }}
+        toolBarRender={() => actions}
+      />
+    </PageContainer>
+  );
+};
+
+export default connect((s) => ({
+  typeList: s.post.typeList,
+}))(BannerList);

src/pages/Cms/Banner/model.js

@@ -0,0 +1,18 @@
+// import { message } from 'antd';
+// import request from '@/utils/request';
+
+// const Model = {
+//   namespace: 'banner',
+//   state: {
+//     data:{}
+//   },
+//   effects: {
+
+//   },
+
+//   reducers: {
+
+//   },
+// };
+
+// export default Model;

src/pages/Cms/Hot/Edit/index.jsx

@@ -0,0 +1,141 @@
+import React, { useEffect, useState } from 'react';
+import { connect, history } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import Container from '@/components/Container';
+import request from '@/utils/request';
+
+import ProForm, { ProFormSelect } from '@ant-design/pro-form';
+import UploadImage from '@/components/UploadImage';
+import { notification, Form } from 'antd';
+
+const HotEdit = (props) => {
+  const { id } = props.location.query;
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  //   const [bannerData, setBannerData] = useState({});
+
+  useEffect(() => {
+    if (id) {
+      setLoading(true);
+      request(`/topic/${id}`)
+        .then((res) => {
+          form.setFieldsValue(res);
+          //   setBannerData(res);
+          //   set
+          setLoading(false);
+        })
+        .catch((e) => {
+          setLoading(false);
+          notification.error({ message: e.message });
+        });
+    }
+  }, [form, id]);
+
+  const handleSubmit = (values) => {
+    console.log(values, form.getFieldsValue(), 'handleSubmit');
+    if (!id) {
+      setLoading(true);
+      return request('/topic', { method: 'post', data: values })
+        .then(() => {
+          // props.onChange(res)
+          // form.setFieldsValue(res)
+          notification.info({ message: '添加成功' });
+          setLoading(false);
+          history.go('-1');
+        })
+        .catch((e) => {
+          notification.error({ message: e.message });
+          setLoading(false);
+          return Promise.reject(e.message);
+        });
+    }
+    setLoading(true);
+    return request(`/topic/${id}`, { method: 'put', data: { serialNo: id, ...values } })
+      .then(() => {
+        // props.onChange(res)
+        // form.setFieldsValue(res)
+        notification.info({ message: '修改成功' });
+        setLoading(false);
+        history.go('-1');
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+        setLoading(false);
+        return Promise.reject(e.message);
+      });
+  };
+
+  return (
+    <PageContainer>
+      <Container loading={loading}>
+        <ProForm form={form} onFinish={handleSubmit}>
+          <Form.Item
+            name="poster"
+            label="图片"
+            placeholder="请选择图片"
+            extra="支持jpg/png文件，且不超过500kb"
+            rules={[{ required: true, message: '请上传图片' }]}
+          >
+            <UploadImage />
+          </Form.Item>
+
+          <ProFormSelect
+            label="类型"
+            placeholder="请选择类型"
+            initialValue={'post'}
+            name="targetType"
+            options={[
+              {
+                value: 'post',
+                label: '科普',
+              },
+            ]}
+            rules={[{ required: true, message: '请选择板块' }]}
+          />
+
+          <ProFormSelect
+            label="科普知识"
+            placeholder="请选择科普知识"
+            name="targetId"
+            showSearch
+            request={async ({ keyWords }) => {
+              // console.log()
+              // if (keyWords) {
+              return request('/post', {
+                method: 'get',
+                params: { name: keyWords, pageNum: 1, pageSize: 1000 },
+              })
+                .then((res) => {
+                  return res?.records?.map((x) => {
+                    return { label: x.name, value: x.postId };
+                  });
+                })
+                .catch((e) => {
+                  notification.error({ message: e.message });
+                  return Promise.reject(e.message);
+                });
+              // }
+            }}
+          />
+
+          {/* <Select
+        showSearch
+        value={this.state.value}
+        placeholder={this.props.placeholder}
+        style={this.props.style}
+        defaultActiveFirstOption={false}
+        showArrow={false}
+        filterOption={false}
+        onSearch={this.handleSearch}
+        onChange={this.handleChange}
+        notFoundContent={null}
+      >
+        {options}
+      </Select> */}
+        </ProForm>
+      </Container>
+    </PageContainer>
+  );
+};
+
+export default connect(() => ({}))(HotEdit);

src/pages/Cms/Hot/List/index.jsx

@@ -0,0 +1,173 @@
+import React, { useRef, useCallback, useState } from 'react';
+import { connect, history } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@ant-design/pro-table';
+import { PlusOutlined, MenuOutlined } from '@ant-design/icons';
+import { Button, Popconfirm, Image, Space, notification } from 'antd';
+import { sortableContainer, sortableElement, sortableHandle } from 'react-sortable-hoc';
+import request, { queryTable } from '@/utils/request';
+import arrayMove from 'array-move';
+
+const DragHandle = sortableHandle(() => <MenuOutlined style={{ cursor: 'grab', color: '#999' }} />);
+
+const SortableItem = sortableElement((props) => <tr {...props} />);
+const SortableContainer = sortableContainer((props) => <tbody {...props} />);
+
+const typeList = { post: '科普' };
+// const stateList = { post: '科普' };
+
+const HotList = () => {
+  const [, setLoading] = useState(false);
+  const [dataSource, setDataSource] = useState([]);
+  const ref = useRef();
+  const handleHotClick = useCallback((id) => {
+    history.push(id ? `/cms/hot/edit?id=${id}` : '/cms/hot/edit');
+  }, []);
+
+  const actions = [
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => handleHotClick()}>
+      新建
+    </Button>,
+  ];
+
+  const deleteHotClick = (id) => {
+    setLoading(true);
+    console.log(ref, 'ref');
+
+    request(`/topic/${id}`, { method: 'delete' })
+      .then(() => {
+        notification.success({ message: '删除成功' });
+        ref.current.submit();
+      })
+      .catch((e) => {
+        setLoading(false);
+        notification.error({ message: e.message });
+      });
+  };
+
+  const columns = [
+    {
+      title: '排序',
+      dataIndex: 'sort',
+      width: 60,
+      className: 'drag-visible',
+      hideInSearch: true,
+      align: 'center',
+      render: () => <DragHandle />,
+    },
+    {
+      title: '主图',
+      dataIndex: 'poster',
+      hideInSearch: true,
+
+      align: 'center',
+      render: (text) => <Image width={64} height={64} src={text} />,
+    },
+    {
+      title: '文章标题',
+      dataIndex: 'title',
+      align: 'center',
+      className: 'drag-visible',
+    },
+    {
+      title: '板块',
+      dataIndex: 'targetType',
+      hideInSearch: true,
+      align: 'center',
+      render: (text) => typeList[text] || '',
+    },
+
+    {
+      title: '状态',
+      dataIndex: 'status',
+      align: 'center',
+      hideInSearch: true,
+      // render: (text) => <Image src={text} />,
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      align: 'center',
+      hideInSearch: true,
+      render: (text, record) => (
+        <Space size="middle">
+          <a onClick={() => handleHotClick(record.serialNo)}>编辑</a>
+          <Popconfirm
+            key="popconfirm"
+            title={`确认删除吗?`}
+            onConfirm={() => deleteHotClick(record.serialNo)}
+            okText="是"
+            cancelText="否"
+          >
+            <a>删除</a>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  const onSortEnd = ({ oldIndex, newIndex }) => {
+    // const { dataSource } = this.state;
+    console.log('Sorted items: ', dataSource, oldIndex, newIndex);
+    if (oldIndex !== newIndex) {
+      const newData = arrayMove([].concat(dataSource), oldIndex, newIndex).filter((el) => !!el);
+      console.log('Sorted items: ', newData);
+      //   this.setState({ dataSource: newData });
+      setDataSource(newData);
+    }
+  };
+
+  const DraggableContainer = (props) => (
+    <SortableContainer
+      useDragHandle
+      disableAutoscroll
+      helperClass="row-dragging"
+      onSortEnd={onSortEnd}
+      {...props}
+    />
+  );
+
+  const DraggableBodyRow = ({ className, style, ...restProps }) => {
+    // const { dataSource } = this.state;
+    // function findIndex base on Table rowKey props and should always be a right array index
+    console.log(restProps, dataSource, 'restProps');
+    const index = dataSource?.findIndex((x) => x.serialNo === restProps['data-row-key']);
+    return <SortableItem index={index} {...restProps} />;
+  };
+
+  const getData = (params, sort, filter) => {
+    return queryTable('/topic')(params, sort, filter).then((res) => {
+      console.log(res, 'getData');
+      setDataSource(res.data);
+      return res;
+    });
+  };
+
+  return (
+    <PageContainer>
+      <ProTable
+        columns={columns}
+        dataSource={dataSource}
+        request={getData}
+        postData={(data) => data}
+        formRef={ref}
+        rowKey="serialNo"
+        headerTitle="科普列表"
+        search={{
+          labelWidth: '4em',
+        }}
+        components={{
+          body: {
+            wrapper: DraggableContainer,
+            row: DraggableBodyRow,
+          },
+        }}
+        toolBarRender={() => actions}
+      />
+    </PageContainer>
+  );
+};
+
+export default connect((s) => ({
+  typeList: s.post.typeList,
+}))(HotList);

src/pages/Student/School/Edit/index.jsx

@@ -0,0 +1,101 @@
+import React, { useEffect, useState } from 'react';
+import { connect, history } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import Container from '@/components/Container';
+import request from '@/utils/request';
+
+import ProForm, { ProFormText, ProFormTextArea } from '@ant-design/pro-form';
+import UploadImage from '@/components/UploadImage';
+import { notification, Form } from 'antd';
+
+const SchoolEdit = (props) => {
+  const { id } = props.location.query;
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  //   const [bannerData, setBannerData] = useState({});
+
+  useEffect(() => {
+    if (id) {
+      setLoading(true);
+      request(`/school/${id}`)
+        .then((res) => {
+          form.setFieldsValue(res);
+          //   setBannerData(res);
+          //   set
+          setLoading(false);
+        })
+        .catch((e) => {
+          setLoading(false);
+          notification.error({ message: e.message });
+        });
+    }
+  }, [form, id]);
+
+  const handleSubmit = (values) => {
+    console.log(values, form.getFieldsValue(), 'handleSubmit');
+    if (!id) {
+      setLoading(true);
+      return request('/school', { method: 'post', data: values })
+        .then(() => {
+          // props.onChange(res)
+          // form.setFieldsValue(res)
+          notification.info({ message: '添加成功' });
+          setLoading(false);
+          history.go('-1');
+        })
+        .catch((e) => {
+          notification.error({ message: e.message });
+          setLoading(false);
+          return Promise.reject(e.message);
+        });
+    }
+    setLoading(true);
+    return request(`/school/${id}`, { method: 'put', data: { schoolId: id, ...values } })
+      .then(() => {
+        // props.onChange(res)
+        // form.setFieldsValue(res)
+        notification.info({ message: '修改成功' });
+        setLoading(false);
+        history.go('-1');
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+        setLoading(false);
+        return Promise.reject(e.message);
+      });
+  };
+
+  return (
+    <PageContainer>
+      <Container loading={loading}>
+        <ProForm form={form} onFinish={handleSubmit}>
+          <Form.Item
+            name="logo"
+            label="logo"
+            placeholder="请选择logo"
+            extra="支持jpg/png文件，且不超过500kb"
+            rules={[{ required: true, message: '请上传logo' }]}
+          >
+            <UploadImage />
+          </Form.Item>
+
+          <ProFormText
+            label="名称"
+            placeholder="输入名称"
+            name="name"
+            rules={[{ required: true, message: '请填写名称' }]}
+          />
+
+          <ProFormTextArea
+            label="简介"
+            placeholder="输入简介"
+            name="desc"
+            rules={[{ required: true, message: '请填写简介' }]}
+          />
+        </ProForm>
+      </Container>
+    </PageContainer>
+  );
+};
+
+export default connect(() => ({}))(SchoolEdit);

src/pages/Student/School/List/index.jsx

@@ -0,0 +1,122 @@
+import React, { useRef, useCallback, useState } from 'react';
+import { connect, history } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@ant-design/pro-table';
+import { PlusOutlined } from '@ant-design/icons';
+import { Button, Popconfirm, Image, Space, notification } from 'antd';
+import request, { queryTable } from '@/utils/request';
+
+// const stateList = { post: '科普' };
+
+const SchoolList = () => {
+  const [, setLoading] = useState(false);
+
+  const ref = useRef();
+  const handleSchoolClick = useCallback((id) => {
+    history.push(id ? `/student/school/edit?id=${id}` : '/student/school/edit');
+  }, []);
+
+  const actions = [
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => handleSchoolClick()}>
+      新建
+    </Button>,
+  ];
+
+  const deleteSchoolClick = (id) => {
+    setLoading(true);
+
+    request(`/school/${id}`, { method: 'delete' })
+      .then(() => {
+        notification.success({ message: '删除成功' });
+        ref.current.submit();
+      })
+      .catch((e) => {
+        setLoading(false);
+        notification.error({ message: e.message });
+      });
+  };
+
+  const columns = [
+    {
+      title: 'logo',
+      dataIndex: 'logo',
+      hideInSearch: true,
+
+      align: 'center',
+      render: (text) => <Image width={64} height={64} src={text} />,
+    },
+    {
+      title: '学校名称',
+      dataIndex: 'name',
+      align: 'center',
+    },
+
+    {
+      title: '简介',
+      dataIndex: 'desc',
+      align: 'center',
+      hideInSearch: true,
+      width: '25%',
+      ellipsis: true,
+      // render: (text) => <Image src={text} />,
+    },
+    {
+      title: '上架状态',
+      dataIndex: 'status',
+      align: 'center',
+      // hideInTable: true,
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '未上架' },
+        1: { text: '已上架' },
+      },
+    },
+    {
+      title: '上传时间',
+      dataIndex: 'createDate',
+      align: 'center',
+      hideInSearch: true,
+      valueType: 'date',
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      align: 'center',
+      hideInSearch: true,
+      render: (text, record) => (
+        <Space size="middle">
+          <a onClick={() => handleSchoolClick(record.schoolId)}>编辑</a>
+          <Popconfirm
+            key="popconfirm"
+            title={`确认删除吗?`}
+            onConfirm={() => deleteSchoolClick(record.schoolId)}
+            okText="是"
+            cancelText="否"
+          >
+            <a>删除</a>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        columns={columns}
+        request={queryTable('/school')}
+        formRef={ref}
+        rowKey="schoolId"
+        headerTitle="学校列表"
+        search={{
+          labelWidth: '4em',
+        }}
+        toolBarRender={() => actions}
+      />
+    </PageContainer>
+  );
+};
+
+export default connect((s) => ({
+  typeList: s.post.typeList,
+}))(SchoolList);

src/pages/Student/Student/Edit/index.jsx

@@ -0,0 +1,133 @@
+import React, { useEffect, useState } from 'react';
+import { connect, history } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import Container from '@/components/Container';
+import request from '@/utils/request';
+
+import ProForm, { ProFormText, ProFormSelect } from '@ant-design/pro-form';
+import UploadImage from '@/components/UploadImage';
+import { notification, Form } from 'antd';
+
+const BannerEdit = (props) => {
+  const { id } = props.location.query;
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  //   const [bannerData, setBannerData] = useState({});
+
+  useEffect(() => {
+    if (id) {
+      setLoading(true);
+      request(`/banner/${id}`)
+        .then((res) => {
+          form.setFieldsValue(res);
+          //   setBannerData(res);
+          //   set
+          setLoading(false);
+        })
+        .catch((e) => {
+          setLoading(false);
+          notification.error({ message: e.message });
+        });
+    }
+  }, [form, id]);
+
+  const handleSubmit = (values) => {
+    console.log(values, form.getFieldsValue(), 'handleSubmit');
+    if (!id) {
+      setLoading(true);
+      return request('/banner', { method: 'post', data: values })
+        .then(() => {
+          // props.onChange(res)
+          // form.setFieldsValue(res)
+          notification.info({ message: '添加成功' });
+          setLoading(false);
+          history.go('-1');
+        })
+        .catch((e) => {
+          notification.error({ message: e.message });
+          setLoading(false);
+          return Promise.reject(e.message);
+        });
+    }
+    setLoading(true);
+    return request(`/banner/${id}`, { method: 'put', data: { serialNo: id, ...values } })
+      .then(() => {
+        // props.onChange(res)
+        // form.setFieldsValue(res)
+        notification.info({ message: '修改成功' });
+        setLoading(false);
+        history.go('-1');
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+        setLoading(false);
+        return Promise.reject(e.message);
+      });
+  };
+
+  return (
+    <PageContainer>
+      <Container loading={loading}>
+        <ProForm form={form} onFinish={handleSubmit}>
+          <Form.Item
+            name="image"
+            label="图片"
+            placeholder="请选择图片"
+            extra="支持jpg/png文件，且不超过500kb"
+            rules={[{ required: true, message: '请上传图片' }]}
+          >
+            <UploadImage />
+          </Form.Item>
+
+          <ProFormText
+            label="标题"
+            placeholder="输入标题"
+            name="title"
+            rules={[{ required: true, message: '请填写标题' }]}
+          />
+
+          <ProFormSelect
+            label="板块"
+            placeholder="请选择板块"
+            initialValue={'post'}
+            name="targetType"
+            options={[
+              {
+                value: 'post',
+                label: '科普',
+              },
+            ]}
+            rules={[{ required: true, message: '请选择板块' }]}
+          />
+
+          <ProFormSelect
+            label="链接文章"
+            placeholder="请选择链接文章"
+            name="targetId"
+            showSearch
+            request={async ({ keyWords }) => {
+              // console.log()
+              // if (keyWords) {
+              return request('/post', {
+                method: 'get',
+                params: { name: keyWords, pageNum: 1, pageSize: 1000 },
+              })
+                .then((res) => {
+                  return res?.records?.map((x) => {
+                    return { label: x.name, value: x.postId };
+                  });
+                })
+                .catch((e) => {
+                  notification.error({ message: e.message });
+                  return Promise.reject(e.message);
+                });
+              // }
+            }}
+          />
+        </ProForm>
+      </Container>
+    </PageContainer>
+  );
+};
+
+export default connect(() => ({}))(BannerEdit);

src/pages/Student/Student/List/index.jsx

@@ -0,0 +1,115 @@
+import React, { useCallback, useState } from 'react';
+import { connect, history } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@ant-design/pro-table';
+import { PlusOutlined } from '@ant-design/icons';
+import { Button, Popconfirm, Image, Space, notification } from 'antd';
+import request, { queryTable } from '@/utils/request';
+
+const typeList = { post: '科普' };
+// const stateList = { post: '科普' };
+
+const BannerList = () => {
+  const [, setLoading] = useState(false);
+  const handleBannerClick = useCallback((id) => {
+    history.push(id ? `/cms/banner/edit?id=${id}` : '/cms/banner/edit');
+  }, []);
+
+  const actions = [
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => handleBannerClick()}>
+      新建
+    </Button>,
+  ];
+
+  const deleteBannerClick = (id) => {
+    setLoading(true);
+
+    request(`/banner/${id}`, { method: 'delete' })
+      .then(() => {
+        notification.success({ message: '删除成功' });
+        // ref.current.submit();
+      })
+      .catch((e) => {
+        setLoading(false);
+        notification.error({ message: e.message });
+      });
+  };
+
+  const columns = [
+    {
+      title: '排序',
+      dataIndex: 'sort',
+      width: 60,
+      hideInSearch: true,
+      align: 'center',
+    },
+    {
+      title: '主图',
+      dataIndex: 'image',
+      hideInSearch: true,
+
+      align: 'center',
+      render: (text) => <Image width={64} height={64} src={text} />,
+    },
+    {
+      title: '名称',
+      dataIndex: 'title',
+      align: 'center',
+      className: 'drag-visible',
+    },
+    {
+      title: '板块',
+      dataIndex: 'targetType',
+      hideInSearch: true,
+      align: 'center',
+      render: (text) => typeList[text] || '',
+    },
+
+    {
+      title: '状态',
+      dataIndex: 'status',
+      align: 'center',
+      hideInSearch: true,
+      // render: (text) => <Image src={text} />,
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      align: 'center',
+      hideInSearch: true,
+      render: (text, record) => (
+        <Space size="middle">
+          <a onClick={() => handleBannerClick(record.serialNo)}>编辑</a>
+          <Popconfirm
+            key="popconfirm"
+            title={`确认删除吗?`}
+            onConfirm={() => deleteBannerClick(record.serialNo)}
+            okText="是"
+            cancelText="否"
+          >
+            <a>删除</a>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        columns={columns}
+        request={queryTable('/school')}
+        rowKey="schoolId"
+        headerTitle="学校列表"
+        search={{
+          labelWidth: '4em',
+        }}
+        toolBarRender={() => actions}
+      />
+    </PageContainer>
+  );
+};
+
+export default connect((s) => ({
+  typeList: s.post.typeList,
+}))(BannerList);