|
|
@@ -1,7 +1,7 @@ |
|
|
|
<!-- |
|
|
|
* @Author: zhp |
|
|
|
* @Date: 2024-04-15 10:49:13 |
|
|
|
* @LastEditTime: 2024-07-23 18:00:55 |
|
|
|
* @LastEditTime: 2024-07-24 14:48:25 |
|
|
|
* @LastEditors: DY |
|
|
|
* @Description: |
|
|
|
--> |
|
|
@@ -39,7 +39,7 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item v-show="listQuery.type === 3" label="时间范围" prop="reportTime"> |
|
|
|
<el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year" |
|
|
|
placeholder="开始时间"> |
|
|
|
placeholder="开始时间" @change="getYear"> |
|
|
|
</el-date-picker> |
|
|
|
~ |
|
|
|
<el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year" placeholder="结束时间" |
|
|
@@ -265,6 +265,8 @@ export default { |
|
|
|
this.listQuery.endDate = null |
|
|
|
this.listQuery.startDate = null |
|
|
|
this.listQuery.reportTime = null |
|
|
|
this.listQuery.start = null |
|
|
|
this.listQuery.end = null |
|
|
|
}, |
|
|
|
otherMethods(val) { |
|
|
|
this.detailOrUpdateVisible = true; |
|
|
@@ -282,20 +284,14 @@ export default { |
|
|
|
this.listQuery.reportTime = [] |
|
|
|
this.listQuery.start = undefined |
|
|
|
this.listQuery.end = undefined |
|
|
|
// console.log(); |
|
|
|
} else { |
|
|
|
this.listQuery.startDate = this.listQuery.start |
|
|
|
this.listQuery.endDate = this.listQuery.end |
|
|
|
} |
|
|
|
if (!this.listQuery.start && !this.listQuery.end) { |
|
|
|
this.listQuery.startDate = undefined |
|
|
|
this.listQuery.endDate = undefined |
|
|
|
} |
|
|
|
// console.log(e); |
|
|
|
}, |
|
|
|
onValueChange(picker, k) { // 选中近k周后触发的操作 |
|
|
|
if (this.listQuery.start && this.listQuery.end) { |
|
|
|
console.log(this.listQuery.reportTime) |
|
|
|
// console.log(this.listQuery.start, this.listQuery.end - this.listQuery.start) |
|
|
|
this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss') |
|
|
|
this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss') |
|
|
|
const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000); |
|
|
@@ -309,11 +305,15 @@ export default { |
|
|
|
this.listQuery.startDate = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD') |
|
|
|
this.listQuery.endDate = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD') |
|
|
|
} |
|
|
|
} |
|
|
|
if (!this.listQuery.start && !this.listQuery.end) { |
|
|
|
console.log(this.listQuery.startDate, this.listQuery.endDate) |
|
|
|
} else { |
|
|
|
this.listQuery.startDate = undefined |
|
|
|
this.listQuery.endDate = undefined |
|
|
|
} |
|
|
|
// if (!this.listQuery.start && !this.listQuery.end) { |
|
|
|
// this.listQuery.startDate = undefined |
|
|
|
// this.listQuery.endDate = undefined |
|
|
|
// } |
|
|
|
}, |
|
|
|
changeDayTime() { |
|
|
|
if (this.listQuery.reportTime) { |
|
|
@@ -359,7 +359,7 @@ export default { |
|
|
|
this.$message.warning('请选择时间维度!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (!this.listQuery.startDate) { |
|
|
|
if (!this.listQuery.startDate || !this.listQuery.endDate) { |
|
|
|
this.$message.warning('请选择时间范围!') |
|
|
|
} else { |
|
|
|
await getProduceDataPage(this.listQuery).then(res => { |
|
|
|