diff --git a/src/views/projectFront/examSystem2/examManagement/detail.vue b/src/views/projectFront/examSystem2/examManagement/detail.vue index dd2a921a..6b39ca80 100644 --- a/src/views/projectFront/examSystem2/examManagement/detail.vue +++ b/src/views/projectFront/examSystem2/examManagement/detail.vue @@ -75,8 +75,8 @@ - - + @@ -111,9 +111,9 @@ {{ scope.row.duration }} - + @@ -140,8 +140,8 @@ - - + @@ -177,9 +177,9 @@ {{ scope.row.duration }} - + @@ -311,7 +311,7 @@ export default { cardDialog: false, cardForm: {}, formInline: { - inspectionResult: "", + isPass: "", workerName: "", }, isAdd: -1, @@ -352,7 +352,7 @@ export default { //刷新 refreshBtn(type) { this.formInline= { - inspectionResult: "", + isPass: "", workerName: "", }; if(type == 2) { @@ -397,7 +397,7 @@ export default { isReEducation: this.activeName == 'second' ? 0 : 1, projectSn: this.projectSn, workerName: this.formInline.workerName, - inspectionResult: this.formInline.inspectionResult, + isPass: this.formInline.isPass, pageNo: this.pageNo, pageSize: this.pageSize, } diff --git a/src/views/projectFront/examSystem2/examManagement/examManagement.vue b/src/views/projectFront/examSystem2/examManagement/examManagement.vue index 9cc77a65..d4f098a8 100644 --- a/src/views/projectFront/examSystem2/examManagement/examManagement.vue +++ b/src/views/projectFront/examSystem2/examManagement/examManagement.vue @@ -33,9 +33,21 @@ - - - + + + + + + + + + @@ -62,8 +74,8 @@ + :current-page="pageInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pageInfo.pageSize" + layout="total, sizes, prev, pager, next" :total="Number(pageInfo.total)" background> @@ -614,7 +626,7 @@ export default { questions: [] }, subjectNameList: [], - pagInfo: { + pageInfo: { //公用分页 pageNo: 1, pageSize: 10, @@ -1196,15 +1208,15 @@ export default { projectSn: this.projectSn, } pagePaperApi({ - pageNo: this.pagInfo.pageNo, - pageSize: this.pagInfo.pageSize, + pageNo: this.pageInfo.pageNo, + pageSize: this.pageInfo.pageSize, name: this.questionName, subjectId: this.name, }).then((result) => { if (result.success) { console.log(result); this.listData = result.result.records - this.pagInfo.total = result.result.total + this.pageInfo.total = result.result.total } }) }, @@ -1382,12 +1394,12 @@ export default { }, //切换条数 sizeChange(val) { - this.pagInfo.pageSize = val + this.pageInfo.pageSize = val this.getRecordList() }, //切换页数 currentChange(val) { - this.pagInfo.pageNo = val + this.pageInfo.pageNo = val this.getRecordList() }, //切换条数 @@ -1419,7 +1431,7 @@ export default { this.dialogVisible3 = false; }, refreshFn() { - this.pagInfo.pageNo = 1 + this.pageInfo.pageNo = 1 this.getRecordList() }, exportBtn(type) { @@ -1447,7 +1459,7 @@ export default { // 创建一个元素 const link = document.createElement('a'); link.href = url; - link.download = '安全教育培训台账.xlsx'; // 指定下载文件的文件名 + link.download = type == 1 ? '安全教育培训台账.xlsx' : '特种人员培训台账.xlsx'; // 指定下载文件的文件名 // 模拟点击下载链接 document.body.appendChild(link); link.click(); diff --git a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue index fdcd3b38..daf36702 100644 --- a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue +++ b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue @@ -304,15 +304,27 @@
-
- - - {{ item.optionCode }}、{{ item.optionDesc }} - +
+
+
+ + + {{ item.optionCode }}、{{ item.optionDesc }} + +
+
+
+ + +
-
+
试题分数:{{ questionForm.score }}
难易程度:{{ questionForm.difficulty === 1 ? '简单' : questionForm.difficulty === 2 ? '一般' : questionForm.difficulty === 3 ? '困难' : '' }}
@@ -828,7 +840,10 @@ export default { projectSn: this.$store.state.projectSn }).then(result => { if (result.success) { - this.questionForm = result.result; + this.questionForm = { + ...result.result, + pic: isJSON(result.result.pic) && result.result.pic != null ? JSON.parse(result.result.pic) : [] + }; this.questionArr = result.result.optionList; } })