Merge branch 'V1.7.3_report_feature' into develop

src/pages/SchoolReport/SchoolReport.vue

@@ -318,8 +318,12 @@
 								:key="index" class="consumer-details-sum">
 								<view v-for="(e,i) in item.consumerDetailsSumArr" class="consumer-details-sum-item"
 									:key="i" :class="i?'':'consumer-details-sum-type'">
-									<text :style="{color:item.calculateType=='较上月'?trendColorList[i]:''}"> {{e}} </text>
-									<template v-if="i ==0"><span class="type-unit">{{unitTypeList[index]}}</span></template>
+									<text :style="{color:item.calculateType=='较上'?trendColorList[i]:''}"> {{e}} </text>
+									<template v-if="item.calculateType=='较上'&&i == 0">
+										<span>{{['月','周'][reportTypeIndex]}}</span>
+									</template>
+									<template v-if="i == 0"><span
+											class="type-unit">{{unitTypeList[index]}}</span></template>
 								</view>
 							</view>
 						</view>
@@ -1362,36 +1366,10 @@
 								this.memberInfo.invalidDateStr = '2022年6月30日';
 								this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day') + 1;
 								this.containerHeight = 4200;
-								this.queryConsumerSummaryAmount(1).then(e => this.piechart());
-								this.queryLivingCostsAmount();
-								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);
-								// 	}
-								// })
 							} else {
 								this.tabIndex = 1;
-								this.queryIsDredgeMember(1002, 1).then(() => {
-									this.queryConsumerSummaryAmount(1).then(e => this
-										.piechart());
-									this.queryLivingCostsAmount();
-									this.queryDayConsumerTrend(1).then(e => this.linechart(this
-										.reportTypeIndex));
+								this.queryIsDredgeMember(1002, 1)
+							}
 							// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
 							// this.queryRepastTimeTrend().then(() => {
 							// 	if (this.mealtypeArr.indexOf(1) != -1) {
@@ -1411,8 +1389,11 @@
 							// 			3);
 							// 	}
 							// })
-								});
-							}
+							this.queryConsumerSummaryAmount(1).then(e => this
+								.piechart());
+							this.queryLivingCostsAmount();
+							this.queryDayConsumerTrend(1).then(e => this.linechart(this
+								.reportTypeIndex));
 							this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate,
 								this.dataRangeArr[this
 									.dataRangeIndex].endDate).then(() => {
@@ -1458,7 +1439,6 @@
 							this.tabIndex = 1;
 							this.queryIsDredgeMember(1002, 1).then(() => {
 								this.queryConsumerSummaryAmount();
-								this.queryLivingCostsAmount();
 								this.queryDayConsumerTrend();
 								// this.queryMealPalAnalyse();
 								// this.queryRepastTimeTrend();
@@ -2599,11 +2579,11 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 								.sortCalculateType);
 							let tmpColorList = [''];
 							this.campusConsumerDetailObj.campusConsumerDetailCalculateList.forEach((e, index) => {
-								e.calculateType = ['就餐', '未就餐', '均值', '较上月', '总计'][e
+								e.calculateType = ['就餐', '未就餐', '均值', '较上', '总计'][e
 									.calculateType -
 									1
 								];
-								if (e.calculateType == '较上月') {
+								if (e.calculateType == '较上') {
 									for (let item in e) {
 										if (item != 'calculateType') {
 											if (e[item] > 0) {
@@ -2660,7 +2640,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 						this.campusConsumerDetailObj.campusConsumerDetailList = JSON.parse(JSON.stringify(
 							tmpDetailList));
 						let tmpCalculatList = [];
-						let calculateTypeList = ['就餐', '未就餐', '均值', '较上月', '总计'];
+						let calculateTypeList = ['就餐', '未就餐', '均值', '较上', '总计'];
 						calculateTypeList.forEach(e => {
 							tmpCalculatList.push({
 								"calculateType": e,