From 99ad4923762049379eae56e548d784e323c9cb68 Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Wed, 23 Mar 2022 18:35:49 +0800
Subject: [PATCH] fix

---
 .../components/QuestionSelector.tsx           |  7 ++++--
 .../examinationrules/normal/step/index.tsx    | 24 ++++++++++++++++---
 admin/src/pages/examinationrules/service.ts   | 18 +++++++++++++-
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/admin/src/pages/examinationrules/components/QuestionSelector.tsx b/admin/src/pages/examinationrules/components/QuestionSelector.tsx
index d273964..ffa6698 100644
--- a/admin/src/pages/examinationrules/components/QuestionSelector.tsx
+++ b/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++){
diff --git a/admin/src/pages/examinationrules/normal/step/index.tsx b/admin/src/pages/examinationrules/normal/step/index.tsx
index cfaf8da..896ed65 100644
--- a/admin/src/pages/examinationrules/normal/step/index.tsx
+++ b/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>
diff --git a/admin/src/pages/examinationrules/service.ts b/admin/src/pages/examinationrules/service.ts
index ee1546c..1f93ca2 100644
--- a/admin/src/pages/examinationrules/service.ts
+++ b/admin/src/pages/examinationrules/service.ts
@@ -270,4 +270,20 @@ export async function queryQuestionWithoutList(
     },
     ...(options || {}),
   });
-}
\ No newline at end of file
+}
+
+/** 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 || {}),
+  });
+}