校园报告—门禁报告1

src/pages/SchoolReport/SchoolReport.vue

@@ -366,7 +366,7 @@
 							<view class="summary-item">
 								<text>{{['月度消费报告','实时推送','音视频通话'][tabIndex-1]}}</text>
 							</view>
-							<view class="summary-item-icon">
+							<view class="summary-item-icon" :class="['consumer-report-icon','attendance-report-icon','pubTalk-report-icon'][tabIndex-1]">
 								<text>+</text>
 							</view>
 							<view class="summary-item">
@@ -470,7 +470,7 @@
 										<text>通话次数分析</text>
 									</view>
 								</view>
-								<!-- <view class="open-results-items-details-item">
+								<view class="open-results-items-details-item">
 									<view class="leave-word-img">
 									</view>
 									<view class="open-results-items-details-item-txt">
@@ -493,7 +493,7 @@
 									<view class="open-results-items-details-item-txt">
 										<text>家庭留言分析</text>
 									</view>
-								</view> -->
+								</view>
 							</view>
 						</view>
 					</view>
@@ -572,7 +572,6 @@
 				lineDatas: [],
 				// 会员信息
 				isOpen: false,
-				isOpen: true,
 				memberInfo: {
 					leastAmount: '',
 					invalidDateStr: '',
@@ -582,7 +581,14 @@
 			}
 		},
 		mounted() {
+			if (new Date().getTime() <= new Date('2022/06/30').getTime()) {
+				this.isOpen = true;
+				this.memberInfo.invalidDateStr = '2022年6月30日';
+				this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day');
+				this.containerHeight = 4200;
+			} else {
 				this.queryIsDredgeMember();
+			}
 			let tmpArr = []
 			// 获取时间
 			for (let i = 0; i <= 11; i++) {
@@ -601,12 +607,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));
@@ -614,6 +614,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: {
 			tabTap: function(num) {
@@ -804,7 +810,7 @@
 			linechart: function(num) {
 				var mySize = document.getElementById('consumer-trend-line');
 				mySize.style.width = window.innerWidth - 20 + 'px';
-				mySize.style.height = window.innerHeight - 580 + 'px';
+				mySize.style.height = window.innerHeight - 500 + 'px';
 				var myChart = echarts.init(mySize);
 				var xdata = this.lineDatas.map(v => v.name);
 				var year = this.dataRangeArr[this.dataRangeIndex].startDate.slice(0, 4);
@@ -1022,7 +1028,7 @@
 						return
 					}
 					const tmpObj = data.obj;
-					this.isEatLow = tmpObj.canteenAmount / tmpObj.grossAmount > 0.5 ? true : false;
+					this.isEatLow = tmpObj.canteenAmount / tmpObj.grossAmount < 0.5 ? true : false;
 					if (num) {
 						this.pieDatas = [
 							[{
@@ -1791,6 +1797,7 @@
 					#consumer-preferences-pie {
 						height: 385rpx;
 						top: -60rpx;
+						z-index: 100;
 					}
 				}
 
@@ -1927,8 +1934,9 @@
 
 					#consumer-trend-line {
 						position: absolute;
-						top: 130rpx;
+						top: 120rpx;
 						left: 10rpx;
+						z-index: 100;
 					}
 
 					.consumer-trend-line-icon {
@@ -2104,8 +2112,19 @@
 						.summary-item-icon {
 							font-size: 40rpx;
 							line-height: 45rpx;
+						}
+						
+						.consumer-report-icon{
 							margin: 0 45rpx 0 70rpx;
 						}
+						
+						.attendance-report-icon{
+							margin: 0 35rpx 0 134rpx;
+						}
+						
+						.pubTalk-report-icon{
+							margin: 0 35rpx 0 102rpx;
+						}
 					}
 
 					.open-results-items-details {
@@ -2178,7 +2197,7 @@
 								width: 30rpx;
 								height: 32rpx;
 								background: no-repeat center/100% url(../../static/images/admissionAnalysis.png);
-								margin: 0 25rpx 0 112rpx;
+								margin: 0 25rpx 0 135rpx;
 							}
 
 							.admission-record-img {
@@ -2207,21 +2226,49 @@
 								width: 38rpx;
 								height: 31rpx;
 								background: no-repeat center/100% url(../../static/images/communicationAdvice.png);
-								margin: 0 24rpx 0 112rpx;
+								margin: 0 24rpx 0 165rpx;
 							}
 
-							.voice-call-img{
+							.voice-call-img {
 								width: 25rpx;
 								height: 34rpx;
 								background: no-repeat center/100% url(../../static/images/voiceCall.png);
 								margin-right: 26rpx;
 							}
 
-							.call-count-img{
+							.call-count-img {
 								width: 30rpx;
 								height: 30rpx;
 								background: no-repeat center/100% url(../../static/images/callCount.png);
-								margin: 0 31rpx 0 112rpx;
+								margin: 0 31rpx 0 165rpx;
+							}
+							
+							.leave-word-img{
+								width: 30rpx;
+								height: 28rpx;
+								background: no-repeat center/100% url(../../static/images/leaveWord.png);
+								margin-right: 22rpx;
+							}
+							
+							.call-duration-img{
+								width: 31rpx;
+								height: 35rpx;
+								background: no-repeat center/100% url(../../static/images/callDuration.png);
+								margin: 0 23rpx 0 165rpx;
+							}
+							
+							.face-call-img{
+								width: 32rpx;
+								height: 31rpx;
+								background: no-repeat center/100% url(../../static/images/faceCall.png);
+								margin-right: 21rpx;
+							}
+							
+							.leave-word-analysis-img{
+								width: 31rpx;
+								height: 31rpx;
+								background: no-repeat center/100% url(../../static/images/leaveWordAnalysis.png);
+								margin: 0 23rpx 0 165rpx;
 							}
 						}
 					}