From 5ebb342f111564e3ccd3778d94cfa843b852013c Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 24 Aug 2021 11:02:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/trainExam/index.vue | 1
src/views/applyexam/index.vue | 98 ++++++++++++++++++++++++------------------------
src/views/exam/startexam.vue | 1
src/views/trainExam/performance.vue | 2
src/views/trainExam/singleperformance.vue | 2
src/api/examapi/examination.js | 2
src/views/exam/singleperformance.vue | 2
7 files changed, 55 insertions(+), 53 deletions(-)
diff --git a/src/api/examapi/examination.js b/src/api/examapi/examination.js
index 5112045..d7e6939 100644
--- a/src/api/examapi/examination.js
+++ b/src/api/examapi/examination.js
@@ -24,7 +24,7 @@
export const add = (row) => {
return request({
- url: '/api/exampaper/submit',
+ url: '/api/exampaper/save',
method: 'post',
data: row
})
diff --git a/src/views/applyexam/index.vue b/src/views/applyexam/index.vue
index 8ada691..04d848c 100644
--- a/src/views/applyexam/index.vue
+++ b/src/views/applyexam/index.vue
@@ -657,55 +657,55 @@
// width: 150,
// },
- {
- label: "审查状态",
- prop: "examinationType",
- slot: true,
- searchSpan: 5,
- // 表单新增时是否禁止
- addDisabled: false,
- // 表单新增时是否可见
- addDisplay: false,
- // 表单新增时是否为查看模式
- addDetail: false,
- // 表单编辑时是否禁止
- editDisabled: false,
- // 表单编辑时是否可见
- editDisplay: true,
- // 表单编辑时是否为查看模式
- editDetail: false,
- dicData: [
- {
- label: "正常",
- value: "1",
- },
- {
- label: "异常",
- value: "2",
- },
- ],
- search: true,
- type: "select",
- },
- {
- label: "审查明细",
- prop: "examinationMx",
- slot: true,
- // 表单新增时是否禁止
- addDisabled: false,
- // 表单新增时是否可见
- addDisplay: false,
- // 表单新增时是否为查看模式
- addDetail: false,
- // 表单编辑时是否禁止
- editDisabled: false,
- // 表单编辑时是否可见
- editDisplay: true,
- // 表单编辑时是否为查看模式
- editDetail: false,
- overHidden: true,
- width: 150,
- },
+ // {
+ // label: "审查状态",
+ // prop: "examinationType",
+ // slot: true,
+ // searchSpan: 5,
+ // // 表单新增时是否禁止
+ // addDisabled: false,
+ // // 表单新增时是否可见
+ // addDisplay: false,
+ // // 表单新增时是否为查看模式
+ // addDetail: false,
+ // // 表单编辑时是否禁止
+ // editDisabled: false,
+ // // 表单编辑时是否可见
+ // editDisplay: true,
+ // // 表单编辑时是否为查看模式
+ // editDetail: false,
+ // dicData: [
+ // {
+ // label: "正常",
+ // value: "1",
+ // },
+ // {
+ // label: "异常",
+ // value: "2",
+ // },
+ // ],
+ // search: true,
+ // type: "select",
+ // },
+ // {
+ // label: "审查明细",
+ // prop: "examinationMx",
+ // slot: true,
+ // // 表单新增时是否禁止
+ // addDisabled: false,
+ // // 表单新增时是否可见
+ // addDisplay: false,
+ // // 表单新增时是否为查看模式
+ // addDetail: false,
+ // // 表单编辑时是否禁止
+ // editDisabled: false,
+ // // 表单编辑时是否可见
+ // editDisplay: true,
+ // // 表单编辑时是否为查看模式
+ // editDetail: false,
+ // overHidden: true,
+ // width: 150,
+ // },
],
},
questionBankSearch: {},
diff --git a/src/views/exam/singleperformance.vue b/src/views/exam/singleperformance.vue
index a5d56aa..8958b74 100644
--- a/src/views/exam/singleperformance.vue
+++ b/src/views/exam/singleperformance.vue
@@ -439,7 +439,7 @@
query: obj,
});
},
- questionBankOnLoad(page, params = {}) {
+ questionBankOnLoad(page, params = {}) {
//判断角色，如果是保安公司管理员或保安，只能查看当前公司的考试成绩
var that = this;
//获取当前登录人员的角色信息
diff --git a/src/views/exam/startexam.vue b/src/views/exam/startexam.vue
index 2273c4e..5a429d7 100644
--- a/src/views/exam/startexam.vue
+++ b/src/views/exam/startexam.vue
@@ -412,6 +412,7 @@
// 新增
questionBankRowSave(row, done, loading) {
row.startTime = row.startTime+":00";
+ row['examType'] = 1;
// row.endTime = row.examTime[1];
// row.examTime = JSON.stringify(row.examTime);
add(row).then(
diff --git a/src/views/trainExam/index.vue b/src/views/trainExam/index.vue
index 22b9fbb..a789975 100644
--- a/src/views/trainExam/index.vue
+++ b/src/views/trainExam/index.vue
@@ -528,6 +528,7 @@
// 新增
questionBankRowSave(row, done, loading) {
row.startTime = row.startTime + ":00";
+ row['examType'] = 2;
// row.endTime = row.examTime[1];
// row.examTime = JSON.stringify(row.examTime);
add(row).then(
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 902491e..d105a65 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -509,7 +509,7 @@
params["deptId"] = that.userInfo.dept_id;
}
that.questionBankLoading = false;
- params["examType"] = 1;
+ params["examType"] = 2;
getList(
page.currentPage,
page.pageSize,
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index 96644ac..dde7ba1 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -456,7 +456,7 @@
params["deptId"] = that.userInfo.dept_id;
}
that.questionBankLoading = false;
- params["examType"] = 1;
+ params["examType"] = 2;
getList(
page.currentPage,
page.pageSize,
--
Gitblit v1.9.3