|
|
@@ -430,10 +430,7 @@ export default {
|
|
|
.add(-1, "month")
|
|
|
.startOf("day")
|
|
|
.format("YYYY-MM")}-01`,
|
|
|
- `${dayjs().add(-1, "month").startOf("day").format("YYYY-MM")}-${dayjs()
|
|
|
- .subtract(1, "month")
|
|
|
- .endOf("month")
|
|
|
- .format("YYYY-MM-DD")}`,
|
|
|
+ `${dayjs().subtract(1,'month').endOf('month').format("YYYY-MM-DD")}`,
|
|
|
],
|
|
|
interval: 600,
|
|
|
maxs: 25,
|
|
|
@@ -617,8 +614,8 @@ export default {
|
|
|
let params = {
|
|
|
station: this.station,
|
|
|
wtIds: this.isMultiple ? this.wtIds.join(",") : this.wtIds,
|
|
|
- st: dayjs(this.st).valueOf(),
|
|
|
- et: dayjs(this.et).valueOf(),
|
|
|
+ st: dayjs(this.dateTime[0]).valueOf(),
|
|
|
+ et: dayjs(this.dateTime[1]).valueOf(),
|
|
|
interval: this.interval,
|
|
|
maxs: this.maxs,
|
|
|
mins: this.mins,
|