fix

config/routes.js

@@ -127,6 +127,13 @@ export default [
                     menuCode: 'student.student',
                     component: './Student/Student/List',
                   },
+                  {
+                    path: '/student/student/edit',
+                    name: '学生管理',
+                    menuCode: 'student.student',
+                    hideInMenu: true,
+                    component: './Student/Student/Edit',
+                  },
                   {
                     path: '/student/school',
                     name: '学校管理',
@@ -209,12 +216,7 @@ export default [
                     menuCode: 'system.params',
                     component: '../layouts/BlankLayout',
                   },
-                  {
-                    path: '/system/school',
-                    name: '学校管理',
-                    menuCode: 'system.school',
-                    component: '../layouts/BlankLayout',
-                  },
+              
                   {
                     path: '/system/clinic',
                     name: '诊室管理',

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

@@ -0,0 +1,134 @@
+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, Modal, Space, notification } from 'antd';
+import request, { queryTable } from '@/utils/request';
+import SpecialtyModel from './components/SpecialtyModel';
+
+// const stateList = { post: '科普' };
+
+const Specialty = (props) => {
+  console.log(props, 'props');
+  const [, setLoading] = useState(false);
+  const [visible, setVisible] = useState(false);
+
+  const ref = useRef();
+
+  const actions = [
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => setVisible(true)}>
+      新建
+    </Button>,
+  ];
+
+  const handleSubmit = (values) => {
+    return request('/specialty', {
+      method: 'post',
+      data: { schoolId: props.data.schoolId, name: values.name },
+    })
+      .then(() => {
+        notification.info({ message: '添加成功' });
+        setVisible(false);
+        // setLoading(false);
+      })
+      .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(() => {
+  //         notification.info({ message: '修改成功' });
+  //         setLoading(false);
+  //         history.go('-1');
+  //       })
+  //       .catch((e) => {
+  //         notification.error({ message: e.message });
+  //         setLoading(false);
+  //         return Promise.reject(e.message);
+  //       });
+  //   };
+
+  const deleteSchoolClick = (id) => {
+      console.log(ref)
+    ref.current.reload();
+    //   request(`/specialty/${id}`, { method: 'delete' })
+    //     .then(() => {
+    //       notification.success({ message: '删除成功' });
+    //       ref.current.submit();
+    //     })
+    //     .catch((e) => {
+
+    //       notification.error({ message: e.message });
+    //     });
+  };
+
+  const columns = [
+    {
+      title: '专业名称',
+      dataIndex: 'name',
+      align: 'center',
+      hideInSearch: true,
+      // render: (text) => <Image src={text} />,
+    },
+    {
+      title: '所属学校',
+      dataIndex: 'schoolNmae',
+      align: 'center',
+      hideInSearch: true,
+    },
+
+    {
+      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.specialtyId)}
+            okText="是"
+            cancelText="否"
+          >
+            <a>删除</a>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <ProTable
+        columns={columns}
+        request={(params)=>queryTable('/specialty')({...params,school:props.data.schoolId})}
+        actionRef={ref}
+        search={false}
+        rowKey="specialtyId"
+        // headerTitle="专业列表"
+
+        toolBarRender={() => actions}
+      />
+      <Modal title="添加专业" visible={visible} footer={null}>
+        <SpecialtyModel data={props.data} handleSubmit={(value) => handleSubmit(value)} />
+      </Modal>
+    </>
+  );
+};
+
+export default connect((s) => ({
+  typeList: s.post.typeList,
+}))(Specialty);

src/pages/Student/School/Edit/components/SchoolFrom.jsx

@@ -0,0 +1,52 @@
+import React, { useEffect } from 'react';
+import { connect } from 'umi';
+
+import ProForm, { ProFormText, ProFormTextArea } from '@ant-design/pro-form';
+import UploadImage from '@/components/UploadImage';
+import {  Form } from 'antd';
+
+const SchoolFrom = (props) => {
+
+  const [form] = Form.useForm();
+  //   const [bannerData, setBannerData] = useState({});
+
+  useEffect(() => {
+ 
+        form.setFieldsValue(props.data);
+     
+  }, [props.data]);
+
+
+  return (
+
+    
+        <ProForm form={form} onFinish={props.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>
+
+  );
+};
+
+export default connect(() => ({}))(SchoolFrom);

src/pages/Student/School/Edit/components/SpecialtyModel.jsx

@@ -0,0 +1,34 @@
+import React, { useEffect } from 'react';
+import { connect } from 'umi';
+
+import ProForm, { ProFormText, ProFormTextArea } from '@ant-design/pro-form';
+
+import { Form } from 'antd';
+
+const SpecialtyModel = (props) => {
+  console.log(props, 'SpecialtyModel');
+
+  const [form] = Form.useForm();
+
+  return (
+    <ProForm form={form} onFinish={props.handleSubmit}>
+      <ProFormText
+        label="学校名称"
+        placeholder="输入学校名称"
+        initialValue={props.data.name}
+        name="SchoolName"
+        disabled
+        required
+      />
+
+      <ProFormText
+        label="专业名称"
+        placeholder="输入专业名称"
+        name="name"
+        rules={[{ required: true, message: '请填写专业名称' }]}
+      />
+    </ProForm>
+  );
+};
+
+export default SpecialtyModel;

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

@@ -3,15 +3,15 @@ import { connect, history } from 'umi';
 import { PageContainer } from '@ant-design/pro-layout';
 import Container from '@/components/Container';
 import request from '@/utils/request';
+import { notification, Tabs } from 'antd';
+import SchoolFrom from './components/SchoolFrom';
+import Specialty from './Specialty';
 
-import ProForm, { ProFormText, ProFormTextArea } from '@ant-design/pro-form';
-import UploadImage from '@/components/UploadImage';
-import { notification, Form } from 'antd';
-
+const { TabPane } = Tabs;
 const SchoolEdit = (props) => {
   const { id } = props.location.query;
   const [loading, setLoading] = useState(false);
-  const [form] = Form.useForm();
+  const [data, setData] = useState({});
   //   const [bannerData, setBannerData] = useState({});
 
   useEffect(() => {
@@ -19,9 +19,7 @@ const SchoolEdit = (props) => {
       setLoading(true);
       request(`/school/${id}`)
         .then((res) => {
-          form.setFieldsValue(res);
-          //   setBannerData(res);
-          //   set
+          setData(res);
           setLoading(false);
         })
         .catch((e) => {
@@ -29,10 +27,9 @@ const SchoolEdit = (props) => {
           notification.error({ message: e.message });
         });
     }
-  }, [form, id]);
+  }, [id]);
 
   const handleSubmit = (values) => {
-    console.log(values, form.getFieldsValue(), 'handleSubmit');
     if (!id) {
       setLoading(true);
       return request('/school', { method: 'post', data: values })
@@ -52,8 +49,6 @@ const SchoolEdit = (props) => {
     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');
@@ -67,34 +62,50 @@ const SchoolEdit = (props) => {
 
   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>
+        <Tabs>
+          <TabPane tab="学校" key="1">
+            <Container loading={loading}>
+              <SchoolFrom data={data} handleSubmit={handleSubmit}></SchoolFrom>
+            </Container>
+          </TabPane>
+          {id && (
+            <TabPane tab="专业" key="2">
+              <Specialty data={data}></Specialty>
+            </TabPane>
+          )}
+        </Tabs>
       </Container>
     </PageContainer>
+    // <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>
   );
 };
 

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

@@ -6,13 +6,10 @@ 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 StudentList = () => {
   const [, setLoading] = useState(false);
-  const handleBannerClick = useCallback((id) => {
-    history.push(id ? `/cms/banner/edit?id=${id}` : '/cms/banner/edit');
+  const handleStudentClick = useCallback((id) => {
+    history.push(id ? `/student/student/edit?id=${id}` : '/student/student/edit');
   }, []);
 
   const actions = [
@@ -21,56 +18,48 @@ const BannerList = () => {
     </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,
+      title: '编号',
+      dataIndex: 'person_id',
+      align: 'center',
       hideInSearch: true,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
       align: 'center',
     },
     {
-      title: '主图',
-      dataIndex: 'image',
+      title: '昵称',
+      dataIndex: 'nickName',
+      align: 'center',
       hideInSearch: true,
+    },
+    {
+      title: '联系方式',
+      dataIndex: 'phone',
 
       align: 'center',
-      render: (text) => <Image width={64} height={64} src={text} />,
     },
     {
-      title: '名称',
-      dataIndex: 'title',
+      title: '学校',
+      dataIndex: 'schoolName',
+
       align: 'center',
-      className: 'drag-visible',
     },
     {
-      title: '板块',
-      dataIndex: 'targetType',
-      hideInSearch: true,
+      title: '专业',
+      dataIndex: 'specialtyName',
+
       align: 'center',
-      render: (text) => typeList[text] || '',
     },
 
     {
-      title: '状态',
+      title: '学号',
       dataIndex: 'status',
       align: 'center',
-      hideInSearch: true,
-      // render: (text) => <Image src={text} />,
     },
     {
       title: '操作',
@@ -79,16 +68,7 @@ const BannerList = () => {
       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>
+          <a onClick={() => handleStudentClick(record.serialNo)}>用户详情 </a>
         </Space>
       ),
     },
@@ -98,13 +78,13 @@ const BannerList = () => {
     <PageContainer>
       <ProTable
         columns={columns}
-        request={queryTable('/school')}
+        request={queryTable('/person')}
         rowKey="schoolId"
         headerTitle="学校列表"
         search={{
           labelWidth: '4em',
-        }}
-        toolBarRender={() => actions}
+        }} 
+       
       />
     </PageContainer>
   );
@@ -112,4 +92,4 @@ const BannerList = () => {
 
 export default connect((s) => ({
   typeList: s.post.typeList,
-}))(BannerList);
+}))(StudentList);