Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

教师绩效考核优化

Browse Source
This commit is contained in:
zhanglipeng
2021-09-17 15:11:09 +08:00
parent 32d21b0f3f
commit 9740a679af
5 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
View File

@ -77,14 +77,12 @@
<el-table-column
label="班级名称"
align="center"
prop="classid"
:formatter="classFormat"
prop="byClass.bjmc"
/>
<el-table-column
label="评估对象"
align="center"
prop="pgdx"
:formatter="pgdxFormat"
prop="pgdxxm"
/>
<el-table-column label="最终扣分" align="center" prop="zzdf" />
<el-table-column
@ -226,18 +224,6 @@ export default {
this.classOptions = response.rows;
});
},
// 班级字典翻译
classFormat(row, column) {
var actions = [];
var datas = this.classOptions;
Object.keys(datas).map((key) => {
if (datas[key].bjbh == "" + row.classid) {
actions.push(datas[key].bjmc);
return false;
}
});
return actions.join("");
},
// 学年学期类型--字典状态字典翻译
xnxqFormat(row, column) {
return this.selectDictLabel(this.xnxqOptions, row.xnxq);
@ -249,18 +235,6 @@ export default {
});
},
// 教师字典翻译
pgdxFormat(row, column) {
var actions = [];
var datas = this.userOptions;
Object.keys(datas).map((key) => {
if (datas[key].userId == "" + row.pgdx) {
actions.push(datas[key].nickName);
return false;
}
});
return actions.join("");
},
// 教师字典翻译
createUserFormat(row, column) {
var actions = [];
var datas = this.userOptions;

53
ruoyi-ui/src/views/benyi/teacherassessment/index.vue
View File

@ -109,13 +109,7 @@
>
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column
label="班级"
align="center"
prop="classid"
:formatter="classFormat"
fixed
/>
<el-table-column label="班级" align="center" prop="byClass.bjmc" fixed />
<el-table-column
label="教师"
align="center"
@ -348,7 +342,7 @@ export default {
}
},
"form.classid": function (val) {
//console.log(val);
console.log(val);
if (val == "undefined" || val == "" || val == null) {
} else {
getUserList(val)
@ -360,19 +354,40 @@ export default {
}
},
"form.month": function (val) {
//console.log(val);
console.log(val);
this.month = val;
},
"form.jsid": function (val) {
//console.log(val);
console.log(val);
this.queryParams_pg.pgdx = val;
this.dateRange[0] = this.month + "-01";
this.dateRange[1] = this.month + "-31";
var y = this.month.split("-")[0];
var m = this.month.split("-")[1];
if (
m == "01" ||
m == "03" ||
m == "05" ||
m == "07" ||
m == "08" ||
m == "10" ||
m == "12"
) {
this.dateRange[1] = this.month + "-31";
} else if (m == "04" || m == "06" || m == "09" || m == "11") {
this.dateRange[1] = this.month + "-30";
}else{
if(y % 4 == 0 && y % 100 !== 0 || y % 400 == 0){
this.dateRange[1] = this.month + "-29";
}else{
this.dateRange[1] = this.month + "-28";
}
}
//console.log(this.dateRange);
listDayflowassessmentbyJsid(
this.addDateRange(this.queryParams_pg, this.dateRange)
).then((response) => {
//console.log(response);
console.log(response);
var total = 100;
response.rows.forEach((item) => {
total = total + item.zzdf;
@ -387,6 +402,7 @@ export default {
getList() {
this.loading = true;
listTeacherassessment(this.queryParams).then((response) => {
//console.log(response.rows);
this.teacherassessmentList = response.rows;
this.total = response.total;
this.loading = false;
@ -408,19 +424,6 @@ export default {
this.userOptions = response.rows;
});
},
// 字典翻译
classFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
var actions = [];
var datas = this.classOptions;
Object.keys(datas).map((key) => {
if (datas[key].bjbh == "" + row.classid) {
actions.push(datas[key].bjmc);
return false;
}
});
return actions.join("");
},
userFormat(row, column) {
var actions = [];
var datas = this.userOptions;