From ec995b7548c5c3601c4ecd9ca4aee9bcec803fc1 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Tue, 30 Jul 2024 14:45:28 +0800
Subject: [PATCH] =?UTF-8?q?task#14504,=E6=9C=88=E6=80=BB=EF=BC=8C=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=AF=84=E4=BB=B7=E7=8E=87=E7=BC=BA=E5=B0=91=E7=99=BE?=
 =?UTF-8?q?=E5=88=86=E5=8F=B7=EF=BC=8C=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=97=B6?=
 =?UTF-8?q?=E6=95=88=E5=88=87=E6=8D=A2=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEbugfix,table=E5=8F=8Cloading=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E6=B1=82=E6=85=A2=E6=97=B6=EF=BC=8C=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=B8=B2=E6=9F=93=E6=97=A0=E6=95=88=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kpi/components/common-table.vue | 45 -----------------------
 src/views/kpi/kpiIndex.vue                | 13 +++++--
 2 files changed, 9 insertions(+), 49 deletions(-)
 delete mode 100644 src/views/kpi/components/common-table.vue

diff --git a/src/views/kpi/components/common-table.vue b/src/views/kpi/components/common-table.vue
deleted file mode 100644
index f7ee969d..00000000
--- a/src/views/kpi/components/common-table.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <div class="wrap">
-    <el-table :data="tableData"
-              stripe
-              border
-              style="width: 100%"
-              class="custom-table">
-      <el-table-column
-          v-for="(column,i) in tableData"
-          :key="i"
-          :prop="column.prop"
-          :label="column.label"
-          :fixed="i===0"
-          :width="i===0 ? '40' :'80'"
-          align="center"
-      >
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "commonTable",
-  props: ['tableData'],
-  data() {
-    return {}
-  },
-  mounted() {
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="scss">
-@import "@/styles/mixin.scss";
-::v-deep .el-table thead{
-  font-size: 11px;
-  color: #1D2129;
-  font-weight: bold;
-}
-::v-deep .el-table th.el-table__cell.is-leaf {
-  background-color: #E5E6EB;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/kpi/kpiIndex.vue b/src/views/kpi/kpiIndex.vue
index 2da0ddd8..b21493c5 100644
--- a/src/views/kpi/kpiIndex.vue
+++ b/src/views/kpi/kpiIndex.vue
@@ -238,7 +238,7 @@
     <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[5,6,7,8,9].includes(active)">
       <div :class="{'comTab':true,'detailTable':isMobile}">
         <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"
-                     :loading="loading"></noFit-table>
+                     ></noFit-table>
       </div>
 <!--      <el-pagination
           small
@@ -324,7 +324,7 @@ export default {
       pageSize: 20,
       total: 0,
       swithVal: true,
-      supplierId:'',//1128
+      supplierId:1128,
       selectLoading: false,
       selectOption: [],
       driverId:'',//68517
@@ -398,6 +398,8 @@ export default {
       console.log("搜索按钮")
     },
     async changeHandle() {
+      this.v1=[]
+      this.v2=[]
       await this.twoTabHanldeData();
       await this.drawLine();
     },
@@ -508,6 +510,7 @@ export default {
         label: {
           show: true, // 显示标签
           position: 'top', // 标签位置在柱形顶部
+          formatter: '{c}%'
         }
       },
         {
@@ -972,7 +975,7 @@ export default {
           });
           this.total = result.total
           this.detailList = result.data?.map(item => {
-            let formatVal = dayjs(item.createTime).format('DD');
+            let formatVal =item.createTime ? dayjs(item.createTime).format('DD') : '';
             return {...item, date: formatVal};
           });
           this.loading = false
@@ -1197,11 +1200,13 @@ export default {
                 this.v2.push(item.threeMinutesReceivingRate.replace('%', ''))
               })
             } else {
+              console.log(" this.detailList师傅接单时效", this.detailList)
               this.detailList?.map(item => {
                 this.v1.push(item.arriving)
                 this.v2.push(item.polymerizationSuccessArriving)
                 this.v3.push(item.fortyMinutesArrivalRate.replace('%', ''))
               })
+              console.log("this.v1",this.v1,this.v2,this.v3)
             }
             this.detailList?.map((item,index) => {
               const columnObj = {}
@@ -1221,7 +1226,7 @@ export default {
             if (this.swithVal) {
               this.detailList?.map(item => {
                 this.v3.push(item.trailArriving)
-                this.v4.push(item.trailPolymerizationSuccessArriving)
+                this.v4.push(item.trailPolymerizationSuccessArsriving)
                 this.v5.push(item.trailFortyMinutesArrivalRate  ? item.trailFortyMinutesArrivalRate.replace('%', '') : item.trailFortyMinutesArrivalRate)
               })
             } else {