From e88d5c69364aab1fe0cf204f17e49f4457c1f154 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Tue, 24 Aug 2021 18:57:17 +0800
Subject: [PATCH] init

---
 pages/center/Piabodata/TrendAnalysis.vue      | 107 ++++++++++++------
 .../js_sdk/u-charts/config-ucharts.js         |   2 +-
 2 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue
index 5c6671a..63268e7 100644
--- a/pages/center/Piabodata/TrendAnalysis.vue
+++ b/pages/center/Piabodata/TrendAnalysis.vue
@@ -45,9 +45,17 @@
 		<view class="boxzonglan" style="min-height: 100rpx;">
 			<view class="zonglantit">简报</view>
 			<view class="zonglanbox">
-				<view class="grid" v-for="(item,index) in numlist" :key="index">
-					<view class="audonum">{{item.name}}</text></view>
-					<view class="num">{{item.num}}</view>
+				<view class="grid" v-for="(item,index) in numlist" :key="index" style="width: 80%;margin-left: 10%;">
+					<view class="audonum">{{item.name}}</view>
+					<view class="num" style="display: flex;">
+					<view class="" style="width: 35%;">
+						{{item.num}}
+					</view>
+					<view class="comparesize" v-if="compareFlag&&timepickpickisshow">
+						<text style="margin-right: 10rpx;">对比：{{item.num1}} </text>
+						<text :style="{color:item.num2*1>0?'red':'green'}">{{item.num2}}</text>
+					</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -72,11 +80,11 @@
 		
 		
 		<view class="chart">
-			<view style="display: flex;justify-content:center;padding-left: 30rpx;padding-right: 30rpx;">
+			<!-- <view style="display: flex;justify-content:center;padding-left: 30rpx;padding-right: 30rpx;">
 				<view class="title2-che">执行率
 					<image class="righttochoose" src="../../../static/images/righttochoose.png" mode=""></image>
 				</view>
-			</view>
+			</view> -->
 			
 			<view style="display: flex;justify-content:center;padding-left: 30rpx;padding-right: 30rpx;" v-if="guwenshow">
 				<view class="title2-che">选择顾问
@@ -151,7 +159,7 @@
 		</view>
 		
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
-		<view class="single">
+		<view class="single" v-if="timepickpickisshow">
 			<view class="title">
 				<view class="title1">对比报表</view>
 			</view>
@@ -162,29 +170,13 @@
 					<view class="th"  style="width: 20%;border-right:1px solid #E0E0E0;">时段2</view>
 					<view class="th"  style="width: 30%;">变化</view>
 				</view>
-				<view class="tr">
-					<view class="td" style="width: 30%;border-right:1px solid #E0E0E0;">06-20 VS 06-10</view>
-					<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">500</view>
-					<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">60</view>
-					<view class="td" style="width: 30%;">+500(+19.83%)</view>
-				</view>
-				<view class="tr">
-					<view class="td" style="width: 30%;border-right:1px solid #E0E0E0;">06-20 VS 06-10</view>
-					<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">500</view>
-					<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">60</view>
-					<view class="td" style="width: 30%;">+500(+19.83%)</view>
-				</view>
-				<view class="tr">
-					<view class="td" style="width: 30%;border-right:1px solid #E0E0E0;">06-20 VS 06-10</view>
-					<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">500</view>
-					<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">60</view>
-					<view class="td" style="width: 30%;">+500(+19.83%)</view>
-				</view>
-				<view class="tr">
-					<view class="td" style="width: 30%;border-right:1px solid #E0E0E0;">06-20 VS 06-10</view>
-					<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">500</view>
-					<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">60</view>
-					<view class="td" style="width: 30%;">+500(+19.83%)</view>
+				<view v-for="(item,index) in tableDate" :key="index">
+					<view class="tr">
+						<view class="td" style="width: 30%;border-right:1px solid #E0E0E0;">{{item.time}}</view>
+						<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">{{item.time1}}</view>
+						<view class="td" style="width: 20%;border-right:1px solid #E0E0E0;">{{item.time2}}</view>
+						<view class="td" style="width: 30%;">{{item.compare}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -216,10 +208,11 @@
 	export default {
 		data() {
 			return {
+				compareFlag:false,
 				numlist:[
-					{name:'接待量',num:'10'},
-					{name:'平均执行率',num:'10'},
-					{name:'接待客户',num:'10'},
+					{name:'接待量',num:'10',num1:'0',num2:'0'},
+					{name:'平均执行率',num:'10',num1:'0',num2:'0'},
+					{name:'接待时长',num:'10',num1:'0',num2:'0'},
 				],
 				activeTotal: 0, //时间下标
 				newactiveTotal: 0, //tab下标
@@ -285,7 +278,33 @@
 				timepickpickisshow: false,
 				sheartime1: "",
 				sheartime2: "",
-				intervaltime: 0
+				intervaltime: 0,
+				tableDate:[
+					{
+						time:'06-20 VS 06-10',
+						time1:'500',
+						time2:'60',
+						compare:'+500(+19.83%)'
+					},
+					{
+						time:'06-20 VS 06-10',
+						time1:'500',
+						time2:'60',
+						compare:'+500(+19.83%)'
+					},
+					{
+						time:'06-20 VS 06-10',
+						time1:'500',
+						time2:'60',
+						compare:'+500(+19.83%)'
+					},
+					{
+						time:'06-20 VS 06-10',
+						time1:'500',
+						time2:'60',
+						compare:'+500(+19.83%)'
+					},
+				]
 			};
 
 		},
@@ -354,7 +373,21 @@
 				this.$u.post("/cusLvStatistics/lyAndcp", this.pamect).then(data => {
 					this.pamect.lastStartDate = data.lastStartDate;
 					this.pamect.lastEndDate = data.lastEndDate;
-
+					this.numlist[0].num=data.startSumCustomer
+					this.numlist[1].num=data.startFraction;
+					this.numlist[2].num=data.startSumDuration;
+					if(data.endSumDuration!=null){
+						this.compareFlag=true
+						// return
+						this.numlist[0].num1=data.endSumCustomer
+						this.numlist[1].num1=data.endFraction;
+						this.numlist[2].num1=data.endSumDuration;
+						this.numlist[0].num2=data.contrastSumCustomer
+						this.numlist[1].num2=data.contrastFraction +'%';
+						this.numlist[2].num2=data.contrastSumDuration;
+					}else{
+						this.compareFlag=false
+					}
 					this.sheartime1 = data.lastStartDate.substring(5, 10) + "--" + data.lastEndDate.substring(5,
 						10);
 					this.sheartime2 = '请选择';
@@ -1195,4 +1228,10 @@
 			margin-top: 10rpx;
 		}
 	}
+	.comparesize{
+		flex: 1;
+		font-size: 24rpx;
+		color: #666666;
+		margin-top: 10rpx;
+	}
 </style>
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
index 954275c..6ce72c5 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
@@ -310,7 +310,7 @@ module.exports = {
         "fontColor": "#666666",
         "fontSize": 13,
         "rotateLabel": false,
-        "itemCount": 7,
+        "itemCount": 3,
         "boundaryGap": "center",
         "disableGrid": true,
         "gridColor": "#CCCCCC",