diff --git a/admin/config/config.ts b/admin/config/config.ts
index 9ad43ce..907d6e1 100644
--- a/admin/config/config.ts
+++ b/admin/config/config.ts
@@ -182,7 +182,7 @@ export default defineConfig({
component: './examinationrules/attestation',
},
{
- name: '创建资质考试规则维护',
+ name: '新建资质考试规则',
icon: 'smile',
path: '/examinationrules/attestation/step',
component: './examinationrules/attestation/step',
@@ -235,7 +235,7 @@ export default defineConfig({
},
{
icon: 'table',
- name: '生涯考试历史',
+ name: '生涯考试历史统计',
path: '/history/analysis',
component: './history/analysis',
},
diff --git a/admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx b/admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx
index b18c68d..ec7127c 100644
--- a/admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx
+++ b/admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx
@@ -90,13 +90,13 @@ const AutoSelector = (props: any, ref: any) => {
<>
题库选择
- {`常规题库 ( ${normalQuestionSum} 道题)`}
+ {`常规题库 ( ${normalQuestionSum} 道题)`}
抽取比例: {
setQuestionCount([value, 100 - value])
}} /> %
- {`资质考试题库 ( ${attestationQuestionSum} 道题)`}
+ {`资质考试题库:: ( ${attestationQuestionSum} 道题)`}
抽取比例: {
setQuestionCount([100 - value, value])
}} /> %
diff --git a/admin/src/pages/examinationrules/attestation/index.tsx b/admin/src/pages/examinationrules/attestation/index.tsx
index 83f8586..e7be81f 100644
--- a/admin/src/pages/examinationrules/attestation/index.tsx
+++ b/admin/src/pages/examinationrules/attestation/index.tsx
@@ -126,7 +126,7 @@ const ExaminationRules: React.FC = () => {
hideInTable: false,
hideInForm: false,
hideInSearch: true,
- renderText: (val: string) => `${val}`,
+ renderText: (val: string) => `${val} 分钟`,
},
{
title: '关联主题',
@@ -189,7 +189,7 @@ const ExaminationRules: React.FC = () => {
valueType: 'text',
hideInSearch: true,
hideInForm: false,
- renderText: (val: string) => `${val || '-'}`,
+ renderText: (val: string) => `${val || '-'} 分`,
},
{
title: '通过线',
@@ -199,7 +199,7 @@ const ExaminationRules: React.FC = () => {
valueType: 'text',
hideInSearch: true,
hideInForm: false,
- renderText: (val: string) => `${val || '-'}`,
+ renderText: (val: string) => `${val || '-'} 分`,
},
{
title: '操作',
diff --git a/admin/src/pages/examinationrules/attestation/step/index.tsx b/admin/src/pages/examinationrules/attestation/step/index.tsx
index b13cdd3..5a510c6 100644
--- a/admin/src/pages/examinationrules/attestation/step/index.tsx
+++ b/admin/src/pages/examinationrules/attestation/step/index.tsx
@@ -189,7 +189,13 @@ export default () => {
question_count: '50,50', // 当前数据库没保存,只能采用默认
question_type_count: _type_count?.toString()
}
- )
+ )
+ if(success){
+ message.success('试卷生成成功')
+ }else{
+ message.success('试卷生成失败')
+ }
+
}}
style={{fontSize:14, padding:'0 2px 0 0'}}
>
@@ -282,7 +288,7 @@ export default () => {
{
/>
{
return querySubjectList().then(({ data }) => {
@@ -321,9 +327,28 @@ export default () => {
name="subject_id"
label="关联主题"
/>
- {
+ const val = `${e.currentTarget?.value}`;
+ console.log('val', val)
+ console.log('val.charAt(0)', val.charAt(0))
+ if(val.charAt(0) === ''){
+ console.log('vvv', val)
+ e.currentTarget.value = ''
+ }
+ if(val.length > 3) {
+ e.currentTarget.value = val.slice(0,3)
+ }
+ },
+ //style: {marginRight:3}
+ }}
// tooltip="限制考试时长的情况下,用户考试中离开,倒计时不会停止。"
/>
@@ -331,14 +356,35 @@ export default () => {
{
+ const val = `${e.currentTarget?.value}`;
+ console.log('val', val)
+ console.log('val.charAt(0)', val.charAt(0))
+ if(val.charAt(0) === ''){
+ console.log('vvv', val)
+ e.currentTarget.value = ''
+ }
+ if(val.length > 3) {
+ e.currentTarget.value = val.slice(0,3)
+ }
+ },
+ //style:{width: '100%'}
+ }}
// tooltip="限制考试时长的情况下,用户考试中离开,倒计时不会停止。"
/>
试卷数量与学生重复考试次数一致
-
+ {console.log('###', ruleData)}
+
试卷有效期指超过试卷有效期重新生成试卷
@@ -372,13 +418,14 @@ export default () => {
options={false}
search={false}
toolBarRender={() => (
-
+
diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx
index 99bee07..44f586a 100644
--- a/admin/src/pages/questionbank/index.tsx
+++ b/admin/src/pages/questionbank/index.tsx
@@ -584,7 +584,7 @@ const QuestionBank = () => {
创建时间:{record?.create_time}
标签:{record?.tag_name}
- 所属课程:{record?.course_name}
+ 课程:{record?.course_name}