Skip to content

X
xzf_uniapp-wechat-web
Commit d6d68488 authored by 袁玲利's avatar 袁玲利
Browse files
Options

是否在高峰期内优化

parent d886b04b
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 81 deletions
src/pages/SchoolReport/SchoolReport.vue
View file @ d6d68488
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-else class="nodata"> <view v-else class="nodata" @click="initData">
<view class="nodataImg"> <view class="nodataImg">
<img style="width: 35vw" :src="nodataImgUrl + 'images/1.png'" /> <img style="width: 35vw" :src="nodataImgUrl + 'images/1.png'" />
</view> </view>
...@@ -614,18 +614,54 @@ export default { ...@@ -614,18 +614,54 @@ export default {
}; };
}, },
mounted() { mounted() {
// 判断是否在高峰期内 this.initData()
if (this.isPeakPeriod()) { },
this.showReport = false; methods: {
} else { initData() {
this.showReport = true; // console.log(this.isPeakPeriod(), '是否在高峰期内')
this.queryIsDredgeMember().then(() => { // 判断是否在高峰期内
if (this.isOpen) { if (this.isPeakPeriod()) {
this.queryMemberValidTime().then((e) => { this.showReport = false;
if ( } else {
new Date(this.memberInfo.invalidDate).getTime() <= this.showReport = true;
new Date("2022/06/30").getTime() this.queryIsDredgeMember().then(() => {
) { if (this.isOpen) {
this.queryMemberValidTime().then((e) => {
if (
new Date(this.memberInfo.invalidDate).getTime() <=
new Date("2022/06/30").getTime()
) {
this.isOpen = true;
this.memberInfo.invalidDateStr = "2022年6月30日";
this.memberInfo.differDay = dayjs("2022/06/30").diff(
dayjs(),
"day"
);
this.containerHeight = 4200;
this.queryStudentConsumerPreference(1).then((e) =>
this.piechart()
);
this.queryDayConsumerTrend(1).then((e) =>
this.linechart(this.reportTypeIndex)
);
} else {
this.queryIsDredgeMember(1).then(() => {
if (this.isOpen) {
this.queryStudentConsumerPreference(1).then((e) =>
this.piechart()
);
this.queryDayConsumerTrend(1).then((e) =>
this.linechart(this.reportTypeIndex)
);
} else {
this.queryStudentConsumerPreference();
this.queryDayConsumerTrend();
}
});
}
});
} else {
if (new Date().getTime() <= new Date("2022/06/30").getTime()) {
this.isOpen = true; this.isOpen = true;
this.memberInfo.invalidDateStr = "2022年6月30日"; this.memberInfo.invalidDateStr = "2022年6月30日";
this.memberInfo.differDay = dayjs("2022/06/30").diff( this.memberInfo.differDay = dayjs("2022/06/30").diff(
...@@ -654,78 +690,52 @@ export default { ...@@ -654,78 +690,52 @@ export default {
} }
}); });
} }
});
} else {
if (new Date().getTime() <= new Date("2022/06/30").getTime()) {
this.isOpen = true;
this.memberInfo.invalidDateStr = "2022年6月30日";
this.memberInfo.differDay = dayjs("2022/06/30").diff(
dayjs(),
"day"
);
this.containerHeight = 4200;
this.queryStudentConsumerPreference(1).then((e) => this.piechart());
this.queryDayConsumerTrend(1).then((e) =>
this.linechart(this.reportTypeIndex)
);
} else {
this.queryIsDredgeMember(1).then(() => {
if (this.isOpen) {
this.queryStudentConsumerPreference(1).then((e) =>
this.piechart()
);
this.queryDayConsumerTrend(1).then((e) =>
this.linechart(this.reportTypeIndex)
);
} else {
this.queryStudentConsumerPreference();
this.queryDayConsumerTrend();
}
});
} }
});
let tmpArr = [];
// 获取时间
for (let i = 0; i <= 11; i++) {
let startWeek = dayjs().subtract(i, "month").startOf("month");
let endWeek =
dayjs().$d.getTime() >
dayjs().subtract(i, "month").endOf("month").$d.getTime()
? dayjs().subtract(i, "month").endOf("month")
: dayjs();
tmpArr.push({
week:
startWeek.format("YYYY/MM/DD") +
"~" +
endWeek.format("YYYY/MM/DD"),
weekstr: startWeek.format("MM/DD") + "~" + endWeek.format("MM/DD"),
startDate: startWeek.format("YYYY-MM-DD"),
endDate: endWeek.format("YYYY-MM-DD"),
});
} }
}); this.dataRangeArr = tmpArr;
let tmpArr = []; this.minDate = new Date(
// 获取时间 this.dataRangeArr[this.dataRangeIndex].startDate
for (let i = 0; i <= 11; i++) { );
let startWeek = dayjs().subtract(i, "month").startOf("month"); this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate);
let endWeek = this.diningSituations.diningSituationsRequestDate =
dayjs().$d.getTime() > this.dataRangeArr[this.dataRangeIndex].startDate;
dayjs().subtract(i, "month").endOf("month").$d.getTime() this.diningSituations.diningSituationsDate = this.formatDate(
? dayjs().subtract(i, "month").endOf("month") this.minDate
: dayjs(); );
tmpArr.push({ this.queryCampusStudentInfo();
week: let tmpDate = this.formatDateTwo(this.minDate);
startWeek.format("YYYY/MM/DD") + "~" + endWeek.format("YYYY/MM/DD"), this.queryNotRepastDetails(
weekstr: startWeek.format("MM/DD") + "~" + endWeek.format("MM/DD"), this.dataRangeArr[this.dataRangeIndex].startDate,
startDate: startWeek.format("YYYY-MM-DD"), this.dataRangeArr[this.dataRangeIndex].endDate
endDate: endWeek.format("YYYY-MM-DD"), ).then(() => {
let today = this.diningSituations.notRepastDetailsDTOS.filter(
(e) => e.repastDate === tmpDate
)[0];
this.diningSituations.notRepastDetails = today;
}); });
this.queryConsumerTrend();
} }
this.dataRangeArr = tmpArr; },
this.minDate = new Date(this.dataRangeArr[this.dataRangeIndex].startDate); // 当天6：30 ~ 9：00，11：30 ~ 12：00， 17：30 ~ 19：00属于高峰期
this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate);
this.diningSituations.diningSituationsRequestDate =
this.dataRangeArr[this.dataRangeIndex].startDate;
this.diningSituations.diningSituationsDate = this.formatDate(
this.minDate
);
this.queryCampusStudentInfo();
let tmpDate = this.formatDateTwo(this.minDate);
this.queryNotRepastDetails(
this.dataRangeArr[this.dataRangeIndex].startDate,
this.dataRangeArr[this.dataRangeIndex].endDate
).then(() => {
let today = this.diningSituations.notRepastDetailsDTOS.filter(
(e) => e.repastDate === tmpDate
)[0];
this.diningSituations.notRepastDetails = today;
});
this.queryConsumerTrend();
}
},
methods: {
// 当天6：30 ~ 9：00，11：30 ~ 12：00， 17：30 ~ 19：00属于高峰期
isPeakPeriod() { isPeakPeriod() {
let first = this.timeIn("06:30:00", "09:00:00"); let first = this.timeIn("06:30:00", "09:00:00");
let second = this.timeIn("11:00:00", "12:00:00"); let second = this.timeIn("11:00:00", "12:00:00");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment