From 8e8089c800fd4efb07582c400870cde23a49e2fe Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 23:32:34 +0800
Subject: [PATCH] 考试修改
---
src/views/trainExam/index.vue | 14 ++++++++------
src/views/applyexam/index.vue | 4 ++--
src/views/trainExam/performance.vue | 12 ++++++++----
src/views/trainExam/singleperformance.vue | 7 +++++--
src/views/applydetailed/index.vue | 6 +++---
src/views/dispatch/dispatchChildoperable.vue | 16 +++++++++++-----
6 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/src/views/applydetailed/index.vue b/src/views/applydetailed/index.vue
index b300b20..cd1dffb 100644
--- a/src/views/applydetailed/index.vue
+++ b/src/views/applydetailed/index.vue
@@ -39,13 +39,12 @@
>清册打印
</el-button>
<el-button
- style="display:none"
type="success"
size="small"
plain
icon="el-icon-receiving"
@click="handleImport"
- >清册打印
+ >清册导入
</el-button>
</template>
@@ -104,6 +103,7 @@
export default {
data() {
+ var examId = this.$route.query.id;
return {
obj: {
name: "张三",
@@ -462,7 +462,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/apply/import-apply",
+ action: "/api/apply/import-applys?examId="+examId,
},
{
label: "模板下载",
diff --git a/src/views/applyexam/index.vue b/src/views/applyexam/index.vue
index 04d848c..621a50e 100644
--- a/src/views/applyexam/index.vue
+++ b/src/views/applyexam/index.vue
@@ -76,7 +76,7 @@
icon="el-icon-folder-checked"
v-if="permission.applyexam_import"
@click="handleImport"
- >清册导入
+ >批量报名
</el-button>
</template>
@@ -131,7 +131,7 @@
</el-dialog>
<el-dialog
- title="清册数据导入"
+ title="批量报名导入"
append-to-body
:visible.sync="excelBox"
width="555px"
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 702bb90..3de8361 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -291,6 +291,9 @@
...mapState({
userInfo: (state) => state.user.userInfo,
}),
+ deps(){
+ return this.form.deptId;
+ }
},
methods: {
@@ -516,11 +519,14 @@
}
}
},
- // watch: {
- // "form.deptId"() {
- // this.initData();
- // }
- // },
+ watch: {
+ // "form.deptId"() {
+ // this.initData();
+ // }
+ deps(){
+ console.log(this.deps,5646646)
+ }
+ },
mounted() {
this.onLoad1(this.page1, this.query1);
},
diff --git a/src/views/trainExam/index.vue b/src/views/trainExam/index.vue
index a789975..cfd1e6a 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"
@@ -144,8 +145,9 @@
border: true, //liu
index: true,
stripe: true,
- viewBtn: true,
- addBtn: true,
+ viewBtn: false,
+ addBtn: false,
+ editBtn: false,
selection: true,
excelBtn: false,
menuWidth: 230,
@@ -154,14 +156,14 @@
},
questionBankOption: {
// 操作栏多余按钮去除
- delBtn: true,
- editBtn: true,
- addBtn: true,
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
selection: true,
menu: true,
// 导出按钮
excelBtn: false,
- viewBtn: true,
+ viewBtn: false,
// title: '题库',
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index d105a65..95027d0 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -151,7 +151,7 @@
search: true,
searchSpan: 4,
slot: true,
- viewDisplay:false,
+ viewDisplay:true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -159,9 +159,10 @@
// 表单新增时是否为查看模式
addDetail: false,
// 表单编辑时是否禁止
- editDisabled: false,
+ editDisabled: true,
+ viewDisabled: true,
// 表单编辑时是否可见
- editDisplay: false,
+ editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
@@ -171,7 +172,8 @@
trigger: "blur",
},
],
- overHidden:true,
+ width:250,
+ // overHidden:true,
},
{
label: "用户名",
@@ -198,6 +200,7 @@
trigger: "blur",
},
],
+ width:160,
},
{
label: "所属公司",
@@ -229,6 +232,7 @@
trigger: "blur",
},
],
+ width:230,
},
{
label: "考试开始时间",
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index dde7ba1..adb0a7d 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -149,7 +149,7 @@
// 表单新增时是否为查看模式
addDetail: false,
// 表单编辑时是否禁止
- editDisabled: false,
+ editDisabled: true,
// 表单编辑时是否可见
editDisplay: false,
// 表单编辑时是否为查看模式
@@ -161,7 +161,8 @@
trigger: "blur",
},
],
- overHidden:true,
+ // overHidden:true,
+ width:250,
},
{
label: "用户名",
@@ -188,6 +189,7 @@
trigger: "blur",
},
],
+ width:160,
},
{
label: "所属公司",
@@ -219,6 +221,7 @@
trigger: "blur",
},
],
+ width:230,
},
{
label: "考试开始时间",
--
Gitblit v1.9.3