hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 03:16:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'report-master'

Browse Source
This commit is contained in:
BOE\10867418
2023-09-12 09:20:46 +08:00
parent 3a002f5686 a4398bd7b6
commit a39f07c7d7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/report/Operational.vue
View File

@@ -888,7 +888,7 @@ export default {
if (e?.length > 0) {
const monthEnd = dayjs(e[1])
.endOf("month")
.format("YYYY-MM-DD hh:mm:ss");
.format("YYYY-MM-DD 23:59:59");
const res = await api.dataStatisticsSelectV1({
startTime: dayjs(e[0]).format("YYYY-MM-01 00:00:01"),
endTime: monthEnd,
@@ -924,7 +924,7 @@ export default {
const dayStart = dayjs(e[0])
.startOf("day")
.format("YYYY-MM-DD 00:00:01");
const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD hh:mm:ss");
const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD 23:59:59");
const res = await api.dataStatisticsSelectV1({
startTime: dayStart,
endTime: dayEnd,
@@ -973,7 +973,7 @@ export default {
.format("YYYY-MM-DD 00:00:01");
const dayEnd = dayjs(state.threeDay[1])
.endOf("day")
.format("YYYY-MM-DD hh:mm:ss");
.format("YYYY-MM-DD 23:59:59");
axios({
method: "post",
url: "/report/data/statistics/export/v1",
@@ -1001,7 +1001,7 @@ export default {
} else {
const monthEnd = dayjs(state.threeTime[1])
.endOf("month")
.format("YYYY-MM-DD hh:mm:ss");
.format("YYYY-MM-DD 23:59:59");
axios({
method: "post",
url: "/report/data/statistics/export/v1",
@@ -1039,7 +1039,7 @@ export default {
if (e?.length > 0) {
const monthEnd = dayjs(e[1])
.endOf("month")
.format("YYYY-MM-DD hh:mm:ss");
.format("YYYY-MM-DD 23:59:59");
const res = await api.dataStatisticsSelectV2({
startTime: dayjs(e[0]).format("YYYY-MM-01 00:00:01"),
endTime: monthEnd,
@@ -1075,7 +1075,7 @@ export default {
const dayStart = dayjs(e[0])
.startOf("day")
.format("YYYY-MM-DD 00:00:01");
const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD hh:mm:ss");
const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD 23:59:59");
const res = await api.dataStatisticsSelectV2({
startTime: dayStart,
endTime: dayEnd,
@@ -1117,7 +1117,7 @@ export default {
.format("YYYY-MM-DD 00:00:01");
const dayEnd = dayjs(state.forDay[1])
.endOf("day")
.format("YYYY-MM-DD hh:mm:ss");
.format("YYYY-MM-DD 23:59:59");
axios({
method: "post",
url: "/report/data/statistics/export/v2",
@@ -1145,7 +1145,7 @@ export default {
} else {
const monthEnd = dayjs(state.forTime[1])
.endOf("month")
.format("YYYY-MM-DD hh:mm:ss");
.format("YYYY-MM-DD 23:59:59");
axios({
method: "post",
url: "/report/data/statistics/export/v2",