Skip to content

X
xzf_uniapp-wechat-web
Commit 5400418d authored by aifen@azjy1.onexmail.com's avatar aifen@azjy1.onexmail.com
Browse files
Options

校园报告优化提交更新

parent d075bda8
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 16 deletions
src/pages/SchoolReport/SchoolReport.vue
View file @ 5400418d
...@@ -1277,6 +1277,8 @@ ...@@ -1277,6 +1277,8 @@
this.queryIsDredgeMember(1002, 1).then(() => { this.queryIsDredgeMember(1002, 1).then(() => {
this.queryConsumerSummaryAmount(); this.queryConsumerSummaryAmount();
this.queryDayConsumerTrend(); this.queryDayConsumerTrend();
this.queryMealPalAnalyse();
this.queryRepastTimeTrend();
}) })
} }
} }
...@@ -1785,6 +1787,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -1785,6 +1787,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
myLineChart.resize(); myLineChart.resize();
}) })
}, },
// 就餐时间趋势
breakfastTimeLinechart: function(num, eleId, mealtype) { breakfastTimeLinechart: function(num, eleId, mealtype) {
var mySize = document.getElementById(eleId); var mySize = document.getElementById(eleId);
mySize.style.width = 350 + 'px'; mySize.style.width = 350 + 'px';
...@@ -1818,10 +1821,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -1818,10 +1821,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
var minDate = new Date(yMidPoint).setHours(new Date(yMidPoint).getHours() == 0 ? 23 : new Date( var minDate = new Date(yMidPoint).setHours(new Date(yMidPoint).getHours() == 0 ? 23 : new Date(
yMidPoint).getHours() - 1); yMidPoint).getHours() - 1);
var xdata = breakfastTimeData.map(e => e.repasttime.slice(5)); var xdata = breakfastTimeData.map(e => e.repasttime.slice(5));
// var year = this.dataRangeArr[this.dataRangeIndex].startDate.slice(0, 4); var year = this.dataRangeArr[this.dataRangeIndex].startDate.slice(0, 4);
// var month = this.dataRangeArr[this.dataRangeIndex].startDate.slice(5, 7); var month = this.dataRangeArr[this.dataRangeIndex].startDate.slice(5, 7);
var year = '2022';
var month = '05';
var saturdayList = this.getMonthSaturdayDate(year, month); var saturdayList = this.getMonthSaturdayDate(year, month);
var seriesDataOne = []; var seriesDataOne = [];
var seriesDataTwo = []; var seriesDataTwo = [];
...@@ -2606,12 +2607,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2606,12 +2607,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
studentId: getQueryParams('userId'), studentId: getQueryParams('userId'),
startDate: '2022-06-26', startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
endDate: '2022-07-04', endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
timeType: 1 timeType: this.dataRangeIndex == 0 ? 2 : 1
// startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
// endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
// timeType: this.dataRangeIndex == 0 ? 2 : 1
}) })
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
...@@ -2663,12 +2661,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2663,12 +2661,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
startDate: '2022-05-01', startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
endDate: '2022-05-31', endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
timeType: 1 timeType: this.dataRangeIndex == 0 ? 2 : 1
// startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
// endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
// timeType: this.dataRangeIndex == 0 ? 2 : 1
}) })
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
......
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