fix

admin/src/app.tsx

@@ -60,6 +60,14 @@ export async function getInitialState(): Promise<{
         u_type: 1, // 用户类型
         random_num: new Date().getTime(),
       });
+      // 角色权限判断 2: 校管理员 4: 普通教师
+      /*
+      const rule_ids = cookie.load('background_role_id')?.split(',') || []
+      console.log('rules',rule_ids,rule_ids.indexOf(5))
+      if(rule_ids.indexOf('2') === -1){
+        cookie.remove('person_id')
+        history.push(loginPath)
+      }*/
       console.log('avatar: ',`/dsideal_yy/html/thumb/Material/${tx?.file_id?.substr(0,2)}/${tx?.file_id}.${tx?.extension}`)
       return {name: msg?.person_name, userid: msg?.person_id, avatar: `/dsideal_yy/html/thumb/Material/${tx?.file_id?.substr(0,2)}/${tx?.file_id}.${tx?.extension}`};
     } catch (error) {

admin/src/pages/course/option/index.tsx

@@ -266,7 +266,7 @@ const CourseList: React.FC = () => {
         <Upload
           accept='.mp4'
           action='/dsideal_yy/res/plupload/'
-          defaultFileList={item.initialValue ? [item.initialValue.map(item=>({...item, url:'/dsideal_yy/html/' + item.url}))] : []}
+          defaultFileList={item.initialValue ? [item.initialValue].map(item=>({...item, url:'/dsideal_yy/html/' + item.url})) : []}
           beforeUpload={async (file) => {
             /** 获取视频文件信息 */
             const {media: {track:[General, Video, Audio]}} = await getInfo(file)
@@ -275,7 +275,6 @@ const CourseList: React.FC = () => {
               message.error('视频编码格式不正确（视频采用AVC，音频采用AAC）')
               return false;
             }
-            // console.log('file', file)
             // 获取文件名
             SetUploadFileName(file?.name);
             // 获取最后一个.的位置
@@ -294,9 +293,6 @@ const CourseList: React.FC = () => {
           }}
           maxCount={1}
           multiple={false}
-          file={()=>{
-            // location.pathname
-          }}
         >
           <Button icon={<UploadOutlined />}>上传视频</Button>
         </Upload>

admin/src/pages/examinationrules/components/QuestionSelector.tsx

@@ -188,14 +188,17 @@ const QuestionSelector = (props: any, ref: any) => {
           value.begin_time = create_time[0]
           value.end_time = create_time[1]
         }*/
-        const questions = await queryQuestionWithoutList({
+        const _data = {
           ...value,
           rules_id: props?.data?.rules_id,
           subject_id: props?.data?.subject_id,
           type: type,
           page_number: value?.current || 1,
           page_size: value?.pageSize,
-        });
+        } 
+        
+        const questions = await queryQuestionWithoutList(props?.data?.paper_uuid ? {..._data, paper_uuid: props?.data?.paper_uuid} : _data);
+        console.log('**', props?.data?.paper_uuid,{paper_uuid: props?.data?.paper_uuid})
         //
         const data = []
         for(let i=0; i<questions?.table_List.length; i++){

admin/src/pages/examinationrules/normal/step/index.tsx

@@ -9,7 +9,7 @@ import { Button, Checkbox, Col, Divider, Dropdown, Form, Input, List, Menu, mess
 import { PageContainer } from '@ant-design/pro-layout';
 import ProDescriptions from '@ant-design/pro-descriptions';
 import styles from './index.less'
-import { saveRules, querySubjectList, queryRulesView, queryTempQuestionList, saveQuestionTypeScore, queryRulesPaper, updateScore, delTempQuestion, exchangeSortNum } from '../../service';
+import { saveRules, querySubjectList, queryRulesView, queryTempQuestionList, saveQuestionTypeScore, queryRulesPaper, updateScore, delTempQuestion, exchangeSortNum, queryQuestionTypeScore } from '../../service';
 import { queryCourseView } from '@/pages/course/option/service';
 import { queryQuestionList, queryQuestionById, queryQuestionType } from '@/pages/questionbank/service';
 import { PlusOutlined, DownOutlined, DeleteOutlined, DownloadOutlined, UploadOutlined, EyeInvisibleOutlined, EyeOutlined, EditOutlined, ArrowDownOutlined, ArrowUpOutlined } from '@ant-design/icons';
@@ -218,6 +218,23 @@ export default () => {
             //parsingMap.clear();
         }
     }, [questions]);
+
+    // 获取规则分值
+    const { data: scoreData, run: runScore } = useRequest(async (params) => {
+        console.log('paperData', scoreData)
+        /**
+         *  rules_id: params?.id,
+            page_number: value.current,
+            page_size: value.pageSize
+         */
+        return queryQuestionTypeScore(params);
+    }, {
+        manual: true,
+        formatResult: (result) => {
+            return result?.question_type_score;
+        }
+    });
+
     //
     const { data: paperData, run: runPaper } = useRequest(async (params) => {
         console.log('paperData', paperData)
@@ -306,6 +323,7 @@ export default () => {
                             console.log('formRef', formRef.current?.getFieldValue(''))
                             // await waitTime(2000);
                             setCurrentStep(1) // 设置步骤号
+                            runScore({rules_id: data?.rules_id}) //
                             return true;
 
                         }}
@@ -559,11 +577,11 @@ export default () => {
                                     <div style={{ background: '#ffffff', padding: 24 }}>
                                         <Space direction="vertical" style={{ width: '100%' }}>
                                             <strong>试卷信息与设置</strong>
-                                            <Typography>共 {questions?.length} 题 {'-'} 分</Typography>
+                                            <Typography>共 {questions?.length} 题 {paperInfo?.sum_score || '-'}{ console.log('scoreData', scoreData)} 分</Typography>
                                             <Divider style={{ margin: '6px 0', opacity: 0.5 }} />
                                             <Space direction="vertical">
                                                 {questionType.map((item) => {
-                                                    return <Typography>{item?.name} 共 {typeQuestionCount[Number(item.code)]} 题 {'-'} 分</Typography>
+                                                    return <Typography>{item?.name} 共 {typeQuestionCount[Number(item.code)]} 题 {scoreData?.filter(val=>(val.question_type === Number(item?.code)))[0]?.score} 分</Typography>
                                                 }
                                                 )}
                                             </Space>

admin/src/pages/examinationrules/service.ts

@@ -270,4 +270,20 @@ export async function queryQuestionWithoutList(
     },
     ...(options || {}),
   });
-}
+}
+
+/** 21 查询题型分数 */
+export async function queryQuestionTypeScore(
+  params: {
+    rules_id: number
+  },
+  options?: Record<string, any>,
+) {
+  return request<any>('/dsideal_yy/zygh/training/rules/getQuestionTypeScore', {
+    method: 'GET',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}

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

@@ -6,7 +6,7 @@ import { useIntl, history, FormattedMessage, SelectLang, useModel } from 'umi';
 import Footer from '@/components/Footer';
 import { login } from '@/services/ant-design-pro/api';
 //import { getFakeCaptcha } from '@/services/ant-design-pro/login';
-
+import cookie from 'react-cookies';
 import styles from './index.less';
 
 const LoginMessage: React.FC<{
@@ -43,7 +43,10 @@ const Login: React.FC = () => {
     try {
       // 登录
       const msg = await login({ ...values, type });
-      if (msg.success === true) {
+      // 角色权限判断 2: 校管理员 4: 普通教师
+      const rule_ids = cookie.load('background_role_id')?.split(',') || []
+      console.log('rules',rule_ids,rule_ids.indexOf(5))
+      if (msg.success && (rule_ids.indexOf('2') !== -1)) {
         const defaultLoginSuccessMessage = '登录成功！';
         message.success(defaultLoginSuccessMessage);
         await fetchUserInfo();