|
|
@@ -81,6 +81,23 @@
|
|
|
label="考核总分"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="状态"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="taskArea" v-if="[0,1].includes(scope.row.isReview)">
|
|
|
+ <span :class="`task_${scope.row.isReview}`">{{ typeStatusList[scope.row.isReview] }}</span>
|
|
|
+
|
|
|
+ </div>
|
|
|
+ <span v-else>/</span>
|
|
|
+ <!-- <div v-if="scope.row.state == '已完成'">已完成</div>
|
|
|
+ <div v-else>未完成</div> -->
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
<el-table-column align="center" label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
<div style="display: flex;justify-content: center;">
|
|
|
@@ -416,6 +433,7 @@ export default {
|
|
|
PageBaseDataTwo: [],
|
|
|
remDig: false,
|
|
|
timeSortList:[],
|
|
|
+ typeStatusList:["待办","已完成",'/']
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -515,7 +533,7 @@ export default {
|
|
|
// console.log(params);
|
|
|
this.ajax
|
|
|
.get(this.$store.state.api + "selectTestExaminePersonData_filterTime", params)
|
|
|
- .then(res => {
|
|
|
+ .then(async res => {
|
|
|
let data = res.data[0];
|
|
|
console.log(data)
|
|
|
|
|
|
@@ -553,6 +571,46 @@ export default {
|
|
|
e.evaSca = e.evaSca.toFixed(2);
|
|
|
e.cogSco = e.cogSco.toFixed(2);
|
|
|
});
|
|
|
+
|
|
|
+ for(let i = 0;i<data.length;i++){
|
|
|
+ let testList = [];
|
|
|
+ data[i].json.forEach(i2=>{
|
|
|
+ if(i2.children.length>0){
|
|
|
+ i2.children.forEach(i3=>{
|
|
|
+ if(i3.testid.test.length>0){
|
|
|
+ testList.push(...i3.testid.test)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
+ if(testList.length>0){
|
|
|
+ let _time = data[i].timeValue?JSON.parse(data[i].timeValue):{};
|
|
|
+ let testData = await this.computedTest(testList,data[i].userid,_time)
|
|
|
+ let _isReviewNum = 0;
|
|
|
+ let _num = 0;
|
|
|
+ testData.forEach(i=>{
|
|
|
+ _isReviewNum+=i.isReviewNum;
|
|
|
+ _num+=i.num;
|
|
|
+ })
|
|
|
+ if(_num>0){
|
|
|
+ if(_num==_isReviewNum){
|
|
|
+ data[i].isReview = 1;
|
|
|
+ }else{
|
|
|
+ data[i].isReview = 0;
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ data[i].isReview = 2;
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log("data=>",testData)
|
|
|
+ console.log("_isReviewNum=>",_isReviewNum)
|
|
|
+ console.log("_num=>",_num)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
this.tableData = data;
|
|
|
this.copyTableData = data;
|
|
|
this.tabLoading = false;
|
|
|
@@ -1036,18 +1094,19 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 处理数据来源
|
|
|
- computedTest(val) {
|
|
|
+ computedTest(val,uid='',timeSortList=this.timeSortList) {
|
|
|
let params = [
|
|
|
{
|
|
|
- uid: this.digUserid,
|
|
|
+ uid: uid?uid:this.digUserid,
|
|
|
testId: val.join(",")
|
|
|
}
|
|
|
];
|
|
|
|
|
|
|
|
|
let _fnStr = `selectExamineTestName`
|
|
|
- if(this.timeSortList){
|
|
|
- const timeValue = this.timeSortList.time;
|
|
|
+ console.log("this.timeSortList",timeSortList)
|
|
|
+ if(timeSortList && timeSortList.time && timeSortList.time.length>0){
|
|
|
+ const timeValue = timeSortList.time;
|
|
|
params[0].startTime = timeValue[0];
|
|
|
params[0].endTime = timeValue[1];
|
|
|
_fnStr = `selectExamineTestNameFilterTime`
|
|
|
@@ -1350,6 +1409,7 @@ input[type="number"] {
|
|
|
}
|
|
|
.twoCon > div:nth-child(2) {
|
|
|
width: 160px !important;
|
|
|
+ line-height: 20px;
|
|
|
}
|
|
|
.twoCon > div:nth-child(3) {
|
|
|
width: 110px !important;
|
|
|
@@ -1392,4 +1452,25 @@ input[type="number"] {
|
|
|
margin-left: 10px;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+.taskArea{
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+}
|
|
|
+
|
|
|
+.task_0{
|
|
|
+ padding: 6px 20px;
|
|
|
+ background: #FEF5EC;
|
|
|
+ border: solid 1px #FAD0A1;
|
|
|
+ color: #F7933B;
|
|
|
+ border-radius: 4px;
|
|
|
+}
|
|
|
+
|
|
|
+.task_1{
|
|
|
+ padding: 6px 20px;
|
|
|
+ background: #E6F9EA;
|
|
|
+ border: solid 1px #A6E9B6;
|
|
|
+ color: #21ba45;
|
|
|
+ border-radius: 4px;
|
|
|
+}
|
|
|
</style>
|
SanHQin