|
|
@@ -108,7 +108,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="right" v-if="peopleId">
|
|
|
+ <div class="right" v-if="review==='1'">
|
|
|
<div class="score_box">总分：<span>{{ scoList2.reduce((acc, curr) => acc + curr.sco, 0) }}</span></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1401,7 +1401,7 @@
|
|
|
<div class="tableDatePicker">
|
|
|
<el-date-picker
|
|
|
v-model="tableDatePicker[index]"
|
|
|
- @change="tableDataPickerChange"
|
|
|
+ @blur="tableDataPickerChange"
|
|
|
type="daterange"
|
|
|
range-separator="▼"
|
|
|
:picker-options="pickerOptions(item.json.timeSort)"
|
|
|
@@ -1599,7 +1599,7 @@
|
|
|
label="审核状态"
|
|
|
width="120px"
|
|
|
fixed="right"
|
|
|
- v-if="peopleId"
|
|
|
+ v-if="review==='1'"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-checkbox @change="reviewChange(scope.row)" true-label="1" false-label="0" v-model="scope.row.isReview">审核通过</el-checkbox>
|
|
|
@@ -2208,6 +2208,8 @@ export default {
|
|
|
disableBack: this.$route.query.disableBack === 'true',
|
|
|
timeLimit:this.$route.query.timeLimit,
|
|
|
sortTime:[],
|
|
|
+ review:this.$route.query.review,
|
|
|
+ defaultTimeLimit:[]
|
|
|
};
|
|
|
},
|
|
|
watch: {},
|
|
|
@@ -2996,34 +2998,34 @@ ${JSON.stringify(forAllList)}
|
|
|
|
|
|
let _worksData = res.data[1];
|
|
|
|
|
|
- if(this.timeLimit){
|
|
|
- console.log("timeLimit", this.timeLimit)
|
|
|
- // 2024-12-31T16:00:00.000Z,2025-12-31T16:00:00.000Z
|
|
|
- // 根据 timeLimit 筛选 _worksData
|
|
|
- let [startStr, endStr] = this.timeLimit.split(',');
|
|
|
- let startDate = startStr ? new Date(startStr) : null;
|
|
|
- let endDate = endStr ? new Date(endStr) : null;
|
|
|
- _worksData = _worksData.filter(i => {
|
|
|
- if (!i.time) return false;
|
|
|
- // i.time 例子：2025年02月25日 10:17:46
|
|
|
- let match = i.time.match(/^(\d{4})年(\d{2})月(\d{2})日/);
|
|
|
- if (!match) return false;
|
|
|
- let year = parseInt(match[1]);
|
|
|
- let month = parseInt(match[2]);
|
|
|
- let day = parseInt(match[3]);
|
|
|
- // 构造当前数据的日期对象
|
|
|
- let curDate = new Date(year, month - 1, day, 0, 0, 0);
|
|
|
- // 判断是否在区间内（包含等于）
|
|
|
- if (startDate && endDate) {
|
|
|
- return curDate >= startDate && curDate <= endDate;
|
|
|
- } else if (startDate) {
|
|
|
- return curDate >= startDate;
|
|
|
- } else if (endDate) {
|
|
|
- return curDate <= endDate;
|
|
|
- }
|
|
|
- return true;
|
|
|
- });
|
|
|
- }
|
|
|
+ // if(this.timeLimit){
|
|
|
+ // console.log("timeLimit", this.timeLimit)
|
|
|
+ // // 2024-12-31T16:00:00.000Z,2025-12-31T16:00:00.000Z
|
|
|
+ // // 根据 timeLimit 筛选 _worksData
|
|
|
+ // let [startStr, endStr] = this.timeLimit.split(',');
|
|
|
+ // let startDate = startStr ? new Date(startStr) : null;
|
|
|
+ // let endDate = endStr ? new Date(endStr) : null;
|
|
|
+ // _worksData = _worksData.filter(i => {
|
|
|
+ // if (!i.time) return false;
|
|
|
+ // // i.time 例子：2025年02月25日 10:17:46
|
|
|
+ // let match = i.time.match(/^(\d{4})年(\d{2})月(\d{2})日/);
|
|
|
+ // if (!match) return false;
|
|
|
+ // let year = parseInt(match[1]);
|
|
|
+ // let month = parseInt(match[2]);
|
|
|
+ // let day = parseInt(match[3]);
|
|
|
+ // // 构造当前数据的日期对象
|
|
|
+ // let curDate = new Date(year, month - 1, day, 0, 0, 0);
|
|
|
+ // // 判断是否在区间内（包含等于）
|
|
|
+ // if (startDate && endDate) {
|
|
|
+ // return curDate >= startDate && curDate <= endDate;
|
|
|
+ // } else if (startDate) {
|
|
|
+ // return curDate >= startDate;
|
|
|
+ // } else if (endDate) {
|
|
|
+ // return curDate <= endDate;
|
|
|
+ // }
|
|
|
+ // return true;
|
|
|
+ // });
|
|
|
+ // }
|
|
|
|
|
|
this.works = _worksData;
|
|
|
this.iscount = res.data[2][0].count;
|
|
|
@@ -3402,6 +3404,19 @@ ${JSON.stringify(forAllList)}
|
|
|
});
|
|
|
});
|
|
|
console.log(this.teaType, "teaType");
|
|
|
+
|
|
|
+ if(this.timeLimit){
|
|
|
+ if(this.works[0]){
|
|
|
+ let _data = JSON.parse(this.works[0].courseJson)
|
|
|
+ _data.forEach((item,index)=>{
|
|
|
+ if(item.type==8){
|
|
|
+ let time = this.timeLimit.split(",");
|
|
|
+ this.tableDatePicker[index] = [new Date(time[0]),new Date(time[1])]
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.tableDataPickerChange()
|
|
|
+ }
|
|
|
+ }
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
console.error(err);
|
|
|
@@ -4419,6 +4434,7 @@ ${JSON.stringify(forAllList)}
|
|
|
this.selectWorkList = value;
|
|
|
},
|
|
|
tableDataPickerChange() {
|
|
|
+ console.log(this.tableDatePicker)
|
|
|
let _copyData = JSON.parse(JSON.stringify(this.worksArray));
|
|
|
this.tableDatePicker.forEach((i, index) => {
|
|
|
/*[null,["2024-12-05T00:00:00.000","2025-01-12T00:00:00.000"],["2024-12-04T00:00:00.000","2025-01-24T00:00:00.000"]] */
|
|
|
@@ -4435,6 +4451,7 @@ ${JSON.stringify(forAllList)}
|
|
|
}
|
|
|
});
|
|
|
this.tableWorksArray = _copyData;
|
|
|
+ this.$forceUpdate()
|
|
|
},
|
|
|
submissionTimePickerChange(){
|
|
|
let _copyData = JSON.parse(JSON.stringify(this.worksArray));
|
|
|
@@ -4450,6 +4467,7 @@ ${JSON.stringify(forAllList)}
|
|
|
})
|
|
|
|
|
|
this.tableWorksArray = _copyData;
|
|
|
+ this.$forceUpdate();
|
|
|
// this.submissionTimePicker.forEach((i, index) => {
|
|
|
// /*[null,["2024-12-05T00:00:00.000","2025-01-12T00:00:00.000"],["2024-12-04T00:00:00.000","2025-01-24T00:00:00.000"]] */
|
|
|
// if (i && i.length > 0) {
|
SanHQin