diff --git a/src/assets/js/api/examSystem/examSystem.js b/src/assets/js/api/examSystem/examSystem.js index ed1e620f..e22a8ecc 100644 --- a/src/assets/js/api/examSystem/examSystem.js +++ b/src/assets/js/api/examSystem/examSystem.js @@ -8,6 +8,8 @@ export const getWorkerInfoListApi = data => post('xmgl/workerInfo/selectWorkerIn export const getDepartmentListApi = data => post('xmgl/departmentInfo/selectDepartmentDetailsList', data); // 查询项目级所有部门 export const getTeamInfoListApi = data => post('xmgl/teamInfo/getProjectTeamList', data); // 查询项目级所有班组 export const getEnterpriseInfoApi = data => post('xmgl/enterpriseInfo/list', data) //列表查看劳务公司 +//部门班组(新) +export const getQueryDepartmentListApi = (data) => get('xmgl/departmentInfo/queryDepartmentAndTeamList', data) // 科目管理 export const addExamSubjectApi = data => post('exam/subject/add', data) //添加 @@ -81,7 +83,7 @@ export const editPaperApi = data => post('exam/paper/edit', data) //编辑 export const getQuestionOption = data => post('exam/paper/queryQuestionById', data) //查询题目及选项 export const delPaperApi = data => post('exam/paper/delete', data) //查询题目及选项 //考试记录 -export const getExamTrainRecordApi = data => post('exam/trainRecord/page', data) //查询题目及选项 +export const getExamTrainRecordApi = data => post('exam/trainRecord/examRecordPage', data) //查询题目及选项 // 通知管理 export const editConfigApi = data => post('exam/config/edit', data) //通过id查询考试通知配置信息 diff --git a/src/views/projectFront/examSystem2/examManagement/examManagement.vue b/src/views/projectFront/examSystem2/examManagement/examManagement.vue index 1290fa74..9310bf3a 100644 --- a/src/views/projectFront/examSystem2/examManagement/examManagement.vue +++ b/src/views/projectFront/examSystem2/examManagement/examManagement.vue @@ -4,8 +4,8 @@
- - + + @@ -25,7 +25,7 @@
- + @@ -46,10 +46,6 @@ 删除 -
@@ -61,36 +57,37 @@
- - + + - - + + - - + + 分钟 - - + + 分 - - + + - - + +
-
- 手动抽题 + +
+ 手动抽题
- 随机抽题 + 随机抽题
@@ -118,7 +115,7 @@ @node-click="onNodeClick" :current-node-key="currentNodekey" node-key="id"> - + {{ node.label }} @@ -170,9 +167,9 @@ 从指定科目类型中选择 从全部题库中选择
- + - +
@@ -225,7 +222,7 @@
基本信息
-

科目名称：{{examDetailInfo.subjectName}}

+

科目名称：{{examDetailInfo.name}}

试题名称：{{examDetailInfo.name}}

考试时长：{{examDetailInfo.duration}}

及格分数：{{examDetailInfo.passLine}}

@@ -307,7 +304,7 @@ - + @@ -399,10 +396,10 @@ export default { }, examJudge:{}, radio:"1", - subjectName:"", + name:"", }, emActiveTab: 'examRecord', - examManageInfo:{examTotalScore:'100',passScore: 60,questionCount: '100', examPeriod: '2024-05-12 00:00:00-2024-06-01 00:00:00', joinCount: '100',noJoinCount: '2'}, + examManageInfo:{examTotalScore:'100',passLine: 60,questionCount: '100', examPeriod: '2024-05-12 00:00:00-2024-06-01 00:00:00', joinCount: '100',noJoinCount: '2'}, isExamManage: false, // 考试管理开关 examInfoList: [], // 考试信息列表 activeTab: '1', // 考试信息列表Tab @@ -413,14 +410,22 @@ export default { label: "workerName", }, questionList: [], - subjectName: '', // 科目名字 + name: '', // 科目名字 questionName: '', // 试题名称 data: generateData(), value: [1], renderFunc(h, option) { return { option.key } - { option.label }; }, - examForm: {}, + examForm: { + subjectId:'', + name:'', + duration:'', + passLine:'', + remark:'', + checkQuestionType:'', + questions:[] + }, subjectNameList: [ { value: '选项1', label: '黄金糕' }, { value: '选项2', label: '双皮奶' }, @@ -463,48 +468,39 @@ export default { { ruleType: '', symbol: '', ruleScore: '' }, ], examRules:{ - subjectType: [ + subjectId: [ + { + required: true, + message: '必填', + trigger: 'change', + }, + ], + name: [ + { + required: true, + message: '必填', + trigger: 'change', + }, + ], + duration: [ { required: true, message: '必填', trigger: 'blur', }, ], - subjectName: [ + passLine: [ { required: true, message: '必填', trigger: 'blur', }, ], - examTime: [ + checkQuestionType: [ { required: true, message: '必填', - trigger: 'blur', - }, - ], - passScore: [ - { - required: true, - message: '必填', - trigger: 'blur', - }, - ], - examMode: [ - { - required: true, - message: '必填', - trigger: 'blur', - }, - ], - }, - addEditRules: { - subdivisionProjectName: [ - { - required: true, - message: this.$t('message.personnelPosition.required'), - trigger: 'blur', + trigger: 'change', }, ], }, @@ -527,9 +523,7 @@ export default { cpsCheckedTotal: [], // 必修列表已选总条数 addCourseForm: {}, // 新增课程表单 - cpsEleRecords: [], // 选修必修人员数组 studyCycle: [], // 表单日期时间范围 - searchKeyWord: '', // 搜索关键字 personType: 0, // 人员类型 personnelName:"", // 人员名称 @@ -538,7 +532,7 @@ export default { question: { //公用分页 pageNo: 1, - pageSize: 10, + pageSize: 100000, total: 0, }, questionSubjectId:'', @@ -567,12 +561,12 @@ export default { }, watch: { dialogVisible(newV,oldV){ - if (this.title == '新增考试') { - this.clearDialog() + if(this.dialogVisible === false) { + // this.$refs.examForm.resetFields() } - - if(newV === false){ - + if(this.title === '新增考试') { + this.$refs.examForm.resetFields() + this.clearDialog() } }, "randomQuestion.examSingle.diffculty"(){ @@ -592,14 +586,14 @@ export default { } }); }, - "randomQuestion.subjectName"(){ - console.log(this.randomQuestion.subjectName); + "randomQuestion.name"(){ + console.log(this.randomQuestion.name); this.clearFilter(); this.getList({ pageNo: 1, pageSize: 99999, questionName: "", - questionSubjectId: this.randomQuestion.subjectName, + questionSubjectId: this.randomQuestion.name, }) }, }, @@ -616,11 +610,11 @@ export default { }, methods: { cancel2(){ - this.examForm.examMode = null + this.examForm.checkQuestionType = null this.dialogVisible2 = false }, cancel3(){ - this.examForm.examMode = null + this.examForm.checkQuestionType = null this.dialogVisible3 = false }, singleChange(){ @@ -636,13 +630,13 @@ export default { type:1, number:this.randomQuestion.examSingle.count, difficulty:this.randomQuestion.examSingle.diffculty, - subjectId:this.randomQuestion.examSingle.subjectName, + subjectId:this.randomQuestion.examSingle.name, } let multipleRandom = { type:2, number:this.randomQuestion.examMultiple.count?this.randomQuestion.examMultiple.count:'', difficulty:this.randomQuestion.examMultiple.diffculty?this.randomQuestion.examMultiple.diffculty:'', - subjectId:this.randomQuestion.examMultiple.subjectName?this.randomQuestion.examMultiple.subjectName:'', + subjectId:this.randomQuestion.examMultiple.name?this.randomQuestion.examMultiple.name:'', } this.randomQueryList.push(singleRandom) this.randomQueryList.push(multipleRandom) @@ -653,7 +647,6 @@ export default { } }) }, - // pageQuestionBankApi removeExam(obj){ this.$confirm('此操作将永久删除, 是否继续?', '提示', { confirmButtonText: '确定', @@ -696,6 +689,7 @@ export default { pageSize: row ? row.pageSize : this.question.pageSize, questionName: "", subjectId: row ? row.questionSubjectId : this.questionSubjectId, + isEnable:1 }).then((result) => { if (result.success) { console.log(result); @@ -752,9 +746,6 @@ export default { this.isExamManage = true; }, - handleD4Tab(val){ - this.activeTab = val - }, async examDetail(val) { console.log("~~~~~~~~~~~~~~",val); this.examDetailInfo = val; @@ -772,20 +763,6 @@ export default { } }) }, - cancelRule(type, val) { - if (type === 1) { - } else { - this.listData3.pop() - } - }, - editRule(val) {}, - addRule() { - this.listData3.push({ - ruleType: '', - symbol: '', - ruleScore: '', - }) - }, //新增按钮 async addExam() { // 打开弹窗 @@ -793,20 +770,47 @@ export default { this.title = "新增考试"; this.dialogVisible = true }, + openDoor(){ + // this.examForm.questions = this.examForm.questions.split(',') + let tempStr = this.examForm.questions.split(',') + console.log(tempStr,789) + console.log(this.questionList,789) + // this.examForm.questions = String.prototype.split(this.examForm.questions,',') + // this.$nextTick(()=>{ + + // this.examForm.questions = tempStr + // this.questionList.map((item,index) => { + // console.log("33333333333333333333") + // tempStr.map((item2,index2) => { + // if(item.id = item2){ + // that.$refs.questionListTable.toggleRowSelection(taht.questionList[index],true) + // console.log("=======================") + // console.log(this.questionList[index]) + // } + // }) + // }) + // }) + this.dialogVisible2 = true + this.$nextTick(() => { + for(let i=0;i { if (result.success) { console.log(result); @@ -854,35 +858,26 @@ export default { }, //新增/编辑 submitBtn() { - // if(this.studyCycle.length > 0){ - // console.log('==========studyCycle-submitBtn==========',this.studyCycle) - // this.addCourseForm.beginTime = this.studyCycle[0] - // this.addCourseForm.endTime = this.studyCycle[1] - // } console.log(this.compulsoryList) - // this.addCourseForm.projectSn = this.$store.state.projectSn; - // this.examForm.projectSn = this.projectSn this.$refs.examForm.validate((valid) => { if (valid) { let examInfo = { - checkQuestionType:this.examForm.examMode, - name:this.examForm.subjectName, - duration:this.examForm.examTime, - passLine:this.examForm.passScore, + checkQuestionType:this.examForm.checkQuestionType, + name:this.examForm.name, + duration:this.examForm.duration, + passLine:this.examForm.passLine, projectSn:this.$store.state.projectSn, - subjectId:this.examForm.subjectType, - remark:this.examForm.desc, - // beginTime: dateFormat(this.examForm.studyCycle[0], "yyyy-MM-dd"), - // endTime: dateFormat(this.examForm.studyCycle[1], "yyyy-MM-dd"), - questions:this.examForm.examMode == 1 ? this.examAddDetail.questions.map(item => item.id).join(',') : this.randomQuestionList.map(item => item.id).join(','), + subjectId:this.examForm.subjectId, + remark:this.examForm.remark, + questions:this.examForm.checkQuestionType == 1 ? this.examForm.questions.map(item => item.id).join(',') : this.randomQuestionList.map(item => item.id).join(','), examRecordList:this.compulsoryList.map(item => { return { id:item.id, } }), - radio:this.examForm.examMode == 1 ? this.examAddDetail.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count, - multi:this.examForm.examMode == 1 ? this.examAddDetail.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count, + radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count, + multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count, } if (this.title == '新增考试') { @@ -908,7 +903,8 @@ export default { }, // 手动抽题/随机抽题dialog开关 handleDialog(val){ - if(val === '1'){ + // if(val === '1'){ + if(val === 1){ this.currentNodekey = this.subjectNameList[0].id; this.$nextTick(() => { this.$refs.groupTreeList.setCurrentKey(this.subjectNameList[0].id) // 默认选中节点第一个 @@ -918,7 +914,8 @@ export default { this.dialogVisible2 = false this.dialogVisible2 = true } - if(val === '2'){ + // if(val === '2'){ + if(val === 2){ this.dialogVisible3 = false; if(this.randomQuestion.radio == 1) { this.getList({ @@ -948,7 +945,14 @@ export default { } }, clearDialog(){ - this.examForm = {} + this.examForm = { + subjectId:'', + name:'', + duration:'', + passLine:'', + remark:'', + checkQuestionType:'', + } }, //切换条数 sizeChange(val) { @@ -981,7 +985,7 @@ export default { console.log(value, direction, movedKeys); }, submitBtn2(){ - this.examAddDetail.questions = this.$refs.questionListTable.selection; + this.examForm.questions = this.$refs.questionListTable.selection; this.dialogVisible2 = false; }, submitBtn3(){ diff --git a/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue b/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue index b3fd945d..1df7799e 100644 --- a/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue +++ b/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue @@ -29,7 +29,7 @@ style="display: flex;justify-content:center;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
- +
@@ -43,7 +43,7 @@ + :src="item.url ? item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;cursor:pointer"/>
@@ -84,8 +84,8 @@ -
单个文件不超过100M,最多可上传5个附件
- 单个文件不超过100M,最多可上传1个附件
+ + {required:true, type: 'number', message: '必须为数字值', trigger: 'change'}] ">
@@ -159,6 +159,10 @@ export default { submitNoticeForm(noticeForm) { // this.$refs[this.noticeForm].validate((valid) => { // if (valid) { + if(typeof this.noticeForm.examNum !== 'number'){ + this.$message.error('请输入数字类型') + return + } console.log(7788) editConfigApi({ id:this.noticeForm.id, @@ -168,9 +172,9 @@ export default { projectSn: this.$store.state.projectSn, }).then(result => { if (result.success) { + this.getConfig() console.log('信息编辑成功', result); this.$message.success(result.message); - this.isDisabled = true this.isDisabled2 = true } diff --git a/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue b/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue index 282f9ee9..d3e97abb 100644 --- a/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue +++ b/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue @@ -15,8 +15,6 @@
- -