liuzhihui лет назад: 2
Родитель
Сommit
802f86c74f

+ 0 - 36
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairList.vue

276
 
276
 
277
 <style lang="scss" scoped>
277
 <style lang="scss" scoped>
278
 	@import '@/common/uni-ui.scss';
278
 	@import '@/common/uni-ui.scss';
279
-	// --
280
-	// 	.uni-badge {
281
-	// 		margin-left: 20rpx;
282
-	// 	}
283
-	
284
-	// 	/* #endif */
285
-	// 	.example-body {
286
-	// 		flex-direction: row;
287
-	// 		justify-content: flex-start;
288
-	// 	}
289
-	
290
-	// 	.uni-badge-left-margin {
291
-	// 		width: 20%;
292
-	// 	}
293
-	
294
-	// 	.uni-badge-absolute {
295
-	// 	}
296
-	
297
-	// 	.box {
298
-	// 		height: 40px;
299
-	// 		display: flex;
300
-	// 		justify-content: center;
301
-	// 		align-items: center;
302
-	// 		text-align: center;
303
-	// 		color: #fff;
304
-	// 		font-size: 12px;
305
-	// 	}
306
-	
307
-	// 	.box-text {
308
-	// 		text-align: center;
309
-	// 		color: #333;
310
-	// 		font-size: 12px;
311
-	// 		width: 100%;
312
-	// 	}
313
-	// --
314
-
315
 	/deep/ .segmented-control__text {
279
 	/deep/ .segmented-control__text {
316
 		font-size: 1rem;
280
 		font-size: 1rem;
317
 	}
281
 	}

+ 15 - 7
CallCenterWeb.UI/RMYYAPP/pages/myTask/reportForm/reportForm.vue

231
 		},
231
 		},
232
 		onLoad(option) {
232
 		onLoad(option) {
233
 			this.reportType = option.reportType
233
 			this.reportType = option.reportType
234
-			if (option.reportType == 1 && !option.starttime) {
234
+			if(option.reportType == 1){
235
 				uni.setNavigationBarTitle({
235
 				uni.setNavigationBarTitle({
236
 					title: '月报'
236
 					title: '月报'
237
 				})
237
 				})
238
+			}
239
+			//默认页面入口日期
240
+			if (option.reportType == 1 && !option.starttime) {				
238
 				this.defaultStartTime = this.getDateFirstTime()
241
 				this.defaultStartTime = this.getDateFirstTime()
239
 				this.defaultEndTime = this.getDateLastTime()
242
 				this.defaultEndTime = this.getDateLastTime()
240
 			}
243
 			}
244
+			//获取消息入口日期
241
 			if(option.starttime){
245
 			if(option.starttime){
242
 				this.defaultStartTime = option.starttime
246
 				this.defaultStartTime = option.starttime
243
 				this.defaultEndTime = option.endtime
247
 				this.defaultEndTime = option.endtime
295
 						}
299
 						}
296
 						var rowData = []
300
 						var rowData = []
297
 						var colData = []
301
 						var colData = []
298
-						if (response.data.dt > 0) {
302
+						if (response.data.dt.length > 0) {
299
 							response.data.dt.forEach((item, index) => {
303
 							response.data.dt.forEach((item, index) => {
300
 								rowData.push(item.dateshownew)
304
 								rowData.push(item.dateshownew)
301
-								colData.push(item.allcountnew)
305
+								colData.push(Number(item.allcountnew))
302
 								this.chartData(rowData, colData)
306
 								this.chartData(rowData, colData)
303
 							})
307
 							})
304
 						} else {
308
 						} else {
553
 		margin-right: 10rpx;
557
 		margin-right: 10rpx;
554
 		text-align: right;
558
 		text-align: right;
555
 		color: #333;
559
 		color: #333;
556
-		font-size: 18rpx;
560
+		font-size: 20rpx;
557
 	}
561
 	}
558
 
562
 
559
 	.pertitcon {
563
 	.pertitcon {
560
 		width: 10%;
564
 		width: 10%;
561
 		display: inline-block;
565
 		display: inline-block;
562
-		margin-right: 10rpx;
563
-		text-align: right;
566
+		/* margin-left: 10rpx; */
567
+		text-align: center;
564
 		color: #333;
568
 		color: #333;
565
-		font-size: 17rpx;
569
+		font-size: 20rpx;
566
 	}
570
 	}
567
 
571
 
568
 	.perbox {
572
 	.perbox {
569
 		margin-bottom: 30rpx;
573
 		margin-bottom: 30rpx;
574
+		height: 22px;
575
+		line-height: 22px;
570
 	}
576
 	}
571
 
577
 
572
 	.lineper {
578
 	.lineper {
573
 		display: inline-block;
579
 		display: inline-block;
574
 		width: 60%;
580
 		width: 60%;
581
+		line-height: 22px;
582
+		vertical-align: middle;
575
 	}
583
 	}
576
 
584
 
577
 	#echartbox {
585
 	#echartbox {