From 79d9fc857559982b00b68b2d709807bdc4cd286f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 10:58:17 +0800
Subject: [PATCH] minio 地址修改
---
src/views/trainExam/performance.vue | 744 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 413 insertions(+), 331 deletions(-)
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 587fb02..f53f93c 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -1,162 +1,161 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-27 10:20:19
- * menu-name 成绩管理
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-27 10:20:19 * menu-name 成绩管理 */
<template>
- <el-row class="morpheus-box">
- <el-col :span="24">
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'tooRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- :permission="permissionList"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @sort-change="sortChange"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-update="questionBankRowUpdate"
- @refresh-change="refreshChange"
- >
- <template slot-scope="{ row }" slot="theoryGrade">
- {{ row.theoryGrade }}
- </template>
- <template slot-scope="{ row }" slot="learnGrade">
- {{ row.learnGrade == "" ? "暂未录入" : row.learnGrade }}
- </template>
- <template slot-scope="{ row }" slot="allGrade">
- {{ row.allGrade == -1 ? "" : row.allGrade }}
- </template>
- <template slot-scope="{ row }" slot="qualified">
- {{
- row.qualified == ""
- ? ""
- : row.qualified == 0
- ? "合格"
- : row.qualified == 1
- ? "不合格"
- : row.qualified == 3
- ? "缺考,成绩无效"
- : ""
- }}
- </template>
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ :permission="permissionList"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @sort-change="sortChange"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-update="questionBankRowUpdate"
+ @refresh-change="refreshChange"
+ >
+ <template slot-scope="{ row }" slot="theoryGrade">
+ {{ row.theoryGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="learnGrade">
+ {{ row.learnGrade == "" ? "暂未录入" : row.learnGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="allGrade">
+ {{ row.allGrade == -1 ? "" : row.allGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="qualified">
+ {{
+ row.qualified == ""
+ ? ""
+ : row.qualified == 0
+ ? "合格"
+ : row.qualified == 1
+ ? "不合格"
+ : row.qualified == 3
+ ? "缺考,成绩无效"
+ : ""
+ }}
+ </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 type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">删除
</el-button> -->
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- v-if="permission.trainExam_performance_import"
- @click="handleImport"
- >实操成绩导入
- </el-button>
- <el-button
- type="warning"
- size="small"
- plain
- icon="el-icon-download"
- v-if="permission.trainExam_performance_export"
- @click="handleExport"
- >成绩导出
- </el-button>
- <el-button
- type="primary"
- size="small"
- plain
- v-if="permission.trainExam_performance_paper_apply"
- icon="el-icon-collection-tag"
- @click="handleSecurityPaperApply"
- >证书制证申请
- </el-button>
- </template>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ v-if="permission.trainExam_performance_import"
+ @click="handleImport"
+ >实操成绩导入
+ </el-button>
+ <el-button
+ type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ v-if="permission.trainExam_performance_export"
+ @click="handleExport"
+ >成绩导出
+ </el-button>
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="permission.trainExam_performance_paper_apply"
+ icon="el-icon-collection-tag"
+ @click="handleSecurityPaperApply"
+ >证书制证申请
+ </el-button>
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="permission.trainExam_performance_worker_paper_apply"
+ icon="el-icon-collection-tag"
+ @click="handleWorkerPaperApply"
+ >上岗证制证申请
+ </el-button>
+ </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- style="display: none"
- icon="el-icon-s-flag"
- @click="absent(row)"
- :size="size"
- :type="type"
- >缺考标记</el-button
- >
- <el-button
- icon="el-icon-s-promotion"
- @click="openzhengjian(row)"
- :disabled="row.qualified != 0"
- :size="size"
- :type="type"
- >查看证件</el-button
- >
- <el-button
- icon="el-icon-edit"
- @click="modifiedGrades(row)"
- :size="size"
- :type="type"
- >申请修改成绩</el-button
- >
- <el-button
- icon="el-icon-edit"
- v-if="row.isPaper == 6"
- @click="securityPaperApply(row)"
- :size="size"
- :type="type"
- >补证申请</el-button
- >
- </template>
- </avue-crud>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ style="display: none"
+ icon="el-icon-s-flag"
+ @click="absent(row)"
+ :size="size"
+ :type="type"
+ >缺考标记</el-button
+ >
+ <el-button
+ icon="el-icon-s-promotion"
+ @click="openzhengjian(row)"
+ :disabled="row.qualified != 0"
+ :size="size"
+ :type="type"
+ >查看证件</el-button
+ >
+ <el-button
+ icon="el-icon-edit"
+ @click="modifiedGrades(row)"
+ :size="size"
+ :type="type"
+ >申请修改成绩</el-button
+ >
+ <el-button
+ icon="el-icon-edit"
+ v-if="row.isPaper == 6"
+ @click="securityPaperApply(row)"
+ :size="size"
+ :type="type"
+ >补证申请</el-button
+ >
+ </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>
- </el-card>
- </el-col>
+ <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>
<el-dialog
title="申请修改成绩"
@@ -304,12 +303,13 @@
<el-button @click="gradeBoxVisible = false">取 消</el-button>
</el-form-item>
</el-form> -->
- <avue-form
- ref="form"
- :option="option"
- v-model="form"
- @reset-change="emptytChange"
- @submit="submit">
+ <avue-form
+ ref="form"
+ :option="option"
+ v-model="form"
+ @reset-change="emptytChange"
+ @submit="submit"
+ >
</avue-form>
</div>
</el-dialog>
@@ -327,8 +327,7 @@
:closePrint="1"
></baoanz>
</div>
- <!-- </el-dialog> -->
- </el-row>
+ </basic-container>
</template>
<script>
@@ -338,19 +337,20 @@
update,
updateAbsent,
updateGrade,
+ getNowDate
} from "@/api/examapi/performance";
import { mapGetters } from "vuex";
import { getRoleDetail } from "@/api/system/role";
import {
securityApply,
- add,
+ add
} from "@/api/accreditationRecords/accreditationRecords";
import Qs from "qs";
import { getToken } from "@/util/auth";
-import { putFile,removeFile } from "@/api/resource/oss";
+import { putFile, removeFile } from "@/api/resource/oss";
export default {
components: {
- baoanz,
+ baoanz
},
data() {
var validatePass = (rule, value, callback) => {
@@ -404,140 +404,140 @@
{
label: "考试名称",
prop: "examName",
- labelWidth:110,
+ labelWidth: 110,
disabled: true,
rules: [
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "姓名",
prop: "securityName",
- labelWidth:110,
+ labelWidth: 110,
disabled: true,
rules: [
{
required: true,
message: "请输入姓名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "身份证号",
prop: "account",
- labelWidth:110,
+ labelWidth: 110,
disabled: true,
rules: [
{
required: true,
message: "请输入身份证号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "准考证号",
prop: "candidateNo",
- labelWidth:110,
+ labelWidth: 110,
disabled: true,
rules: [
{
required: false,
message: "请输入准考证号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "原理论成绩",
prop: "theoryGrade",
- labelWidth:110,
+ labelWidth: 110,
disabled: true,
rules: [
{
required: false,
message: "请输入原理论成绩",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "修改考试成绩",
- prop: "editGrades",
- labelWidth:110,
+ prop: "newScore",
+ labelWidth: 110,
rules: [
{
required: true,
message: "请输入修改考试成绩",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "实操成绩",
prop: "learnGrade",
- labelWidth:110,
+ labelWidth: 110,
disabled: true,
rules: [
{
required: false,
message: "请输入实操成绩",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "总成绩",
prop: "allGrade",
- labelWidth:110,
+ labelWidth: 110,
disabled: true,
rules: [
{
required: false,
message: "请输入总成绩",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "笔试答题图片",
prop: "url",
- labelWidth:110,
- type: 'upload',
- dataType: 'string',
+ labelWidth: 110,
+ type: "upload",
+ dataType: "string",
span: 24,
- limit:5,
- listType: 'picture-card',
- tip: '只能上传jpg/png文件,最多上传5张',
+ limit: 5,
+ listType: "picture-card",
+ tip: "只能上传jpg/png文件,最多上传5张",
propsHttp: {
- res: 'data',
+ res: "data",
url: "url"
},
- action: "/api/blade-resource/oss/endpoint/put-files",
+ action: "/api/blade-resource/oss/endpoint/put-files"
},
{
label: "修改理由",
- labelWidth:110,
+ labelWidth: 110,
span: 24,
type: "textarea",
- prop: "editReason",
- },
- ],
+ prop: "editReason"
+ }
+ ]
},
form: {},
- limit:5,
- dialogImageUrl: '',
+ limit: 5,
+ dialogImageUrl: "",
dialogVisible: false,
disabled: false,
rules: {
editGrades: [
- { validator: validatePass2, required: true, trigger: "blur" },
- ],
+ { validator: validatePass2, required: true, trigger: "blur" }
+ ]
},
gradeForm: {
id: null,
@@ -550,13 +550,13 @@
allGrade: "",
editGrades: "",
editReason: "",
- fileList:[],
+ fileList: []
},
gradeBoxVisible: false,
dialogVisiblezhengjian: false,
baoanzdata: {},
obj: {
- name: "张三",
+ name: "张三"
},
excelBox: false,
questionBankOption: {
@@ -570,7 +570,7 @@
viewBtn: false,
selection: true,
reserveSelection: true,
- selectable: (row) => {
+ selectable: row => {
if (row.qualified != "0" || row.isPaper == 6) {
return false;
} else {
@@ -618,7 +618,7 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- viewDisplay: false,
+ viewDisplay: false
},
{
label: "考试时间",
@@ -645,16 +645,16 @@
{
required: true,
message: "请输入试卷名称",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "姓名",
prop: "securityName",
search: true,
- searchSpan: 4,
+ searchSpan: 3,
slot: true,
viewDisplay: true,
// 表单新增时是否禁止
@@ -668,16 +668,18 @@
viewDisabled: true,
// 表单编辑时是否可见
editDisplay: true,
+ searchLabelWidth: 50,
+ searchSpan: 3,
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
{
required: true,
message: "请输入试卷名称",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 80,
+ width: 80
// overHidden:true,
},
{
@@ -702,10 +704,10 @@
{
required: true,
message: "请输入保安姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 140,
+ width: 140
},
{
label: "准考证号",
@@ -730,10 +732,10 @@
{
required: true,
message: "请输入保安姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 110,
+ width: 110
},
{
label: "照片",
@@ -745,7 +747,7 @@
// 表单编辑时是否可见
editDisplay: false,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "所属公司",
@@ -775,11 +777,11 @@
{
required: true,
message: "请输入所属公司",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
width: 180,
- overHidden: true,
+ overHidden: true
},
{
label: "考试开始时间",
@@ -801,7 +803,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "考试结束时间",
@@ -823,7 +825,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "考试状态",
@@ -831,21 +833,25 @@
type: "select",
slot: true,
search: true,
- searchSpan: 4,
+ searchSpan: 3,
width: 80,
dicData: [
{
label: "发布成绩",
- value: 2,
+ value: 2
},
{
label: "考试中",
- value: 3,
+ value: 3
+ },
+ {
+ label: "纸质考试",
+ value: 5
},
{
label: "缺考",
- value: 4,
- },
+ value: 4
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -863,9 +869,9 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "理论成绩",
@@ -884,7 +890,7 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 95,
+ width: 95
},
{
label: "实操成绩",
@@ -905,8 +911,8 @@
editDetail: false,
width: 95,
rules: [
- { validator: validatePass, required: true, trigger: "blur" },
- ],
+ { validator: validatePass, required: true, trigger: "blur" }
+ ]
},
{
label: "总成绩",
@@ -925,7 +931,7 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 80,
+ width: 80
},
{
label: "是否合格",
@@ -934,25 +940,25 @@
slot: true,
hide: true,
search: true,
- searchSpan: 3,
+ searchSpan: 4,
width: 90,
dicData: [
{
label: "合格",
- value: 0,
+ value: 0
},
{
label: "不合格",
- value: 1,
+ value: 1
},
{
label: "暂未录实操成绩",
- value: 2,
+ value: 2
},
{
label: "缺考,成绩无效",
- value: 3,
- },
+ value: 3
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -967,7 +973,7 @@
viewDetail: false,
viewDisplay: false,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "是否合格",
@@ -979,20 +985,20 @@
dicData: [
{
label: "合格",
- value: 0,
+ value: 0
},
{
label: "不合格",
- value: 1,
+ value: 1
},
{
label: "暂未录实操成绩",
- value: 2,
+ value: 2
},
{
label: "缺考,成绩无效",
- value: 3,
- },
+ value: 3
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -1005,7 +1011,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "是否制证",
@@ -1021,17 +1027,17 @@
dicData: [
{
label: "全部",
- value: 10,
+ value: 10
},
{
label: "已制证",
- value: 6,
+ value: 6
},
{
label: "未制证",
- value: 7,
- },
- ],
+ value: 7
+ }
+ ]
},
{
label: "有无照片",
@@ -1048,19 +1054,19 @@
dicData: [
{
label: "全部",
- value: 3,
+ value: 3
},
{
label: "有",
- value: 1,
+ value: 1
},
{
label: "无",
- value: 2,
- },
- ],
- },
- ],
+ value: 2
+ }
+ ]
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -1071,7 +1077,7 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
questionBankSelectionList: [],
@@ -1088,10 +1094,10 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/examScore/import-examScore",
+ action: "/api/examScore/import-examScore"
},
// {
// label: "数据覆盖",
@@ -1123,15 +1129,17 @@
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
- choiceList: [],
+ choiceList: []
};
},
created() {},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() {
@@ -1149,28 +1157,28 @@
excelBtn: this.vaildData(
this.permission.trainExam_performance_export,
false
- ),
+ )
};
- },
+ }
},
methods: {
//提交考试成绩修改申请
submit(row, done, loading) {
var that = this;
- row['createUser'] = this.userInfo.Id;
- console.log(row,1234660);
+ row["createUser"] = this.userInfo.Id;
+ // console.log(row,1234660);
updateGrade(row).then(
() => {
that.$refs.form.resetFields();
that.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
that.gradeBoxVisible = false;
-
+
done();
},
- (error) => {
+ error => {
window.console.log(error);
done();
}
@@ -1184,14 +1192,14 @@
const form = new FormData();
// 文件对象
form.append("file", file);
- putFile(form).then((res) => {
+ putFile(form).then(res => {
that.gradeForm.fileList.push({
- name:res.data.data.name,
- url:res.data.data.url
- })
- console.log(that.gradeForm.fileList,365441);
+ name: res.data.data.name,
+ url: res.data.data.url
+ });
+ console.log(that.gradeForm.fileList, 365441);
});
- console.log(that.gradeForm.fileList,11122222);
+ console.log(that.gradeForm.fileList, 11122222);
},
//图片展示
handlePictureCardPreview(file) {
@@ -1202,17 +1210,17 @@
handleRemove(file) {
var index = [];
//遍历图片集合,获取下标
- this.gradeForm.fileList.forEach(function (img,i){
- if(img.name==file.name){
+ this.gradeForm.fileList.forEach(function(img, i) {
+ if (img.name == file.name) {
index.push(i);
//存储对象中删除
removeFile(img.name);
}
- })
+ });
// console.log(index,222333);
//删除
for (var i = 0; i < index.length; i++) {
- this.gradeForm.fileList.splice(index[i]-i,1);
+ this.gradeForm.fileList.splice(index[i] - i, 1);
}
},
selectionChange(list) {
@@ -1220,7 +1228,7 @@
this.choiceList = [];
for (let k in list) {
this.choiceList.push({
- id: list[k].userId,
+ id: list[k].userId
});
}
},
@@ -1235,7 +1243,7 @@
{
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}
)
.then(() => {
@@ -1250,7 +1258,7 @@
const data = {
ids: str,
createUser: this.userInfo.user_id,
- type: 2,
+ type: 2
};
return securityApply(data);
})
@@ -1258,7 +1266,47 @@
this.$refs.questionBankCrud.toggleSelection();
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
+ });
+ });
+ },
+ //上岗证制证申请
+ handleWorkerPaperApply() {
+ if (this.choiceList.length === 0) {
+ this.$message.warning("请勾选至少一位持证保安员");
+ return;
+ }
+ this.$confirm(
+ "共选择上岗证制证申请人数" +
+ this.choiceList.length +
+ "人,确定申请制证?",
+ {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }
+ )
+ .then(() => {
+ let cho = this.choiceList;
+ let str = "";
+ for (let k in cho) {
+ str += cho[k].id;
+ if (k != cho.length - 1) {
+ str += ",";
+ }
+ }
+ const data = {
+ ids: str,
+ createUser: this.userInfo.user_id,
+ type: 1
+ };
+ return securityApply(data);
+ })
+ .then(() => {
+ this.$refs.questionBankCrud.toggleSelection();
+ this.$message({
+ type: "success",
+ message: "操作成功!"
});
});
},
@@ -1268,12 +1316,12 @@
$sex: row.sex == 1 ? "男" : "女",
securitynumber: row.securityNumber,
paperTime: row.paperTime,
- avatar: row.avatar,
+ avatar: row.avatar
};
this.dialogVisiblezhengjian = true;
},
//关闭dialog
- dialogBeforeClose(done){
+ dialogBeforeClose(done) {
this.gradeForm.fileList = [];
done();
},
@@ -1312,8 +1360,8 @@
var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
if (roleAlias == "保安公司管理员" || roleAlias == "保安") {
//如果是保安公司管理员
@@ -1335,10 +1383,10 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.questionBankQuery)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
- data.records.forEach((item) => {
+ data.records.forEach(item => {
if (item.isPaper == null || item.isPaper == -1) {
item.isPaper = "";
}
@@ -1359,6 +1407,7 @@
that.questionBankPage.total = data.total;
that.questionBankData = data.records;
that.questionBankLoading = false;
+ that.$store.commit("setWindowSizeHeightAdd");
that.questionBankSelectionClear();
});
});
@@ -1369,23 +1418,23 @@
this.$confirm("当前保安员已制证，确定要继续申请制证?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
const data = {
createUser: this.userInfo.user_id,
type: 2,
- userId: row.userId,
+ userId: row.userId
};
add(data).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -1397,7 +1446,7 @@
this.$confirm("确定缺考标记?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
row.qualified = 3;
updateAbsent(row).then(
@@ -1405,11 +1454,11 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -1419,25 +1468,58 @@
// 修改考试成绩
modifiedGrades(row) {
- console.log(row,97998);
- this.form = {
- id:null,
- examScoreId:row.id,
- examName:row.examName,
- candidateNo:row.candidateNo,
- account:row.account,
- securityName:row.securityName,
- theoryGrade:row.theoryGrade,
- learnGrade:row.learnGrade,
- allGrade:row.allGrade,
- }
- this.gradeBoxVisible = true;
+ var that = this;
+ //判断时间，获取系统时间，减去考试结束时间，小于24小时则可以申请，超过则提示无法申请
+ var endTime = row.endTime;
+ //必须把日期'-'转为'/'
+ endTime = endTime.replace(/-/g, "/");
+ //得到时间戳
+ var longtime = new Date(endTime).getTime();
+ // console.log(longtime,123466);
+ getNowDate().then(res => {
+ var num = 24 * 3600 * 1000;
+ if (this.userInfo.role_name == "培训公司管理员") {
+ // if (res.data.data - longtime <= num) {
+ this.form = {
+ id: null,
+ examScoreId: row.id,
+ examName: row.examName,
+ candidateNo: row.candidateNo,
+ account: row.account,
+ securityName: row.securityName,
+ theoryGrade: row.theoryGrade,
+ learnGrade: row.learnGrade,
+ allGrade: row.allGrade
+ };
+ this.gradeBoxVisible = true;
+ // } else {
+ // //提示
+ // that.$message({
+ // type: "warning",
+ // message: "成绩修改申请只能在考试截止时间后的24小内提交!"
+ // });
+ // }
+ } else {
+ this.form = {
+ id: null,
+ examScoreId: row.id,
+ examName: row.examName,
+ candidateNo: row.candidateNo,
+ account: row.account,
+ securityName: row.securityName,
+ theoryGrade: row.theoryGrade,
+ learnGrade: row.learnGrade,
+ allGrade: row.allGrade
+ };
+ this.gradeBoxVisible = true;
+ }
+ });
},
uploadGrade(formName) {
var that = this;
- this.$refs[formName].validate((valid) => {
+ this.$refs[formName].validate(valid => {
if (valid) {
var obj = {};
obj.oldScore = this.gradeForm.theoryGrade;
@@ -1451,12 +1533,12 @@
that.questionBankOnLoad(that.questionBankPage);
that.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
that.gradeBoxVisible = false;
},
- (error) => {
+ error => {
window.console.log(error);
}
);
@@ -1475,7 +1557,7 @@
this.choiceList = [];
for (let k in list) {
this.choiceList.push({
- id: list[k].userId,
+ id: list[k].userId
});
}
},
@@ -1501,17 +1583,17 @@
theoryGrade: row.theoryGrade,
learnGrade: row.learnGrade,
examId: row.examId,
- id: row.id,
+ id: row.id
}).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -1545,7 +1627,7 @@
this.$confirm("是否导出成绩数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
// console.log(this.questionBankSearch, 456);
@@ -1558,7 +1640,7 @@
securityName: this.questionBankSearch.securityName,
examName: this.questionBankSearch.examName,
isAvatar: this.questionBankSearch.isAvatar,
- isPaper: this.questionBankSearch.isPaper,
+ isPaper: this.questionBankSearch.isPaper
};
//导出
if (
@@ -1582,8 +1664,8 @@
}=${getToken()}&` + data
);
});
- },
- },
+ }
+ }
};
</script>
--
Gitblit v1.9.3