Merge branch 'master' of http://10.10.14.176:3000/web/syzx

admin/src/pages/examination/registration/index.tsx

@@ -213,7 +213,7 @@ const RegistrationList: React.FC = () => {
     {
       title: '考试时间',
       dataIndex: 'examination_time',
-      valueType: 'dateRange',
+      valueType: 'dateTimeRange',
       sorter: true,
       hideInTable: false,
       hideInForm: true,
@@ -265,7 +265,7 @@ const RegistrationList: React.FC = () => {
             examination_id: params.id,
             ...examination_time
           }
-
+          delete value.examination_time
           // setExportData(value)
           const _data = await getExaminationPersonApplyList(value);
 

web/src/pages/mockExamination/service.ts

@@ -29,6 +29,23 @@ export async function listMyLearningSubject(params: {
     params,
   });
 }
+
+
+
+/**
+ * 【3.2.1】查看主题基本信息
+ *  /dsideal_yy/ypt/careerTraining/subject/getSubjectInfo
+ * @param params
+ * @returns
+ */
+export async function getSubjectInfo(params: {
+  page_size: number;
+  //count: number;
+}): Promise<{ data: { list: CardListItemDataType[] } }> {
+  return request('/dsideal_yy/ypt/careerTraining/subject/getSubjectInfo', {
+    params,
+  });
+}
 /**
  * 【6.5】（教师首页）当前学习主题课程信息
  *  /dsideal_yy/ypt/careerTraining/learning/listMyLearningSubject

web/src/pages/user/Login/index.tsx

@@ -79,7 +79,7 @@ const Login: React.FC = () => {
           }}
           actions={[]}
           onFinish={async (values) => {
-            await handleSubmit({user: values.username, pwd: values.password} as API.LoginParams);
+            await handleSubmit({ user: values.username, pwd: values.password } as API.LoginParams);
           }}
         >
           {status === 'error' && loginType === 'account' && (