task#，月总图表X轴数据去重

README.md

@@ -29,3 +29,7 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 ```
 code = 104, 接口不提示报错
 ```
+### 开发分支
+```
+dev_2025
+```

src/api/kpi.js

@@ -27,6 +27,14 @@ export function getDriverStatisticsKpi(data){
     data
   })
 }
+export function querySupplierDriverStatisticsScore(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierDriverStatisticsScore',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
 //   各种详情数据
 export function getKpiDetailsData(data){
   return request({

src/views/index/vehicleAdd.vue

@@ -40,6 +40,20 @@
       accept="image "
     />
   </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>行驶证车辆照片页</span>
+    </div>
+    <van-uploader
+      v-model="vehicleLicenseCarPhotoList"
+      :after-read="vehicleLicenseCarHandler"
+      :max-size="5 * 1024 * 1024"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
@@ -146,9 +160,11 @@ export default {
       imageUrl: require('@/assets/arr_right.png'),
       vehicleLicenseFrontList: [],
       vehicleLicenseBackList: [],
+      vehicleLicenseCarPhotoList: [],
       vehicleFrontPhotoList: [],
       vehicleLicenseFront: '',  // 行驶证首页
       vehicleLicenseBack: '',   // 行驶证副页
+      vehicleLicenseCarPhoto: '',  // 行驶证车辆照片
       vehicleFrontPhoto: '',    // 车头照
       vehicleLicenseInfo: {},
       vehicleLicenseBackOcrFlag: false,   // 行驶证副页 修改时默认不需要 ocr识别
@@ -182,6 +198,12 @@ export default {
       this.vehicleLicenseBack = res.data;
       await this.vehicleBackOcrHandler();
     },
+    async vehicleLicenseCarHandler(file) {     // 上传 行驶证车辆照片
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData);
+      this.vehicleLicenseCarPhoto = res.data;
+    },
     async vehicleFrontPhotoHandler(file) {     // 上传 车头照
       const formData = new FormData();
       formData.append("file" , file.file);
@@ -287,9 +309,19 @@ export default {
       this.vehicleLicenseBack = result.vehicleLicenseBack;
       this.vehicleFrontPhoto = result.vehicleFrontPhoto;
       this.vehicleLicenseInfo = result.vehicleLicenseInfo;
-      this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
-      this.vehicleLicenseBackList = [{ url : this.vehicleLicenseBack }];
-      this.vehicleFrontPhotoList = [{ url : this.vehicleFrontPhoto }];
+      this.vehicleLicenseCarPhoto = result.vehicleLicenseCarPhoto;
+      if( this.vehicleLicenseFront ) {
+        this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
+      }
+      if(this.vehicleLicenseBack) {
+        this.vehicleLicenseBackList = [{ url : this.vehicleLicenseBack }];
+      }
+      if(this.vehicleFrontPhoto) {
+        this.vehicleFrontPhotoList = [{ url : this.vehicleFrontPhoto }];
+      }
+      if(this.vehicleLicenseCarPhoto) {
+        this.vehicleLicenseCarPhotoList = [{ url : this.vehicleLicenseCarPhoto }];
+      }
     },
     isChange(e){
       this.isJoin=e
@@ -303,6 +335,10 @@ export default {
         this.$toast('行驶证副页照片不能为空')
         return
       }
+      if( !this.vehicleLicenseCarPhoto ) {
+        this.$toast('行驶证车辆照片页不能为空')
+        return
+      }
       if( !this.vehicleLicenseBack ) {
         this.$toast('车头照片不能为空')
         return
@@ -325,6 +361,7 @@ export default {
           vehicleLicenseBack: this.vehicleLicenseBack,
           vehicleFrontPhoto: this.vehicleFrontPhoto,
           vehicleLicenseInfo: this.vehicleLicenseInfo,
+          vehicleLicenseCarPhoto: this.vehicleLicenseCarPhoto,
         })
         if(this.id){
           this.$toast('修改成功')

src/views/kpi/components/noFit-table.vue

@@ -13,7 +13,7 @@
           <template slot-scope="scope">{{scope.row[item.prop]}}  </template>
         </el-table-column>
       </template>
-      <template v-else-if="active===3">
+<!--      <template v-else-if="active===4">
         <el-table-column v-for="(column,index) in filteredLabelList" :key="column.prop" :prop="column.prop" :label="column.label"
                          :fixed="index===0" align="center"  min-width="100"
                          :width="(isMobile && (column.label=='案件编号' || column.label=='服务内容')) ? 70 : 'auto'">
@@ -25,7 +25,7 @@
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
-      </template>
+      </template>-->
       <template v-else>
         <el-table-column v-for="column in labelList" :key="column.prop" :prop="column.prop" :label="column.label"
                          align="center"  min-width="100" :width="(isMobile && (column.label=='案件编号' || column.label=='服务内容')) ? 70 : 'auto'">
@@ -45,12 +45,12 @@ export default {
   mounted() {
   },
   computed: {
-    filteredLabelList() {
-      if(this.active!==3){
+   /* filteredLabelList() {
+      if(this.active!==4){
         return
       }
       return this.labelList.filter(column => column.label !== '星级评分');
-    }
+    }*/
   },
   methods: {
     setTableCellStyle({ row, column,columnIndex }) {

src/views/kpi/kpiIndex.vue

@@ -39,14 +39,15 @@
     <van-tabs v-model="active" sticky @click="tabClickHandle">
       <van-tab v-for="(item,index) in tabArr" :key="index" :title="item.name"></van-tab>
       <div v-if="isMobile && !([0,1,2,3].includes(active))" class="tipArrow left">{{ leftArr }}</div>
-      <div v-if="isMobile && !([8,9].includes(active))" class="tipArrow right">>>></div>
+      <div v-if="isMobile && !([7,8].includes(active))" class="tipArrow right">>>></div>
     </van-tabs>
     <div v-loading="loadingData" :class="{'contentWrap':true,'webcontentWrap':!isMobile}" v-if="active===0">
       <div :class="{'reciceOrder':true,'webCom':!isMobile}">
         <div :class="{'title':true,'webTitle':!isMobile}">接单指标</div>
         <div class="reciceOrderIWrap">
           <div class="left common">
-            <div class="num">{{ indexData && indexData.receiveOrderCount }}</div>
+<!--            indexData && -->
+            <div class="num">{{ formatCurrency(indexData?.receiveOrderCount) }}</div>
             <div class="itemTitle">承接案件量</div>
           </div>
           <div class="center common" @click="clickJumpHandle(5)">
@@ -201,8 +202,8 @@
         <noFit-table v-else :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
      </div>
     </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,3,4].includes(active)">
-      <div class="searchDriverName" v-if="[3,4].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2].includes(active)">
+      <div class="searchDriverName" v-if="[5,4].includes(active)">
         <el-select
             v-model="driverName"
             filterable
@@ -224,12 +225,12 @@
         </el-select>
       </div>
       <div :class="{'tabWrap':true,'webTabWrap':!isMobile,'mobileTab':isMobile}">
-        <div v-for="(item,index) in (active===3 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
+        <div v-for="(item,index) in (active===4 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
              :key="index"
              @click="changeTab(index)">{{ item.name }}
         </div>
       </div>
-      <div :class="{'comTab':true}">
+      <div :class="{'comTab':active !== 4,'comTabActive3':active === 4}">
         <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
       </div>
       <el-pagination
@@ -244,13 +245,13 @@
           :total="total">
       </el-pagination>
     </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[5,6,7,8,9].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[3,4,5,6,7,8].includes(active)">
       <div :class="{'comTab':true,'detailTable':isMobile}">
         <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"
                      ></noFit-table>
       </div>
       <el-pagination
-          v-if="active !== 9"
+          v-if="active !== 10"
           small
           :page-sizes="[20, 50, 100]"
           :current-page.sync="pageNum"
@@ -271,10 +272,9 @@ import {
   getKpiDetailsData,
   getStatisticsKpiByMonth,
   getStatisticsKpi,
-  getDriverStatisticsKpi,
   getSupplierId,
   getDriverName,
-  getRecentSupplierKpi
+  getRecentSupplierKpi, querySupplierDriverStatisticsScore
 } from "@/api/kpi.js"
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
@@ -289,8 +289,9 @@ export default {
     return {
       active:0,
       activeIndex: 0,
+      // {name: '月/师傅'}, {name: '日/师傅'},
       tabArr: [
-        {name: '总览'}, {name: '月/总'}, {name: '日/总'}, {name: '月/师傅'}, {name: '日/师傅'}, {name: '拒单明细'},
+        {name: '总览'}, {name: '月/总'}, {name: '日/总'},{name: '师傅满意度'},  {name: '拒单明细'},
         {name: '超时明细'}, {name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'}
       ],
       list: [{name: '接单指标'}, {name: '客户评价'}, {name: 'APP使用'}, {name: ' 时效 '}],
@@ -464,6 +465,23 @@ export default {
         this.loadingData = false
       }
     },
+    // 格式化承接案件量数据
+    formatCurrency(value) {
+      if (!value) return '';
+      let num = parseInt(value);
+      return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    },
+    formatCurrency1(value) {
+      if (!value) return ''; // 如果值为空，返回空字符串
+      // 如果值已经包含逗号，直接返回原值
+      if (value.toString().includes(',')) {
+        return value;
+      }
+      // 否则，添加千分号
+      let num = parseInt(value);
+      if (isNaN(num)) return ''; // 如果转换失败，返回空字符串
+      return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    },
     async clickJumpHandle(type) {
       this.loading = true
       this.active = type;
@@ -491,13 +509,16 @@ export default {
       let series1 = [{
         name: '派遣案件量',
         type: 'bar',
-        data: this.v1,
+        data: this.v1?.map(item => Number(item?.toString()?.replace(/,/g, ''))),
         yAxisIndex: 0,
         smooth: true,
         barWidth: this.isMobile ? 35 : 60,
         label: {
           show: true, // 显示标签
           position: 'top', // 标签位置在柱形顶部
+          formatter: (params) => {
+            return params.value.toLocaleString();
+          }
         }
       },
         {
@@ -903,6 +924,10 @@ export default {
       }
       let myChart = echarts.init(document.getElementById('allDataChart'))
       let option = {
+        grid: {
+          top: '15%',
+          bottom: '12%',
+        },
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -1029,15 +1054,40 @@ export default {
           this.loading = false
           this.detailList?.map(item => {
             this.xAxisArr.push(item.month)
+            this.xAxisArr = [...new Set(this.xAxisArr)]; // 去重
           })
-          // console.log(" this.xAxisArr", this.xAxisArr)
+          console.log(" this.xAxisArr", this.xAxisArr)
           // this.xAxisArr[this.xAxisArr.length - 1] = '本月'
           await this.twoTabHanldeData()
-        } else if ([3, 4].includes(this.active)) {
+        }else if (this.active === 3) {
+          let res = await querySupplierDriverStatisticsScore({
+            startTime: this.startTime ,
+            endTime: this.endTime,
+            statisticsType: 1,
+            supplierId: this.supplierId,
+            driverId: this.driverId,
+            driverName:this.driverName,
+            pageNum: this.pageNum,
+            pageSize: this.pageSize
+          })
+          this.total = res.total
+          this.detailList = res.data?.map(item => {
+            let formatVal = dayjs(item.statisticsDate).format('DD');
+            return {...item, date: formatVal};
+          });
+          this.labelList = [
+            {label: '师傅姓名', prop: 'driverName'},
+            {label: '服务商名称', prop: 'supplierName'},
+            {label: '案件总量', prop: 'orderCount'},
+            {label: '满意度得分  ', prop: 'driverSatisfaction'},
+          ]
+          this.loading = false;
+        }
+       /* else if ([4,5].includes(this.active)) {
           let res = await getDriverStatisticsKpi({
             startTime: this.startTime ,
             endTime: this.endTime,
-            statisticsType: this.active === 3 ? 1 : 2,
+            statisticsType:this.active === 4 ? 1 : 2,
             supplierId: this.supplierId,
             driverId: this.driverId,
             driverName:this.driverName,
@@ -1064,12 +1114,14 @@ export default {
             return {...item, date: formatVal};
           });
           this.loading = false;
-          if(this.active===4 && !this.driverName){
+          if(this.active===5 && !this.driverName){
             this.detailList=[]
             this.total=0
           }
           await this.twoTabHanldeData();
-        } else if ([5, 6, 7, 8, 9].includes(this.active)) {
+        }*/
+        else if ([ 4,5,6, 7, 8].includes(this.active)) {
+
           this.detailList = []
           this.labelList = []
           let result = await getKpiDetailsData({
@@ -1086,7 +1138,7 @@ export default {
             return {...item, date: formatVal};
           });
           this.loading = false
-          if (this.active === 5) {//拒单明细
+          if (this.active === 4) {//拒单明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1097,7 +1149,7 @@ export default {
               {label: '中道派单时间', prop: 'dispatchTime'},
               {label: '拒绝原因', prop: 'reason'},
             ]
-          } else if (this.active === 6) {//超时明细
+          } else if (this.active === 5) {//超时明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1107,7 +1159,7 @@ export default {
               {label: '上游接单来源', prop: 'workSource'},
               {label: '中道派单时间', prop: 'dispatchTime'},
             ]
-          } else if (this.active === 7) {//投诉明细
+          } else if (this.active === 6) {//投诉明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1116,7 +1168,7 @@ export default {
               {label: '投诉时间', prop: 'complainCreateTime'},
               {label: '投诉类型', prop: 'complainTypeString'},
             ]
-          } else if (this.active === 8) {//不使用App案件明细
+          } else if (this.active === 7) {//不使用App案件明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1124,7 +1176,7 @@ export default {
               {label: '工单创建时间', prop: 'orderCreateTime'},
               {label: '事发地', prop: 'vehiclePointAddress'},
             ]
-          } else if (this.active === 9) {//车辆在线情况
+          } else if (this.active === 8) {//车辆在线情况
             this.labelList = [
               {label: '日期', prop: 'date'},
               {label: '0点在线车辆数量', prop: 'zeroClockVehicleCount'},
@@ -1133,7 +1185,6 @@ export default {
               {label: '16点在线车辆数量', prop: 'sixteenClockVehicleCount'},
               {label: '20点在线车辆数量', prop: 'twentyClockVehicleCount'},
               {label: '22点在线车辆数量', prop: 'twentyTwoClockVehicleCount'},
-
             ]
           }
         }
@@ -1157,13 +1208,18 @@ export default {
         year = new Date(this.current).getFullYear();
         month = new Date(this.current).getMonth() + 1;
       } else {
-        year = new Date().getFullYear();
-        month = new Date().getMonth() + 1;
+        /*year = new Date().getFullYear();
+        month = new Date().getMonth() + 1;*/
+        year = 2024
+        month = 12
       }
       let yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
       this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')
-      this.startTime = dayjs(new Date()).format('YYYY-MM') + '-01 00:00:00'
-      this.endTime = dayjs(new Date()).format('YYYY-MM') + '-' + this.getDayLen()+' 23:59:59'
+      console.log("this.current",this.current)
+      /*this.startTime = dayjs(new Date()).format('YYYY-MM') + '-01 00:00:00'
+      this.endTime = dayjs(new Date()).format('YYYY-MM') + '-' + this.getDayLen()+' 23:59:59'*/
+      this.startTime = '2024-12-01 00:00:00'
+      this.endTime = '2024-12-31 23:59:59'
       this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
       console.log(" this.startMonthTime", this.startMonthTime,this.startTime)
     },
@@ -1226,6 +1282,12 @@ export default {
             { 'month': '拒单量' },{ 'month': '拒单率(%)' },{ 'month': '超时接单量' },{ 'month': '超时率(%)' },{ 'month': '客户取消率(%)' }]
           let props = 'prop' //自定义字段名称
           this.detailList?.map((item,index) => {
+
+            item.dispatchOrderCount=this.formatCurrency1( item.dispatchOrderCount);
+            item.receiveOrderCount=this.formatCurrency1( item.receiveOrderCount);
+            item.finishOrderCount=this.formatCurrency1( item.finishOrderCount);
+            item.refuseOrderCount=this.formatCurrency1( item.refuseOrderCount);
+            item.timeoutOrderCount=this.formatCurrency1( item.timeoutOrderCount);
             this.v1.push(item.dispatchOrderCount)
             this.v2.push(item.refuseOrderRate.replace('%', ''))
             this.v3.push(item.timeoutOrderRate.replace('%', ''))
@@ -1403,7 +1465,11 @@ export default {
             {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
-      } else if (this.active === 3) {
+      }
+     /* else if(this.active === 3){
+
+      } */
+      else if (this.active === 4) {
         if (this.activeIndex === 0) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
@@ -1473,7 +1539,7 @@ export default {
             {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
-      } else if (this.active === 4) {
+      } else if (this.active === 5) {
         if (this.activeIndex === 0) {//接单指标
           this.labelList = [
             {label: '日', prop: 'date'},
@@ -1528,15 +1594,15 @@ export default {
     },
     setType(type) {
       switch (type) {
-        case 5:
+        case 4:
           return 1;
-        case 6:
+        case 5:
           return 2;
-        case 7:
+        case 6:
           return 3;
-        case 8:
+        case 7:
           return 4;
-        case 9:
+        case 8:
           return 5;
       }
     },
@@ -1603,19 +1669,6 @@ export default {
     display: flex;
     align-items: center;
     position: relative;
-
-/*    .month {
-      display: inline-block;
-      width: 45px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      border-radius: 20px 0px 0px 20px;
-      border: 1px solid #4C81F5;
-      font-size: 14px;
-      color: #FFFFFF;
-    }*/
-
     .el-icon-search {
       font-size: 15px;
       color: #4C81F5;
@@ -1697,12 +1750,6 @@ export default {
         display: flex;
         justify-content:center;
       }
-
-     /* .defen{
-        display: inline-block;
-        //width: 92px;
-        //text-align: right;
-      }*/
       .left{
         text-align: right;
         padding-right: 5px;
@@ -1756,8 +1803,9 @@ export default {
     }
   }
   .allDataChartWrap{
-    width: 375px;
-    height: 220px;
+  /*  width: 375px;
+    height: 220px;*/
+    @include whBg(375px, 200px, #FFFFFF);
 
   }
   .allDataChart{
@@ -1765,8 +1813,10 @@ export default {
     height: 100%;
   }
   .webComAllData{
-    width: 400px;
-    height: 255px;
+    width: 420px;
+    height: 200px;
+    /*width: 375px;
+    height: 146px;*/
     float: left;
     margin: 10px;
   }
@@ -1884,7 +1934,6 @@ export default {
   width: 100%;
   height: 95%;
 }
-
 ::v-deep .el-table {
   height: 100%;
 }
@@ -1892,7 +1941,11 @@ export default {
 ::v-deep .el-table--scrollable-x .el-table__body-wrapper {
   height: 95% !important;
 }
-
+.comTabActive3 ::v-deep .el-table--scrollable-x .el-table__body-wrapper{
+  width: 100%;
+  //height: 90%;
+  //height: 84% !important;
+}
 .chartWrapWeb, .webTab {
   height: calc(100% - 200px);
   width: 100%;