From d551d786814656e55f6e091b8c751ba72c8bc2c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 11:48:07 +0800
Subject: [PATCH] 培训考试成绩查询管理修改
---
src/views/trainExam/index.vue | 80 +++++++--------
src/views/securityGuard/securityGuard.vue | 4
src/views/trainExam/performance.vue | 82 ++++++++++++++--
src/views/trainExam/singleperformance.vue | 67 ++++++++++++
src/views/trainingRegistration/index.vue | 20 +--
5 files changed, 179 insertions(+), 74 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 4030c97..61d3cda 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1109,10 +1109,6 @@
});
this.initFlag = false;
this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
done();
},
(error) => {
diff --git a/src/views/trainExam/index.vue b/src/views/trainExam/index.vue
index bae15c3..698d4f6 100644
--- a/src/views/trainExam/index.vue
+++ b/src/views/trainExam/index.vue
@@ -179,7 +179,6 @@
label: "考试名称",
prop: "examName",
search: true,
- searchSpan: 4,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -224,13 +223,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 +240,6 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- // display: false,
- hide: true,
rules: [
{
required: true,
@@ -252,15 +247,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,
// 表单新增时是否可见
@@ -275,27 +269,27 @@
editDetail: false,
width: 160,
},
- {
- label: "考试结束时间",
- prop: "endTime",
- type: "datetime",
- // span: 24,
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- // 表单新增时是否禁止
- addDisabled: false,
- // 表单新增时是否可见
- addDisplay: false,
- // 表单新增时是否为查看模式
- addDetail: false,
- // 表单编辑时是否禁止
- editDisabled: false,
- // 表单编辑时是否可见
- editDisplay: false,
- // 表单编辑时是否为查看模式
- editDetail: false,
- width: 160,
- },
+ // {
+ // label: "考试结束时间",
+ // prop: "endTime",
+ // type: "datetime",
+ // // span: 24,
+ // format: "yyyy-MM-dd HH:mm:ss",
+ // valueFormat: "yyyy-MM-dd HH:mm:ss",
+ // // 表单新增时是否禁止
+ // addDisabled: false,
+ // // 表单新增时是否可见
+ // addDisplay: false,
+ // // 表单新增时是否为查看模式
+ // addDetail: false,
+ // // 表单编辑时是否禁止
+ // editDisabled: false,
+ // // 表单编辑时是否可见
+ // editDisplay: false,
+ // // 表单编辑时是否为查看模式
+ // editDetail: false,
+ // width: 160,
+ // },
{
label: "创建人",
prop: "creator",
@@ -527,9 +521,9 @@
},
// 新增
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.endTime = row.examTime[1];
+ // row.examTime = JSON.stringify(row.examTime);
add(row).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
@@ -546,12 +540,12 @@
);
},
questionBankRowUpdate(row, index, done, loading) {
- if (Array.isArray(row.examTime) != true) {
- row.examTime = row.examTime.split(",");
- }
- row.startTime = row.examTime[0];
- row.endTime = row.examTime[1];
- row.examTime = JSON.stringify(row.examTime);
+ // if (Array.isArray(row.examTime) != true) {
+ // row.examTime = row.examTime.split(",");
+ // }
+ row.startTime = row.startTime+":00";
+ // row.endTime = row.examTime[1];
+ // row.examTime = JSON.stringify(row.examTime);
update(row).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 88729af..aad8484 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -134,11 +134,12 @@
column: [
{
- label: "试卷名称",
+ label: "考试名称",
prop: "examName",
search: true,
searchSpan: 4,
slot: true,
+ viewDisplay:false,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -146,9 +147,9 @@
// 表单新增时是否为查看模式
addDetail: false,
// 表单编辑时是否禁止
- editDisabled: true,
+ editDisabled: false,
// 表单编辑时是否可见
- editDisplay: true,
+ editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
@@ -161,8 +162,8 @@
overHidden:true,
},
{
- label: "保安姓名",
- prop: "securityName",
+ label: "用户名",
+ prop: "account",
search: true,
searchSpan: 4,
slot: true,
@@ -218,13 +219,13 @@
],
},
{
- label: "考试时间",
+ label: "考试开始时间",
prop: "examTime",
type: "datetime",
// span: 24,
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
- width: 250,
+ width: 160,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -238,6 +239,65 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
+ },
+ {
+ label: "考试结束时间",
+ prop: "examEndTime",
+ type: "datetime",
+ // span: 24,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 160,
+ slot: true,
+ // 表单新增时是否禁止
+ addDisabled: false,
+ // 表单新增时是否可见
+ addDisplay: true,
+ // 表单新增时是否为查看模式
+ addDetail: false,
+ // 表单编辑时是否禁止
+ editDisabled: true,
+ // 表单编辑时是否可见
+ editDisplay: true,
+ // 表单编辑时是否为查看模式
+ editDetail: false,
+ },
+ {
+ label: "状态",
+ prop: "isExam",
+ type: "select",
+ slot: true,
+ search: true,
+ searchSpan: 4,
+ dicData: [
+ {
+ label: "发布成绩",
+ value: 2,
+ },
+ {
+ label: "考试中",
+ value: 3,
+ },
+ ],
+ // 表单新增时是否禁止
+ addDisabled: false,
+ // 表单新增时是否可见
+ addDisplay: true,
+ // 表单新增时是否为查看模式
+ addDetail: false,
+ // 表单编辑时是否禁止
+ editDisabled: true,
+ // 表单编辑时是否可见
+ editDisplay: true,
+ // 表单编辑时是否为查看模式
+ editDetail: false,
+ rules: [
+ {
+ required: true,
+ message: "请输入考试名称",
+ trigger: "blur",
+ },
+ ],
},
{
label: "理论成绩",
@@ -280,18 +340,16 @@
label: "总成绩",
prop: "allGrade",
slot: true,
- // hide:true,
// 表单新增时是否禁止
addDisabled: false,
- viewDisplay:false,
// 表单新增时是否可见
- addDisplay: false,
+ addDisplay: true,
// 表单新增时是否为查看模式
addDetail: false,
// 表单编辑时是否禁止
- editDisabled: false,
+ editDisabled: true,
// 表单编辑时是否可见
- editDisplay: false,
+ editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
rules: [{
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index ebaa576..1489bdb 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -152,8 +152,8 @@
overHidden:true,
},
{
- label: "保安姓名",
- prop: "securityName",
+ label: "用户名",
+ prop: "account",
search: true,
searchSpan: 4,
slot: true,
@@ -209,13 +209,13 @@
],
},
{
- label: "考试时间",
+ label: "考试开始时间",
prop: "examTime",
type: "datetime",
// span: 24,
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
- width: 250,
+ width: 160,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -231,6 +231,65 @@
editDetail: false,
},
{
+ label: "考试结束时间",
+ prop: "examEndTime",
+ type: "datetime",
+ // span: 24,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 160,
+ slot: true,
+ // 表单新增时是否禁止
+ addDisabled: false,
+ // 表单新增时是否可见
+ addDisplay: true,
+ // 表单新增时是否为查看模式
+ addDetail: false,
+ // 表单编辑时是否禁止
+ editDisabled: true,
+ // 表单编辑时是否可见
+ editDisplay: true,
+ // 表单编辑时是否为查看模式
+ editDetail: false,
+ },
+ {
+ label: "状态",
+ prop: "isExam",
+ type: "select",
+ slot: true,
+ search: true,
+ searchSpan: 4,
+ dicData: [
+ {
+ label: "发布成绩",
+ value: 2,
+ },
+ {
+ label: "考试中",
+ value: 3,
+ },
+ ],
+ // 表单新增时是否禁止
+ addDisabled: false,
+ // 表单新增时是否可见
+ addDisplay: true,
+ // 表单新增时是否为查看模式
+ addDetail: false,
+ // 表单编辑时是否禁止
+ editDisabled: true,
+ // 表单编辑时是否可见
+ editDisplay: true,
+ // 表单编辑时是否为查看模式
+ editDetail: false,
+ rules: [
+ {
+ required: true,
+ message: "请输入考试名称",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
label: "理论成绩",
prop: "theoryGrade",
slot: true,
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index 51fb7b9..4e69233 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -150,12 +150,10 @@
column: [
{
label: "考试时间",
- prop: "examTime",
- type: "daterange",
- 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",
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -451,11 +449,11 @@
//生成考试
submitExamApply(row, done, loading){
var that = this;
- var startTime = row.examTime[0];
- var endTime = row.examTime[1];
- var examTime = JSON.stringify(row.examTime);
- console.log(this.ids,111);
- addExam(this.ids, examTime, startTime, endTime).then(
+ var startTime = row.startTime+":00";
+ // var endTime = row.examTime[1];
+ // var examTime = JSON.stringify(row.examTime);
+ // console.log(this.ids,111);
+ addExam(this.ids, null, startTime, null).then(
() => {
this.onLoad(this.page);
this.$message({
--
Gitblit v1.9.3