xg

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairList.vue

@@ -276,42 +276,6 @@
 
 <style lang="scss" scoped>
 	@import '@/common/uni-ui.scss';
-	// --
-	// 	.uni-badge {
-	// 		margin-left: 20rpx;
-	// 	}
-	
-	// 	/* #endif */
-	// 	.example-body {
-	// 		flex-direction: row;
-	// 		justify-content: flex-start;
-	// 	}
-	
-	// 	.uni-badge-left-margin {
-	// 		width: 20%;
-	// 	}
-	
-	// 	.uni-badge-absolute {
-	// 	}
-	
-	// 	.box {
-	// 		height: 40px;
-	// 		display: flex;
-	// 		justify-content: center;
-	// 		align-items: center;
-	// 		text-align: center;
-	// 		color: #fff;
-	// 		font-size: 12px;
-	// 	}
-	
-	// 	.box-text {
-	// 		text-align: center;
-	// 		color: #333;
-	// 		font-size: 12px;
-	// 		width: 100%;
-	// 	}
-	// --
-
 	/deep/ .segmented-control__text {
 		font-size: 1rem;
 	}

CallCenterWeb.UI/RMYYAPP/pages/myTask/reportForm/reportForm.vue

@@ -231,13 +231,17 @@
 		},
 		onLoad(option) {
 			this.reportType = option.reportType
-			if (option.reportType == 1 && !option.starttime) {
+			if(option.reportType == 1){
 				uni.setNavigationBarTitle({
 					title: '月报'
 				})
+			}
+			//默认页面入口日期
+			if (option.reportType == 1 && !option.starttime) {				
 				this.defaultStartTime = this.getDateFirstTime()
 				this.defaultEndTime = this.getDateLastTime()
 			}
+			//获取消息入口日期
 			if(option.starttime){
 				this.defaultStartTime = option.starttime
 				this.defaultEndTime = option.endtime
@@ -295,10 +299,10 @@
 						}
 						var rowData = []
 						var colData = []
-						if (response.data.dt > 0) {
+						if (response.data.dt.length > 0) {
 							response.data.dt.forEach((item, index) => {
 								rowData.push(item.dateshownew)
-								colData.push(item.allcountnew)
+								colData.push(Number(item.allcountnew))
 								this.chartData(rowData, colData)
 							})
 						} else {
@@ -553,25 +557,29 @@
 		margin-right: 10rpx;
 		text-align: right;
 		color: #333;
-		font-size: 18rpx;
+		font-size: 20rpx;
 	}
 
 	.pertitcon {
 		width: 10%;
 		display: inline-block;
-		margin-right: 10rpx;
-		text-align: right;
+		/* margin-left: 10rpx; */
+		text-align: center;
 		color: #333;
-		font-size: 17rpx;
+		font-size: 20rpx;
 	}
 
 	.perbox {
 		margin-bottom: 30rpx;
+		height: 22px;
+		line-height: 22px;
 	}
 
 	.lineper {
 		display: inline-block;
 		width: 60%;
+		line-height: 22px;
+		vertical-align: middle;
 	}
 
 	#echartbox {