Skip to content

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

消费报告屏蔽饭友分析，就餐时间趋势

parent 225248bc
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 83 deletions
src/pages/SchoolReport/SchoolReport.vue
View file @ a6b34e03
......@@ -400,7 +400,7 @@
</view>
</view>
</view>
<view v-show="tabIndex==1&&isOpen" class="school-report-context-card-six">
<!-- <view v-show="tabIndex==1&&isOpen" class="school-report-context-card-six">
<view class="school-report-context-card-title">
<view class="school-report-context-card-title-img">
<text>就餐时间趋势</text>
......@@ -555,7 +555,7 @@
</view>
<view id="meal-pal-bar">
</view>
</view>
</view> -->
<!-- 出入校报告 -->
<view v-show="tabIndex==2" class="attendance-report-context-card-two">
<view class="school-report-context-card-title">
......@@ -1199,24 +1199,24 @@
this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex));
this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
this.queryRepastTimeTrend().then(() => {
if (this.mealtypeArr.indexOf(1) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'breakfast-time-line',
1);
}
if (this.mealtypeArr.indexOf(2) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'lunch-time-line',
2);
}
if (this.mealtypeArr.indexOf(3) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'dinner-time-line',
3);
}
})
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'breakfast-time-line',
// 1);
// }
// if (this.mealtypeArr.indexOf(2) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'lunch-time-line',
// 2);
// }
// if (this.mealtypeArr.indexOf(3) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'dinner-time-line',
// 3);
// }
// })
} else {
this.tabIndex = 1;
this.queryIsDredgeMember(1002, 1).then(() => {
......@@ -1224,25 +1224,25 @@
.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex));
this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
this.queryRepastTimeTrend().then(() => {
if (this.mealtypeArr.indexOf(1) != -1) {
this.breakfastTimeLinechart(this
.reportTypeIndex,
'breakfast-time-line',
1);
}
if (this.mealtypeArr.indexOf(2) != -1) {
this.breakfastTimeLinechart(this
.reportTypeIndex, 'lunch-time-line',
2);
}
if (this.mealtypeArr.indexOf(3) != -1) {
this.breakfastTimeLinechart(this
.reportTypeIndex, 'dinner-time-line',
3);
}
})
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) {
// this.breakfastTimeLinechart(this
// .reportTypeIndex,
// 'breakfast-time-line',
// 1);
// }
// if (this.mealtypeArr.indexOf(2) != -1) {
// this.breakfastTimeLinechart(this
// .reportTypeIndex, 'lunch-time-line',
// 2);
// }
// if (this.mealtypeArr.indexOf(3) != -1) {
// this.breakfastTimeLinechart(this
// .reportTypeIndex, 'dinner-time-line',
// 3);
// }
// })
});
}
})
......@@ -1256,29 +1256,29 @@
this.containerHeight = 4200;
this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
this.queryRepastTimeTrend().then(() => {
if (this.mealtypeArr.indexOf(1) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'breakfast-time-line',
1);
}
if (this.mealtypeArr.indexOf(2) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex, 'lunch-time-line',
2);
}
if (this.mealtypeArr.indexOf(3) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex, 'dinner-time-line',
3);
}
})
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'breakfast-time-line',
// 1);
// }
// if (this.mealtypeArr.indexOf(2) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex, 'lunch-time-line',
// 2);
// }
// if (this.mealtypeArr.indexOf(3) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex, 'dinner-time-line',
// 3);
// }
// })
} else {
this.tabIndex = 1;
this.queryIsDredgeMember(1002, 1).then(() => {
this.queryConsumerSummaryAmount();
this.queryDayConsumerTrend();
this.queryMealPalAnalyse();
this.queryRepastTimeTrend();
// this.queryMealPalAnalyse();
// this.queryRepastTimeTrend();
})
}
}
......@@ -1363,29 +1363,29 @@
}
});
this.queryConsumerSummaryAmount();
this.queryIsDredgeMember(1002,1).then(() => {
this.queryIsDredgeMember(1002, 1).then(() => {
if (this.isOpen) {
this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex));
this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
this.queryRepastTimeTrend().then(() => {
if (this.mealtypeArr.indexOf(1) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'breakfast-time-line',
1);
}
if (this.mealtypeArr.indexOf(2) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'lunch-time-line',
2);
}
if (this.mealtypeArr.indexOf(3) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'dinner-time-line',
3);
}
})
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'breakfast-time-line',
// 1);
// }
// if (this.mealtypeArr.indexOf(2) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'lunch-time-line',
// 2);
// }
// if (this.mealtypeArr.indexOf(3) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'dinner-time-line',
// 3);
// }
// })
} else {
this.queryConsumerSummaryAmount();
this.queryDayConsumerTrend();
......@@ -2620,9 +2620,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
return
}
this.mealPalData = data.obj || [];
this.mealPalArr = this.mealPalData.length?this.mealPalData.map(v => v.mealpalname.slice(0, 1) +
'**'):[];
this.mealPalStr = this.mealPalArr.length?this.mealPalArr.join('、'):'';
this.mealPalArr = this.mealPalData.length ? this.mealPalData.map(v => v.mealpalname.slice(0, 1) +
'**') : [];
this.mealPalStr = this.mealPalArr.length ? this.mealPalArr.join('、') : '';
} catch (e) {
//TODO handle the exception
console.log(e);
......@@ -2680,11 +2680,13 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
1)[0].cateringList) {
this.mealtypeArr.push(1)
}
if (data.obj && data.obj.filter(e => e.mealtype == 2).length && data.obj.filter(e => e.mealtype == 2)[0]
if (data.obj && data.obj.filter(e => e.mealtype == 2).length && data.obj.filter(e => e.mealtype ==
2)[0]
.cateringList) {
this.mealtypeArr.push(2)
}
if (data.obj && data.obj.filter(e => e.mealtype == 3).length && data.obj.filter(e => e.mealtype == 3)[0]
if (data.obj && data.obj.filter(e => e.mealtype == 3).length && data.obj.filter(e => e.mealtype ==
3)[0]
.cateringList) {
this.mealtypeArr.push(3)
}
......
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