From 45914f0577eda75b3504e2576535d200f09b362e Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Tue, 9 Jul 2024 15:02:02 +0800
Subject: [PATCH] =?UTF-8?q?task#14196=EF=BC=8C=E6=8A=98=E7=BA=BF=E5=9B=BE?=
 =?UTF-8?q?=E7=99=BE=E5=88=86=E5=8F=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kpi/kpiIndex.vue | 66 +++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/views/kpi/kpiIndex.vue b/src/views/kpi/kpiIndex.vue
index 3794c2f3..8720097c 100644
--- a/src/views/kpi/kpiIndex.vue
+++ b/src/views/kpi/kpiIndex.vue
@@ -83,12 +83,12 @@
           <div class="line"></div>
           <div class="center common">
             <div class="num">{{ indexData && indexData.polymerizationSuccessArriving }}</div>
-            <div class="itemTitle">集合成功到达时效</div>
+            <div class="itemTitle">集合成功到达时效(分)</div>
           </div>
           <div class="line"></div>
           <div class="right common">
             <div class="num">{{ indexData && indexData.arriving }}</div>
-            <div class="itemTitle">到达时效</div>
+            <div class="itemTitle">到达时效(分)</div>
           </div>
         </div>
       </div>
@@ -111,7 +111,7 @@
           <div v-if="active==1" style="width: 100%">
             <div id="chartWrap" style="width: 100%;height:300px"></div>
           </div>
-          <div v-if="isMobile && activeIndex==3" class="selectWrap">
+          <div v-if="activeIndex==3" class="selectWrap">
             <el-select v-model="value" @change="changeHandle">
               <el-option
                   v-for="item in options"
