Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X
This commit is contained in:
@@ -69,7 +69,6 @@ export default {
|
||||
created() {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setDate(start.getDate() - 7);
|
||||
this.dateRange = [start, end];
|
||||
this.handleQuery();
|
||||
},
|
||||
@@ -80,6 +79,10 @@ export default {
|
||||
if (this.dateRange && this.dateRange.length === 2) {
|
||||
params.startTime = this.dateRange[0];
|
||||
params.endTime = this.dateRange[1];
|
||||
} else {
|
||||
const today = new Date();
|
||||
params.startTime = this.formatDateTime(today, '00:00:00');
|
||||
params.endTime = this.formatDateTime(today, '23:59:59');
|
||||
}
|
||||
params.lineType = this.activeLine;
|
||||
getExcoilStatus(params).then(res => {
|
||||
@@ -89,6 +92,12 @@ export default {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
formatDateTime(date, time) {
|
||||
const year = date.getFullYear();
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(date.getDate()).padStart(2, '0');
|
||||
return `${year}-${month}-${day} ${time}`;
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user