From 54a1b3bae74b35dde33fce8b2e88fec777f84cfc Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Fri, 1 Jul 2022 11:23:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                    |  2 +-
 pages/center/Piabodata/StaffAnalysis.vue   | 31 +++++-----------------
 pages/center/Piabodata/Theteamcompared.vue |  6 ++---
 pages/center/Piabodata/TrendAnalysis.vue   |  8 +++++-
 pages/center/Piabodata/index.vue           | 12 +++++++--
 5 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/App.vue b/App.vue
index 2bf15ed..1c55067 100644
--- a/App.vue
+++ b/App.vue
@@ -277,7 +277,7 @@
 
 		.swiper-box {
 			width: 97%;
-			margin: 0 auto 38rpx;
+			margin: 0 auto 26rpx;
 		}
 
 		.hejibox {
diff --git a/pages/center/Piabodata/StaffAnalysis.vue b/pages/center/Piabodata/StaffAnalysis.vue
index 0c91360..66ce763 100644
--- a/pages/center/Piabodata/StaffAnalysis.vue
+++ b/pages/center/Piabodata/StaffAnalysis.vue
@@ -50,7 +50,7 @@
 			</view>
 			<view class="danwei">来访(人)</view>
 			<view class="uchaserbox">
-				<qiun-data-charts v-if="isShow" type="line" :opts="lineOpts1" :chartData="lineOptsect" background="none" :ontouch="true"
+				<qiun-data-charts v-if="isShow" type="line"  :chartData="lineOptsect" background="none" :ontouch="true"
 					canvasId="wangxiaohuaerlingeryilingwuyibbb" :canvas2d="true" />
 			</view>
 		</view>
@@ -80,7 +80,7 @@
 			</view>
 			<view class="danwei">录音时长</view>
 			<view class="uchaserbox">
-				<qiun-data-charts v-if="isShow" type="line"  :opts="lineOpts1" :chartData="lineOptsect1" background="none" :ontouch="true"
+				<qiun-data-charts v-if="isShow" type="line"  :chartData="lineOptsect1" background="none" :ontouch="true"
 					canvasId="wangxiaouaerlingeryilingwuyibhh" :canvas2d="true" />
 			</view>
 		</view>
@@ -110,7 +110,7 @@
 			</view>
 			<view class="uchaserbox">
 				<qiun-data-charts v-if="isShow" type="line" :chartData="lineOptsect2" background="none" :ontouch="true"
-					canvasId="wangxiaohuaerlingryilingwuyibhh" :canvas2d="true" :opts="lineOpts1" />
+					canvasId="wangxiaohuaerlingryilingwuyibhh" :canvas2d="true" :opts="lineOpts" />
 			</view>
 		</view>
 
@@ -215,31 +215,14 @@
 						}
 					}
 				},
-				
 				lineOpts: {
-					// enableScroll: true,
-					// xAxis: {
-					// 	disableGrid: true,
-					// 	scrollShow: true,
-					// 	itemCount: 8
-					// },
 					yAxis: {
-						data: [
-							{
-								max: 100,
-								min: 0,
-							}
-						]
+						data: [{
+							max: 100,
+							min: 0,
+						}]
 					}
 				},
-				lineOpts1: {
-					// enableScroll: true,
-					// xAxis: {
-					// 	disableGrid: true,
-					// 	scrollShow: true,
-					// 	itemCount: 8
-					// }
-				},
 				isShow: true, // 默认都展示
 			};
 		},
diff --git a/pages/center/Piabodata/Theteamcompared.vue b/pages/center/Piabodata/Theteamcompared.vue
index 7764c47..36b00fe 100644
--- a/pages/center/Piabodata/Theteamcompared.vue
+++ b/pages/center/Piabodata/Theteamcompared.vue
@@ -101,7 +101,7 @@
 				</view>
 			</view>
 			<view v-if="eharTab.active2 == 1 ">
-				<view class="danwei">录音时长</view>
+				<view class="danwei">录音时长 (min)</view>
 				<view class="uchaserbox">
 					<template v-if="lineOptsect2">
 						<qiun-data-charts type="line" :opts="lineOpts1" :chartData="lineOptsect2" background="none" :ontouch="true"
@@ -135,7 +135,7 @@
 				</view>
 			</view>
 			<view v-if="eharTab.active3 == 1 ">
-				<view class="danwei">执行率</view>
+				<view class="danwei">执行率 (%)</view>
 				<view class="uchaserbox">
 					<template v-if="lineOptsect3">
 						<qiun-data-charts type="line" :chartData="lineOptsect3" background="none" :ontouch="true"
@@ -809,7 +809,7 @@
 								})
 							}
 						} else {
-							// console.log(3)
+							console.log(311111)
 							// 当两个都选择的时候
 							res.first.map((item, index) => {
 								let obj = {
diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue
index 469f411..a0a4fdd 100644
--- a/pages/center/Piabodata/TrendAnalysis.vue
+++ b/pages/center/Piabodata/TrendAnalysis.vue
@@ -158,7 +158,7 @@
 			</view>
 
 			<view class="single">
-				<!-- <view class="danwei" style="margin-top: 10rpx;">销讲词执行率</view> -->
+				<view class="danwei" style="margin: 20rpx 0" v-if="newactiveTotal==0||newactiveTotal==4">单位(%)</view>
 				<view class="uchaserbox" v-if="lineOptsect.series.length!=0">
 					<qiun-data-charts :style="!showCanvas?'display:none':''" :type="linetype" :opts="opts"
 						:chartData="lineOptsect" background="none" :ontouch="true"
@@ -338,6 +338,12 @@
 						scrollShow: true,
 						itemCount: 8
 					},
+					yAxis: {
+						data: [{
+							max: 100,
+							min: 0,
+						}]
+					},
 					fontSize: 10,
 					extra: {
 						radar: {
diff --git a/pages/center/Piabodata/index.vue b/pages/center/Piabodata/index.vue
index b67c5e6..8a3c90a 100644
--- a/pages/center/Piabodata/index.vue
+++ b/pages/center/Piabodata/index.vue
@@ -23,7 +23,8 @@
 						<view class="circle"></view>
 						{{item.name}}</view>
 					<view class="num u-flex" v-if="item.name==='平均执行率'">
-						{{item.num}} <image style="margin-left: 2rpx;width: 28rpx;height: 14rpx" src="../../../static/images/excute.png" mode="" />
+						{{item.num}} 
+						<!-- <image style="margin-left: 2rpx;width: 28rpx;height: 14rpx" src="../../../static/images/excute.png" mode="" /> -->
 					</view>
 					<view class="num" v-else-if="item.name==='有效接待'">{{item.num||'--'}}</view>
 					<view class="num" v-else>{{item.num||0}}</view>
@@ -53,7 +54,7 @@
 						:ontouch="true" canvasId="wangxiaohuaerlingilingwuyiba1" :canvas2d="true" />
 				</template>
 				<template v-else>
-					<qiun-data-charts type="line" :opts="lineOpts" :chartData="lineOptsect" background="none" :ontouch="true"
+					<qiun-data-charts type="line" :opts="lineOpts1" :chartData="lineOptsect" background="none" :ontouch="true"
 						canvasId="wangxiaohuaerlingilingwuyiba1" :canvas2d="true" />
 				</template>
 			</view>
@@ -315,6 +316,13 @@
 							min: 0,
 						}]
 					}
+				},
+				lineOpts1: {
+					xAxis: {
+						disableGrid: true,
+						scrollShow: true,
+						itemCount: 8
+					}
 				}
 			};
 		},