Merge branch 'V1.6.9_feature' into develop

src/pages/SchoolReport/SchoolReport.vue

@@ -450,7 +450,13 @@
 			}
 		},
 		mounted() {
-			this.queryIsDredgeMember();
+			if(new Date().getTime()<=new Date('2022/06/30').getTime()){
+				this.isOpen=true;
+				this.queryMemberValidTime();
+				this.containerHeight = 4200;
+			}else{
+				this.queryIsDredgeMember();
+			}
 			let tmpArr = []
 			// 获取时间
 			for (let i = 0; i <= 11; i++) {
@@ -469,12 +475,6 @@
 			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();
-			this.queryNotRepastDetails(this.diningSituations.diningSituationsRequestDate, this.diningSituations
-				.diningSituationsRequestDate, 1);
-			this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
-				.dataRangeIndex].endDate, 2);
-			this.queryConsumerTrend();
 			if (this.isOpen) {
 				this.queryStudentConsumerPreference(1).then(e => this.piechart());
 				this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
@@ -482,6 +482,12 @@
 				this.queryStudentConsumerPreference();
 				this.queryDayConsumerTrend();
 			}
+			this.queryCampusStudentInfo();
+			this.queryNotRepastDetails(this.diningSituations.diningSituationsRequestDate, this.diningSituations
+				.diningSituationsRequestDate, 1);
+			this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
+				.dataRangeIndex].endDate, 2);
+			this.queryConsumerTrend();
 		},
 		methods: {
 			toImage: function() {
@@ -1564,6 +1570,7 @@
 					#consumer-preferences-pie {
 						height: 385rpx;
 						top: -60rpx;
+						z-index: 100;
 					}
 				}
 
@@ -1700,8 +1707,9 @@
 
 					#consumer-trend-line {
 						position: absolute;
-						top: 130rpx;
+						top: 120rpx;
 						left: 10rpx;
+						z-index:100;
 					}
 
 					.consumer-trend-line-icon {