From 6cf6a88d33d1ab7053ab2a325f145cc18848a708 Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Thu, 13 Oct 2022 10:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/reportExcel/dayReport.vue  | 35 +++++++++++++-------
 pages/reportExcel/weekReport.vue | 55 ++++++++++++++++++--------------
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/pages/reportExcel/dayReport.vue b/pages/reportExcel/dayReport.vue
index 3026d93..3e6b0fe 100644
--- a/pages/reportExcel/dayReport.vue
+++ b/pages/reportExcel/dayReport.vue
@@ -12,8 +12,9 @@
 					生成时间：{{ weekObj.createTime || '--' }}
 				</view>
 			</view>
-			<view class="nodata-box" style="background: url(../../static/images/nodata.png)no-repeat;background-size: contain;" v-if="nodata">
-			此项目今日还没有接待量哦～
+			<view class="nodata-box" v-if="nodata">
+				<image class="img" src="/static/images/nodata.png" mode="" />
+				<view class="text">此项目今日还没有接待量哦～</view>
 			</view>
 		<view v-if="!nodata">
 			<!-- 循环渲染的数据 -->
@@ -752,16 +753,26 @@
 			font-weight: bold !important;
 		}
 		.nodata-box{
-			width: 400rpx;
-			height: 400rpx;
-			font-size: 28rpx;
-			font-family: PingFangSC-Regular, PingFang SC;
-			font-weight: 400;
-			color: #666666;
-			line-height: 40rpx;
-			padding-top: 360rpx;
-			margin: 0 auto;
-			text-align: center;
+			width: 750rpx;
+			margin: 20rpx auto 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			background-color: #fff;
+			.img{
+				width: 400rpx;
+				height: 400rpx;
+			}
+			.text{
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 40rpx;
+				// margin-top: -40rpx;
+			}
 		}
 	}
 </style>
diff --git a/pages/reportExcel/weekReport.vue b/pages/reportExcel/weekReport.vue
index 49bae85..1f12788 100644
--- a/pages/reportExcel/weekReport.vue
+++ b/pages/reportExcel/weekReport.vue
@@ -13,9 +13,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="nodata-box" v-if="nodata" style="background: url(../../static/images/nodata.png)no-repeat;background-size: contain;" >
-			此项目本周还没有接待量哦～
-		</view>
+		<view class="nodata-box" v-if="nodata">
+				<image class="img" src="/static/images/nodata.png" mode="" />
+				<view class="text">此项目本周还没有接待量哦～</view>
+			</view>
 		<view v-if="!nodata" >
 			<!-- 简报 -->
 			<view class="briefing">
@@ -577,24 +578,20 @@
 					let data = {}
 					if(res.zkMessage.content){
 						data = JSON.parse(res.zkMessage.content)
+						this.bubbleSort(data.customerInfo1, 'pk')
+						this.bubbleSort(data.customerInfo2, 'pk')
+						data.customerInfo1.reverse()
+						data.customerInfo2.reverse()
+						this.weekObj = {
+							...res.zkMessage,
+							...data
+						}
 					}else{
 						this.nodata = true
 						this.weekObj = {
 						...res.zkMessage,
 						}
 					}
-					this.bubbleSort(data.customerInfo1, 'pk')
-					this.bubbleSort(data.customerInfo2, 'pk')
-					data.customerInfo1.reverse()
-					data.customerInfo2.reverse()
-					if(res.zkMessage.content){
-						data = JSON.parse(res.zkMessage.content)
-						this.weekObj = {
-							...res.zkMessage,
-							...data
-						}
-					}
-					
 					this.weekObj.createTimeName = this.getTimeLines(this.weekObj.weekDate, 1)
 					console.log(this.weekObj, 'this.weekObj')
 					this.projectName = res.projectName
@@ -825,16 +822,26 @@
 		}
 
 		.nodata-box{
-			width: 400rpx;
-			height: 400rpx;
-			font-size: 28rpx;
-			font-family: PingFangSC-Regular, PingFang SC;
-			font-weight: 400;
-			color: #666666;
-			line-height: 40rpx;
-			padding-top: 360rpx;
+			width: 750rpx;
+			flex: 1;
 			margin: 0 auto;
-			text-align: center;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			background-color: #fff;
+			.img{
+				width: 400rpx;
+				height: 400rpx;
+			}
+			.text{
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 40rpx;
+			}
 		}
 
 		.briefing {