From ffc16b406291b363aef864e93f8eaa189100e84e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 20 Dec 2021 16:41:47 +0800
Subject: [PATCH] 个人照片上传配置修改，成绩新增排序
---
src/views/securityGuard/securityGuard.vue | 6 ++-
src/views/trainExam/performance.vue | 35 +++++++++++++++++
src/views/trainExam/singleperformance.vue | 37 ++++++++++++++++++
3 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 4358c28..04f8050 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -918,10 +918,10 @@
},
canvasOption: {
text: " ",
- ratio: 0.1,
+ ratio: 1.0,
},
action: "/api/blade-resource/oss/endpoint/put-files",
- tip: "上传身份证一寸近期彩色正面免冠图象， (358像素(宽) × 441像素(高)、分辨率350dpi)且不超过500kb",
+ tip: "上传身份证一寸近期彩色正面免冠图象， (358像素(宽) × 441像素(高)、分辨率350dpi)且不小于30kb,不超过500kb",
span: 12,
// row: true,
prop: "avatar",
@@ -2091,6 +2091,8 @@
},
selectionClear() {
// this.selectionList = [];
+ this.sort = "";
+ this.sortName = "";
// this.$refs.crud.toggleSelection();
},
handleDelete() {
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 3b67f9d..abdbd72 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -25,6 +25,7 @@
:permission="permissionList"
ref="questionBankCrud"
:page.sync="questionBankPage"
+ @sort-change="sortChange"
@on-load="questionBankOnLoad"
@selection-change="questionBankSelectionChange"
@search-change="questionBankSearchChange"
@@ -649,6 +650,7 @@
label: "理论成绩",
prop: "theoryGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -667,6 +669,7 @@
label: "实操成绩",
prop: "learnGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -688,6 +691,7 @@
label: "总成绩",
prop: "allGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -841,6 +845,8 @@
questionBankSearch: {},
questionBankLoading: true,
questionBankData: [],
+ sort:"",
+ sortName:"",
questionBankPage: {
pageSize: 10,
currentPage: 1,
@@ -988,6 +994,27 @@
closezhengjian() {
this.dialogVisiblezhengjian = false;
},
+ //排序
+ sortChange(value) {
+ if(value.order=="ascending"){
+ this.sort = "asc";
+ }
+ if(value.order=="descending"){
+ this.sort = "desc";
+ }
+ this.sortName = value.prop;
+ //字段匹配
+ if(value.prop=="theoryGrade"){
+ this.sortName = "theory_grade";
+ }
+ if(value.prop=="learnGrade"){
+ this.sortName = "learn_grade";
+ }
+ if(value.prop=="allGrade"){
+ this.sortName = "all_grade";
+ }
+ this.questionBankOnLoad(this.questionBankPage);
+ },
questionBankOnLoad(page, params = {}) {
//判断角色，如果是保安公司管理员或保安，只能查看当前公司的考试成绩
var that = this;
@@ -1006,6 +1033,12 @@
}
that.questionBankLoading = false;
params["examType"] = 2;
+ if(this.sort){
+ params["sort"] = this.sort;
+ }
+ if(this.sortName){
+ params["sortName"] = this.sortName;
+ }
getList(
page.currentPage,
page.pageSize,
@@ -1151,6 +1184,8 @@
questionBankSelectionClear() {
this.questionBankSelectionList = [];
+ this.sort = "";
+ this.sortName = "";
// this.$refs.questionBankCrud.toggleSelection();
},
questionBankSelectionChange(list) {
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index 679a8d7..2eaa39a 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -23,6 +23,7 @@
:table-loading="questionBankLoading"
:data="questionBankData"
ref="questionBankCrud"
+ @sort-change="sortChange"
:permission="permissionList"
:page.sync="questionBankPage"
@on-load="questionBankOnLoad"
@@ -149,6 +150,8 @@
// title: '成绩',
align: "center",
height: "auto",
+ sort:"",
+ sortName:"",
calcHeight: 80,
tip: false,
searchShow: true,
@@ -396,6 +399,10 @@
label: "考试中",
value: 3,
},
+ {
+ label: "缺考",
+ value: 4,
+ },
],
width: 90,
// 表单新增时是否禁止
@@ -422,6 +429,7 @@
label: "理论成绩",
prop: "theoryGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -440,6 +448,7 @@
label: "实操成绩",
prop: "learnGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -461,6 +470,7 @@
label: "总成绩",
prop: "allGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -570,6 +580,27 @@
query: obj,
});
},
+ //排序
+ sortChange(value) {
+ if(value.order=="ascending"){
+ this.sort = "asc";
+ }
+ if(value.order=="descending"){
+ this.sort = "desc";
+ }
+ this.sortName = value.prop;
+ //字段匹配
+ if(value.prop=="theoryGrade"){
+ this.sortName = "theory_grade";
+ }
+ if(value.prop=="learnGrade"){
+ this.sortName = "learn_grade";
+ }
+ if(value.prop=="allGrade"){
+ this.sortName = "all_grade";
+ }
+ this.questionBankOnLoad(this.questionBankPage);
+ },
questionBankOnLoad(page, params = {}) {
//判断角色，如果是保安公司管理员或保安，只能查看当前公司的考试成绩
var that = this;
@@ -593,6 +624,12 @@
}
that.questionBankLoading = false;
params["examType"] = 2;
+ if(this.sort){
+ params["sort"] = this.sort;
+ }
+ if(this.sortName){
+ params["sortName"] = this.sortName;
+ }
getList(
page.currentPage,
page.pageSize,
--
Gitblit v1.9.3