@@ -401,6 +401,7 @@ export default {
         type: 'line',
         data: this.v1,
         smooth: true,
+        yAxisIndex: 0,
         label: {
           show: true, // 显示标签
           position: 'top', // 标签位置在柱形顶部
@@ -411,6 +412,7 @@ export default {
           type: "line",
           data: this.v3,
           smooth: true,
+          yAxisIndex: 0,
           label: {
             show: true,
             position: 'top',
@@ -422,6 +424,7 @@ export default {
           type: 'line',
           smooth: true,
           data: this.v2,
+          yAxisIndex: 0,
           label: {
             show: true,
             position: 'top',
@@ -794,6 +797,7 @@ export default {
             startTime: this.startTime ,
             endTime: this.endTime,
             statisticsType: this.active === 3 ? 1 : 2,
+            supplierId: this.supplierId,
             driverId: this.driverId,
             driverName:this.driverName,
             pageNum: this.pageNum,
@@ -831,7 +835,8 @@ export default {
             endTime: this.endTime,
             searchType: this.setType(this.active),
             pageNum: this.pageNum,
-            pageSize: this.pageSize
+            pageSize: this.pageSize,
+            supplierId:this.supplierId
           });
           this.total = result.total
           this.detailList = result.data?.map(item => {
@@ -932,6 +937,7 @@ export default {
         this.v5 = []
         this.v6 = []
         await this.twoTabHanldeData()
+        // console.log(this.v1,this.v2,this.v3,this.v4,this.v5,this.v6)
         this.loadingData = false
         if (this.active === 1) {
           await this.drawLine()
@@ -949,9 +955,9 @@ export default {
         if (this.activeIndex === 0) {//接单指标
           this.detailList?.map(item => {
             this.v1.push(item.dispatchOrderCount)
-            this.v2.push(item.refuseOrderRate)
-            this.v3.push(item.timeoutOrderRate)
-            this.v4.push(item.cancelrate)
+            this.v2.push(item.refuseOrderRate.replace('%', ''))
+            this.v3.push(item.timeoutOrderRate.replace('%', ''))
+            this.v4.push(item.cancelRate.replace('%', ''))
           })
           this.labelList = [
             {label: '月', prop: 'month'},
@@ -962,13 +968,13 @@ export default {
             {label: '拒单率（%）', prop: 'refuseOrderRate'},
             {label: '超时接单量', prop: 'timeoutOrderCount'},
             {label: '超时率（%）', prop: 'timeoutOrderRate'},
-            {label: '取消率（%）', prop: 'cancelrate'},
+            {label: '取消率（%）', prop: 'cancelRate'},
           ]
         } else if (this.activeIndex === 1) {
           this.detailList?.map(item => {
-            this.v1.push(item.customerEvaluateRate)
-            this.v2.push(item.customerSatisfaction)
-            this.v3.push(item.complainOrderRate)
+            this.v1.push(item.customerEvaluateRate.replace('%', ''))
+            this.v2.push(item.customerSatisfaction.replace('%', ''))
+            this.v3.push(item.complainOrderRate.replace('%', ''))
           })
           this.labelList = [
             {label: '月', prop: 'month'},
@@ -979,12 +985,12 @@ export default {
           ]
         } else if (this.activeIndex === 2) {
           this.detailList?.map(item => {
-            this.v1.push(item.appRate)
-            this.v2.push(item.threeMinutesContactRate)
-            this.v3.push(item.pinganPolymerizationSuccessRate)
-            this.v4.push(item.zhonghuaPolymerizationSuccessRate)
-            this.v5.push(item.zdPolymerizationSuccessRate)
-            this.v6.push(item.polymerizationSuccessRate)
+            this.v1.push(item.appRate.replace('%', ''))
+            this.v2.push(item.threeMinutesContactRate.replace('%', ''))
+            this.v3.push(item.pinganPolymerizationSuccessRate.replace('%', ''))
+            this.v4.push(item.zhonghuaPolymerizationSuccessRate.replace('%', ''))
+            this.v5.push(item.zdPolymerizationSuccessRate.replace('%', ''))
+            this.v6.push(item.polymerizationSuccessRate.replace('%', ''))
           })
           this.labelList = [
             {label: '月', prop: 'month'},
@@ -1000,31 +1006,31 @@ export default {
             if (this.value == 1) {
               this.detailList?.map(item => {
                 this.v1.push(item.receiving)
-                this.v2.push(item.threeMinutesReceivingRate)
+                this.v2.push(item.threeMinutesReceivingRate.replace('%', ''))
               })
             } else {
               this.detailList?.map(item => {
                 this.v1.push(item.arriving)
                 this.v2.push(item.polymerizationSuccessArriving)
-                this.v3.push(item.fortyMinutesArrivalRate)
+                this.v3.push(item.fortyMinutesArrivalRate.replace('%', ''))
               })
             }
           } else {
             this.detailList?.map(item => {
               this.v1.push(item.receiving)
-              this.v2.push(item.threeMinutesReceivingRate)
+              this.v2.push(item.threeMinutesReceivingRate.replace('%', ''))
             })
             if (this.swithVal) {
               this.detailList?.map(item => {
                 this.v3.push(item.trailArriving)
                 this.v4.push(item.trailPolymerizationSuccessArriving)
-                this.v5.push(item.trailFortyMinutesArrivalRate)
+                this.v5.push(item.trailFortyMinutesArrivalRate.replace('%', ''))
               })
             } else {
               this.detailList?.map(item => {
                 this.v3.push(item.minorArriving)
                 this.v4.push(item.minorPolymerizationSuccessArriving)
-                this.v5.push(item.minorFortyMinutesArrivalRate)
+                this.v5.push(item.minorFortyMinutesArrivalRate.replace('%', ''))
               })
             }
           }
@@ -1034,7 +1040,7 @@ export default {
             {label: '3′接单率（%）', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
             {label: '40′到达率（%）', prop: 'fortyMinutesArrivalRate'},
-            {label: '聚合成功到达时效', prop: 'polymerizationSuccessArriving'},
+            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       } else if (this.active === 2) {
@@ -1048,7 +1054,7 @@ export default {
             {label: '拒单率（%）', prop: 'refuseOrderRate'},
             {label: '超时接单量', prop: 'timeoutOrderCount'},
             {label: '超时率（%）', prop: 'timeoutOrderRate'},
-            {label: '客户取消率（%）', prop: 'cancelrate'},
+            {label: '客户取消率（%）', prop: 'cancelRate'},
           ]
         } else if (this.activeIndex === 1) {
           this.labelList = [
@@ -1080,7 +1086,7 @@ export default {
             {label: '40′到达率（%）', prop: 'fortyMinutesArrivalRate'},
             {label: '小修聚合成功到达时效(分)', prop: 'minorPolymerizationSuccessArriving'},
             {label: '拖车聚合成功到达时效(分)', prop: 'trailPolymerizationSuccessArriving'},
-            {label: '聚合成功到达时效', prop: 'polymerizationSuccessArriving'},
+            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       } else if (this.active === 3) {
@@ -1113,7 +1119,7 @@ export default {
             {label: '中华聚合成功率（%）', prop: 'zhonghuaPolymerizationSuccessRate'},
             {label: '中道聚合成功率（%）', prop: 'zdPolymerizationSuccessRate'},
             {label: '总聚合成功率（%）', prop: 'polymerizationSuccessRate'},
-            {label: '日均在线时长', prop: 'onlineDuration'},
+            {label: '日均在线时长(h)', prop: 'onlineDuration'},
           ]
         } else if (this.activeIndex === 3) {
           this.labelList = [
@@ -1122,7 +1128,7 @@ export default {
             {label: '3′接单率（%）', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
             {label: '40′到达率（%）', prop: 'fortyMinutesArrivalRate'},
-            {label: '聚合成功到达时效', prop: 'polymerizationSuccessArriving'},
+            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       } else if (this.active === 4) {
@@ -1136,7 +1142,7 @@ export default {
             {label: '拒单率（%）', prop: 'refuseOrderRate'},
             {label: '超时接单量', prop: 'timeoutOrderCount'},
             {label: '超时率（%）', prop: 'timeoutOrderRate'},
-            {label: '客户取消率（%）', prop: 'cancelrate'},
+            {label: '客户取消率（%）', prop: 'cancelRate'},
           ]
         } else if (this.activeIndex === 1) {
           this.labelList = [
@@ -1156,7 +1162,7 @@ export default {
             {label: '中华聚合成功率（%）', prop: 'zhonghuaPolymerizationSuccessRate'},
             {label: '中道聚合成功率（%）', prop: 'zdPolymerizationSuccessRate'},
             {label: '总聚合成功率（%）', prop: 'polymerizationSuccessRate'},
-            {label: '日均在线时长', prop: 'onlineDuration'},
+            {label: '日均在线时长(h)', prop: 'onlineDuration'},
           ]
         } else if (this.activeIndex === 3) {
           this.labelList = [
@@ -1165,7 +1171,7 @@ export default {
             {label: '3′接单率（%）', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
             {label: '40′到达率（%）', prop: 'fortyMinutesArrivalRate'},
-            {label: '聚合成功到达时效', prop: 'polymerizationSuccessArriving'},
+            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       }