From 2ff59bd14d4b8f2ec46a80190ef540e6d88f3766 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 29 Jul 2021 20:06:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/exam/performance.vue | 175 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 131 insertions(+), 44 deletions(-)
diff --git a/src/views/exam/performance.vue b/src/views/exam/performance.vue
index 78bc56d..d65578f 100644
--- a/src/views/exam/performance.vue
+++ b/src/views/exam/performance.vue
@@ -7,7 +7,7 @@
*/
<template>
<el-row class="morpheus-box">
- <el-col :span="24">
+ <el-col :span="24" class="recruitmentManagement">
<el-card>
<div class="exam-card-body">
@@ -34,28 +34,49 @@
</template>
<!-- 自定义按钮 -->
- <!-- <template slot="menuLeft">
- <el-button type="danger"
+ <template slot="menuLeft">
+ <!-- <el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">新增
- </el-button>
- <el-button type="danger"
+ </el-button> -->
+ <!-- <el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">删除
+ </el-button> -->
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport"
+ >实操成绩导入
</el-button>
- <el-button type="danger"
- size="mini"
- icon="el-icon-delete"
- plain
- @click="handleDelete">导出
- </el-button>
- </template> -->
+ </template>
</avue-crud>
+
+ <el-dialog
+ title="实操成绩导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
+ >
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
</div>
@@ -97,6 +118,7 @@
obj: {
name: '张三',
},
+ excelBox:false,
questionBankOption: {
// 操作栏多余按钮去除
delBtn: false,
@@ -107,8 +129,7 @@
excelBtn: true,
excelBtnText: '成绩导出',
viewBtn: true,
- title: '成绩',
-
+ // title: '成绩',
align: 'center',
height: 'auto',
calcHeight: 80,
@@ -129,7 +150,7 @@
label: "试卷名称",
prop: "examName",
search: true,
- searchSpan: 4,
+ searchSpan: 5,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -175,14 +196,14 @@
},
{
label: "所属公司",
- prop: "company",
+ prop: "companyName",
search: true,
- searchSpan: 4,
- dicUrl: '/api/blade-system/dept/tree',
- props: {
- label: "title",
- value: "id",
- },
+ searchSpan: 5,
+ // dicUrl: '/api/blade-system/dept/tree',
+ // props: {
+ // label: "title",
+ // value: "id",
+ // },
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -260,28 +281,30 @@
editDetail: false,
rules: [{ validator: validatePass, required: true, 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: "总成绩",
+ // 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: "qualified",
@@ -330,6 +353,58 @@
},
questionBankQuery: {},
questionBankSelectionList: [],
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "模板上传",
+ prop: "excelFile",
+ type: "upload",
+ drag: true,
+ loadText: "模板上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
+ },
+ tip: "请上传 .xls,.xlsx 标准格式文件",
+ action: "/api/examScore/import-examScore",
+ },
+ // {
+ // label: "数据覆盖",
+ // prop: "isCovered",
+ // type: "switch",
+ // align: "center",
+ // width: 80,
+ // dicData: [
+ // {
+ // label: "否",
+ // value: 0,
+ // },
+ // {
+ // label: "是",
+ // value: 1,
+ // },
+ // ],
+ // value: 0,
+ // slot: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择是否覆盖",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
+ {
+ label: "模板下载",
+ prop: "excelTemplate",
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
}
},
created () {
@@ -389,6 +464,18 @@
loading();
});
},
+ handleTemplate() {
+ window.open(`/api/examScore/export-template`);
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
}
}
--
Gitblit v1.9.3