From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/trainExam/index.vue | 181 +++++++++++++++++++++++++++++++++------------
1 files changed, 132 insertions(+), 49 deletions(-)
diff --git a/src/views/trainExam/index.vue b/src/views/trainExam/index.vue
index bae15c3..f588891 100644
--- a/src/views/trainExam/index.vue
+++ b/src/views/trainExam/index.vue
@@ -53,6 +53,7 @@
<template slot="menuLeft">
<el-button
+ style="display:none"
type="danger"
size="small"
icon="el-icon-delete"
@@ -71,6 +72,7 @@
size="mini"
icon="el-icon-collection"
class="start-kaoshi"
+ v-if="permission.trainExam_trainPapers"
@click="startExam(row)"
>报名清册
</el-button>
@@ -78,8 +80,17 @@
type="text"
size="mini"
icon="el-icon-folder-checked"
+ v-if="permission.trainExam_check"
@click="handleAudit(row)"
>审核
+ </el-button>
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-folder-checked"
+ v-if="permission.trainExam_index_examScoreViews"
+ @click="examScoreViews(row)"
+ >成绩查看
</el-button>
</template>
</avue-crud>
@@ -106,8 +117,15 @@
</template>
<script>
-import { getList, add, remove, update,updateAudit } from "@/api/examapi/examination";
+import {
+ getList,
+ add,
+ remove,
+ update,
+ updateAudit,
+} from "@/api/examapi/examination";
import { auditColumn } from "./data";
+import { mapGetters } from "vuex";
export default {
data() {
var validatePass = (rule, value, callback) => {
@@ -135,11 +153,12 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- border: false,
+ border: true, //liu
index: true,
stripe: true,
- viewBtn: true,
- addBtn: true,
+ viewBtn: false,
+ addBtn: false,
+ editBtn: false,
selection: true,
excelBtn: false,
menuWidth: 230,
@@ -148,14 +167,14 @@
},
questionBankOption: {
// 操作栏多余按钮去除
- delBtn: true,
+ delBtn: false,
editBtn: true,
- addBtn: true,
+ addBtn: false,
selection: true,
menu: true,
// 导出按钮
excelBtn: false,
- viewBtn: true,
+ viewBtn: false,
// title: '题库',
@@ -171,7 +190,6 @@
dialogClickModal: false,
// 操作栏宽度
menuWidth: 280,
-
labelWidth: 140,
column: [
@@ -179,7 +197,6 @@
label: "考试名称",
prop: "examName",
search: true,
- searchSpan: 4,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -200,7 +217,8 @@
trigger: "blur",
},
],
- width:200,
+ span:24,
+ width: 200,
},
// {
// label: "试卷分数",
@@ -224,13 +242,11 @@
// },
{
label: "考试时间",
- prop: "examTime",
- type: "daterange",
- // span: 24,
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- startPlaceholder: "考试开始时间",
- endPlaceholder: "考试结束时间",
+ prop: "startTime",
+ type: "datetime",
+ format: "yyyy-MM-dd HH:mm",
+ valueFormat: "yyyy-MM-dd HH:mm",
+ hide: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -243,8 +259,6 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- // display: false,
- hide: true,
rules: [
{
required: true,
@@ -252,15 +266,14 @@
trigger: "blur",
},
],
- width: 160,
},
{
label: "考试开始时间",
prop: "startTime",
type: "datetime",
// span: 24,
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
+ format: "yyyy-MM-dd HH:mm",
+ valueFormat: "yyyy-MM-dd HH:mm",
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -273,15 +286,15 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 160,
+ width: 140,
},
{
- label: "考试结束时间",
+ label: "考试开始截止时间",
prop: "endTime",
type: "datetime",
// span: 24,
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
+ format: "yyyy-MM-dd HH:mm",
+ valueFormat: "yyyy-MM-dd HH:mm",
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -291,14 +304,14 @@
// 表单编辑时是否禁止
editDisabled: false,
// 表单编辑时是否可见
- editDisplay: false,
+ editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 160,
+ width: 140,
},
{
- label: "创建人",
- prop: "creator",
+ label: "申请人",
+ prop: "realName",
slot: true,
// 表单新增时是否禁止
addDisabled: true,
@@ -312,14 +325,34 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- hide: true,
+ // hide: true,
+ display: false,
+ width: 80
+ },
+ {
+ label: "申请人所属学校",
+ prop: "deptName",
+ slot: true,
+ // 表单新增时是否禁止
+ addDisabled: true,
+ // 表单新增时是否可见
+ addDisplay: false,
+ // 表单新增时是否为查看模式
+ addDetail: false,
+ // 表单编辑时是否禁止
+ editDisabled: true,
+ // 表单编辑时是否可见
+ editDisplay: false,
+ // 表单编辑时是否为查看模式
+ editDetail: false,
+ // hide: true,
display: false,
},
{
label: "备注",
prop: "remark",
span: 24,
- hide:true,
+ hide: true,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -330,13 +363,34 @@
// 表单编辑时是否禁止
editDisabled: false,
// 表单编辑时是否可见
- editDisplay: true,
+ editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
},
{
label: "注意事项",
prop: "examAttention",
+ type: "textarea",
+ span: 24,
+ slot: true,
+ hide:true,
+ // 表单新增时是否禁止
+ addDisabled: false,
+ // 表单新增时是否可见
+ addDisplay: true,
+ // 表单新增时是否为查看模式
+ addDetail: false,
+ // 表单编辑时是否禁止
+ editDisabled: false,
+ // 表单编辑时是否可见
+ editDisplay: false,
+ // 表单编辑时是否为查看模式
+ editDetail: false,
+ width: 150,
+ },
+ {
+ label: "报名人数",
+ prop: "num",
type: "textarea",
span: 24,
slot: true,
@@ -349,16 +403,16 @@
// 表单编辑时是否禁止
editDisabled: false,
// 表单编辑时是否可见
- editDisplay: true,
+ editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 150,
+ width: 80,
},
{
label: "申请时间",
- prop: "createTime",
+ prop: "creatorDate",
type: "datetime",
- width: 160,
+ width: 150,
editDisplay: false,
addDisplay: false,
format: "yyyy-MM-dd HH:mm:ss",
@@ -375,7 +429,7 @@
label: "审核时间",
prop: "auditTime",
type: "datetime",
- width: 160,
+ width: 150,
editDisplay: false,
addDisplay: false,
format: "yyyy-MM-dd HH:mm:ss",
@@ -418,6 +472,7 @@
value: 3,
},
],
+ width: 80,
},
{
label: "审核明细",
@@ -439,7 +494,6 @@
questionBankSelectionList: [],
};
},
- created() {},
mounted() {},
computed: {
ids() {
@@ -449,12 +503,25 @@
});
return ids.join(",");
},
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(this.permission.trainExam_edit, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false),
+ };
+ },
},
watch: {},
methods: {
questionBankOnLoad(page, params = {}) {
this.questionBankLoading = false;
params["examType"] = 2;
+ //如果是培训公司管理员，则只能看到当前培训公司申请的考试
+ if(this.userInfo.role_name =="培训公司管理员"){
+ params['deptId'] = this.userInfo.dept_id;
+ }
getList(
page.currentPage,
page.pageSize,
@@ -491,7 +558,7 @@
this.questionBankPage.pageSize = pageSize;
},
//审核
- submit(row,done,loading){
+ submit(row, done, loading) {
updateAudit(row).then(
() => {
this.dialogFormVisible = false;
@@ -525,11 +592,21 @@
});
}
},
+ examScoreViews(row){
+ //模拟考试
+ if (row.examType == 2) {
+ this.$router.push({
+ path: `/trainExam/singleperformance`,
+ query: row,
+ });
+ }
+ },
// 新增
questionBankRowSave(row, done, loading) {
- row.startTime = row.examTime[0];
- row.endTime = row.examTime[1];
- row.examTime = JSON.stringify(row.examTime);
+ row.startTime = row.startTime + ":00";
+ row['examType'] = 2;
+ // row.endTime = row.examTime[1];
+ // row.examTime = JSON.stringify(row.examTime);
add(row).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
@@ -546,13 +623,19 @@
);
},
questionBankRowUpdate(row, index, done, loading) {
- if (Array.isArray(row.examTime) != true) {
- row.examTime = row.examTime.split(",");
+ // if (Array.isArray(row.examTime) != true) {
+ // row.examTime = row.examTime.split(",");
+ // }
+ const data = {
+ id:row.id,
+ startTime:row.startTime + ":00",
+ endTime:row.endTime + ":00",
}
- row.startTime = row.examTime[0];
- row.endTime = row.examTime[1];
- row.examTime = JSON.stringify(row.examTime);
- update(row).then(
+ // row.startTime = row.startTime + ":00";
+ // row.endTime = row.endTime + ":00";
+ // row.endTime = row.examTime[1];
+ // row.examTime = JSON.stringify(row.examTime);
+ update(data).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
this.$message({
--
Gitblit v1.9.3