提交更新1

src/pages/SchoolReport/SchoolReport.vue

@@ -516,10 +516,12 @@
 			this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex].startDate;
 			this.diningSituations.diningSituationsDate = this.formatDate(this.minDate);
 			this.queryCampusStudentInfo();
-			this.queryNotRepastDetails(this.diningSituations.diningSituationsRequestDate, this.diningSituations
-				.diningSituationsRequestDate, 1);
+			let tmpDate=this.formatDateTwo(this.minDate);
 			this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
-				.dataRangeIndex].endDate, 2);
+				.dataRangeIndex].endDate).then(()=>{
+					let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate === tmpDate)[0];
+					this.diningSituations.notRepastDetails = today;
+				});
 			this.queryConsumerTrend();
 		},
 		methods: {
@@ -606,10 +608,12 @@
 				this.diningSituations.diningSituationsDate = this.formatDate(this.minDate);
 				this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex]
 					.startDate;
-				this.queryNotRepastDetails(this.diningSituations.diningSituationsRequestDate, this.diningSituations
-					.diningSituationsRequestDate, 1);
+				let tmpDate=this.formatDateTwo(this.minDate);
 				this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
-					.dataRangeIndex].endDate, 2);
+					.dataRangeIndex].endDate).then(()=>{
+					let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate === tmpDate)[0];
+					this.diningSituations.notRepastDetails = today;
+				});;
 				this.queryConsumerTrend();
 				if (this.isOpen) {
 					this.queryStudentConsumerPreference(1).then(e => this.piechart());
@@ -649,7 +653,8 @@
 				this.diningSituations.diningSituationsDate = this.formatDate(date);
 				var dateStr =
 					`${date.getFullYear()}-${date.getMonth()<9?'0'+(date.getMonth()+1):date.getMonth()+1}-${date.getDate()<10?'0'+date.getDate():date.getDate()}`;
-				this.queryNotRepastDetails(dateStr, dateStr, 1);
+				let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate === dateStr)[0];
+				this.diningSituations.notRepastDetails = today;
 			},
 			piechart: function() {
 				var myChart = echarts.init(document.getElementById('consumer-preferences-pie'));
@@ -857,11 +862,10 @@
 				}
 			},
 			// 查询就餐情况
-			async queryNotRepastDetails(startDate, endDate, num) {
+			async queryNotRepastDetails(startDate, endDate) {
 				try {
 					let data = await this.$http.get({
-						url: gHost +
-							'/report-push/campus-consumer-report/queryNotRepastDetails'
+						url: gHost +'/report-push/campus-consumer-report/queryNotRepastDetails'
 					}, {
 						schoolId: getQueryParams('schoolId'),
 						userId: getQueryParams('userId'),
@@ -876,11 +880,6 @@
 						})
 						return
 					}
-					switch (num) {
-						case 1:
-							this.diningSituations.notRepastDetails = data.obj.notRepastDetailsDTOS[0];
-							break;
-						case 2:
 					this.diningSituations.notRepastDay = data.obj.notRepastDay;
 					this.diningSituations.notRepastDetailsDTOS = data.obj.notRepastDetailsDTOS;
 					this.diningSituations.cateringLevel = data.obj.cateringLevel;
@@ -893,8 +892,6 @@
 						'早餐吃好，一天才能活力满满哦',
 						'及时补充能量，下午才能集中精神学习哦', '晚餐好好吃，身体才能更健康'
 					][this.diningSituations.cateringLevel - 1] : '';
-							break;
-					}
 			} catch (e) {
 				//TODO handle the exception
 				console.log(e);