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/exam/performance.vue | 230 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 183 insertions(+), 47 deletions(-)
diff --git a/src/views/exam/performance.vue b/src/views/exam/performance.vue
index 1c9f5d8..b37e921 100644
--- a/src/views/exam/performance.vue
+++ b/src/views/exam/performance.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-18 19:44:47
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-10-25 15:10:09
* menu-name 成绩管理
*/
<template>
@@ -14,6 +14,7 @@
v-model="obj"
class="company-box"
:option="questionBankOption"
+ :permission="permissionList"
:search.sync="questionBankSearch"
:table-loading="questionBankLoading"
:data="questionBankData"
@@ -27,8 +28,25 @@
@size-change="questionBankSizeChange"
@row-update="questionBankRowUpdate"
>
+ <template slot-scope="{ row }" slot="theoryGrade">
+ {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
+ </template>
<template slot-scope="{ row }" slot="learnGrade">
{{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="allGrade">
+ {{ row.allGrade == -1 ? "" : row.allGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="qualified">
+ {{
+ row.qualified == -1
+ ? ""
+ : row.qualified == 0
+ ? "合格"
+ : row.qualified == 1
+ ? "不合格"
+ : ""
+ }}
</template>
<!-- 自定义按钮 -->
@@ -50,8 +68,22 @@
size="small"
plain
icon="el-icon-upload2"
+ v-if="permission.performance_import"
@click="handleImport"
>实操成绩导入
+ </el-button>
+ </template>
+
+ <template slot-scope="{ row }" slot="menu">
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-collection"
+ class="start-kaoshi"
+ v-if="permission.performance_print"
+ :disabled="row.qualified == 1"
+ @click="securityPrint(row)"
+ >保安证打印
</el-button>
</template>
</avue-crud>
@@ -82,11 +114,12 @@
<script>
import { getList, update } from "@/api/examapi/performance";
+import { mapGetters } from "vuex";
+import { getRoleDetail } from "@/api/system/role";
export default {
data() {
var validatePass = (rule, value, callback) => {
- console.log(value);
if (value == undefined || value == "") {
callback(new Error("请输入实操成绩"));
return;
@@ -115,7 +148,7 @@
// 导出按钮
excelBtn: true,
excelBtnText: "成绩导出",
- viewBtn: true,
+ viewBtn: false,
// title: '成绩',
align: "center",
height: "auto",
@@ -129,16 +162,17 @@
dialogClickModal: false,
// 操作栏宽度
menu: true,
- menuWidth: 136,
+ menuWidth: 186,
labelWidth: 120,
column: [
{
- label: "试卷名称",
+ label: "考试名称",
prop: "examName",
search: true,
searchSpan: 4,
slot: true,
+ viewDisplay: false,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -146,9 +180,9 @@
// 表单新增时是否为查看模式
addDetail: false,
// 表单编辑时是否禁止
- editDisabled: true,
+ editDisabled: false,
// 表单编辑时是否可见
- editDisplay: true,
+ editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
@@ -158,11 +192,12 @@
trigger: "blur",
},
],
- overHidden:true,
+ // overHidden: true,
+ width: 230,
},
{
- label: "保安姓名",
- prop: "securityName",
+ label: "用户名",
+ prop: "account",
search: true,
searchSpan: 4,
slot: true,
@@ -185,6 +220,7 @@
trigger: "blur",
},
],
+ width: 160,
},
{
label: "所属公司",
@@ -216,15 +252,16 @@
trigger: "blur",
},
],
+ width: 250,
},
{
- 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 +275,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: "理论成绩",
@@ -277,28 +373,28 @@
],
},
{
- label: "总成绩",
- prop: "allGrade",
- slot: true,
- // hide:true,
- // 表单新增时是否禁止
- addDisabled: false,
- viewDisplay:false,
- // 表单新增时是否可见
- addDisplay: false,
- // 表单新增时是否为查看模式
- addDetail: false,
- // 表单编辑时是否禁止
- editDisabled: false,
- // 表单编辑时是否可见
- editDisplay: false,
- // 表单编辑时是否为查看模式
- editDetail: false,
- rules: [{
- required: true,
- message: "请输入考试名称",
- trigger: "blur"
- }]
+ label: "总成绩",
+ prop: "allGrade",
+ slot: true,
+ // 表单新增时是否禁止
+ addDisabled: false,
+ // 表单新增时是否可见
+ addDisplay: true,
+ // 表单新增时是否为查看模式
+ addDetail: false,
+ // 表单编辑时是否禁止
+ editDisabled: true,
+ // 表单编辑时是否可见
+ editDisplay: true,
+ // 表单编辑时是否为查看模式
+ editDetail: false,
+ rules: [
+ {
+ required: true,
+ message: "请输入考试名称",
+ trigger: "blur",
+ },
+ ],
},
{
label: "是否合格",
@@ -407,22 +503,51 @@
},
};
},
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(null, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(this.permission.performance__edit, false),
+ excelBtn: this.vaildData(this.permission.performance_export, false),
+ };
+ },
+ },
created() {},
mounted() {},
methods: {
questionBankOnLoad(page, params = {}) {
- this.questionBankLoading = false;
- params["examType"] = 1;
- getList(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query)
- ).then((res) => {
- const data = res.data.data;
- this.questionBankPage.total = data.total;
- this.questionBankData = data.records;
- this.questionBankLoading = false;
- this.questionBankSelectionClear();
+ //判断角色，如果是保安公司管理员或保安，只能查看当前公司的考试成绩
+ var that = this;
+ //获取当前登录人员的角色信息
+ var roleIds = this.userInfo.role_id.split(",");
+ roleIds.forEach((roleId) => {
+ getRoleDetail(roleId).then((res) => {
+ var roleAlias = res.data.data.roleAlias;
+ if (
+ roleAlias == "保安公司管理员" ||
+ roleAlias == "保安" ||
+ roleAlias == "未持证保安"
+ ) {
+ //如果是保安公司管理员
+ params["deptId"] = that.userInfo.dept_id;
+ }
+ that.questionBankLoading = false;
+ params["examType"] = 1;
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ that.questionBankPage.total = data.total;
+ that.questionBankData = data.records;
+ that.questionBankLoading = false;
+ that.questionBankSelectionClear();
+ });
+ });
});
},
questionBankSelectionClear() {
@@ -448,11 +573,22 @@
questionBankSizeChange(pageSize) {
this.questionBankPage.pageSize = pageSize;
},
+ //保安证证查看
+ securityPrint(row) {
+ var obj = row;
+ obj["name"] = "保安证";
+ this.$router.push({
+ path: `/exam/papers`,
+ query: obj,
+ });
+ },
questionBankRowUpdate(row, index, done, loading) {
+ // debugger;
update({
theoryGrade: row.theoryGrade,
learnGrade: row.learnGrade,
+ examId: row.examId,
id: row.id,
}).then(
() => {
--
Gitblit v1.9.3