task#，司机培训文档和文档材料添加关键词接收

(cherry picked from commit f3a15b829f)
2024-12-20 17:50:06 +08:00
10 changed files with 231 additions and 12403 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,4 +22,3 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-/yarn.lock
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/api/kpi.js
+++ b/src/api/kpi.js
@ -27,14 +27,6 @@ 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({
--- a/src/utils/myMixins.js
+++ b/src/utils/myMixins.js
@ -72,6 +72,7 @@ export const myMixins = {
          methods();
        }
        setTimeout(() => {
+          console.log("shengxiaoxi")
          that.noClick = true;
        }, 3000)
      } else {
--- a/src/views/index/supplySettlement.vue
+++ b/src/views/index/supplySettlement.vue
@ -6,15 +6,15 @@
      <div class="metersWrap">
        <div class="item"  v-show="supplierSettlementType != 1">
          <div class="leftKiloMeters">AB段公里数</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageAb"/>公里</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageAb"/>公里</div>
        </div>
        <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
          <div class="leftKiloMeters">BC段公里数</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageBc"/>公里</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageBc"/>公里</div>
        </div>
        <div class="item"  v-show=" supplierSettlementType == 3 || supplierSettlementType == 4">
          <div class="leftKiloMeters">CA段公里数</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageCa"/>公里</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageCa"/>公里</div>
        </div>
      </div>
    </div>
@ -24,15 +24,15 @@
      <div class="metersWrap">
        <div class="item"  v-show="supplierSettlementType != 1">
          <div class="leftKiloMeters">AB段路桥费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountAb"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountAb"/>元</div>
        </div>
        <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
          <div class="leftKiloMeters">BC段路桥费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountBc"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountBc"/>元</div>
        </div>
        <div class="item"  v-show=" supplierSettlementType == 3 || supplierSettlementType == 4">
          <div class="leftKiloMeters">CA段路桥费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountCa"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountCa"/>元</div>
        </div>
      </div>
    </div >
@ -42,23 +42,23 @@
      <div class="metersWrap">
        <div class="item"  >
          <div class="leftKiloMeters">小轮个数</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.tyreNumber" @input="handleInput"/>个</div>
+          <div class="rightInput"><input type="number" v-model="form.tyreNumber" @input="handleInput"/>个</div>
        </div>
        <div class="item">
          <div class="leftKiloMeters">等候费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.waitAmount"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.waitAmount"/>元</div>
        </div>
        <div class="item"  >
          <div class="leftKiloMeters">困境费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.dilemmaFee"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.dilemmaFee"/>元</div>
        </div>
        <div class="item blueColor" >
          <div class="leftKiloMeters">收取客户金额</div>
-          <div class="rightInput blueColor"><input class="blueColor" type="number" :disabled="!taskCostShow" v-model="form.customerAmount"/>元</div>
+          <div class="rightInput blueColor"><input class="blueColor" type="number" v-model="form.customerAmount"/>元</div>
        </div>
      </div>
    </div>
-    <div class="btn" v-if="taskCostShow || finishLt7">
+    <div class="btn">
      <button @click="submit">提交</button>
    </div>
  </div>
@ -86,9 +86,7 @@ export default {
        waitAmount:'',
        dilemmaFee:'',
        customerAmount:'',
-        taskFlowId:'',
-        auditStatus:'',
-        finishTime:'',
+        taskFlowId:''
      }
    }
  },
@ -99,14 +97,6 @@ export default {
      this.orderCode = urlParams.get('orderCode')
      await this.getDetail()
  },
-  computed:{
-    taskCostShow() {
-      return this.form.auditStatus?.code && !([3, 4, 6].includes(this.form.auditStatus.code))
-    },
-    finishLt7(){
-      return  !this.form.finishTime || (this.form.finishTime && new Date().getTime() - new Date(this.form.finishTime).getTime() <= 7 * 24 * 60 * 60 * 1000)
-    },
-  },
  methods:{
    handleInput(event) {
      const newValue = parseInt(event.target.value, 10);
@ -128,6 +118,7 @@ export default {
      })
      leftCopy(this.form,{...res.data});
      this.supplierSettlementType= res.data.supplierSettlementType?.code
+      // this.form.taskFlowId =1
    },
    async updatSettlement(){
      let result =await updateOrderSettlement({
--- a/src/views/index/uploadInvoice.vue
+++ b/src/views/index/uploadInvoice.vue
@ -73,7 +73,6 @@
 </template>

 <script>
-  import { Decimal } from 'decimal.js';
  import { Dialog } from "vant";
  import { myMixins } from "@/utils/myMixins"
  import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch } from "@/api/mine"
@ -121,7 +120,7 @@
      invoiceTotal () {
        let total = 0;
        this.list?.map(item => {
-          total = new Decimal(total).plus(new Decimal(item.invoiceMoney)).toNumber()
+          total += item.invoiceMoney
        })
        return total
      }
@ -279,15 +278,6 @@
              if(ocrName != billName && diffNumber > 2 && !res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局")){
                errorStr = errorStr + "上传发票抬头与服务商配置不一致，设置抬头为：" + (this.billInfo.unitName || '未设置') + "，识别抬头为：" + res.data.ocrInvoiceRes.data.sellerName + ";如发票确认无误，请联系结算部：021-53682525";
              }
-              let conList = res.data.ocrInvoiceRes.data.invoiceDetails.filter(a => a.itemName.includes("*"))
-              if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
-                conList.every(a => {
-                  let items = a.itemName.split("*")
-                  return (!items[1].includes("现代服务") && !items[1].includes("运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
-                })
-              ){
-                errorStr = errorStr + "分类必须包含：现代服务/运输服务，服务名称必须包含：拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
-              }

              if( !flag ) {
                Dialog.alert({
--- a/src/views/index/vehicleAdd.vue
+++ b/src/views/index/vehicleAdd.vue
@ -40,20 +40,6 @@
      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" />
@ -74,64 +60,9 @@
      <img class="startImg" src="@/assets/start.png" />
      <span>车辆类型</span>
    </div>
-<!--
-    <select
-        id="mySelect"
-        class="mySelect"
-        v-model="selectedOption"
-        multiple
-    >
-      <option
-          v-for="item in typeList"
-          :key="item"
-          :value="item"
-          :disabled="isOptionDisabled(item)"
-      >
-        {{ item }}
-      </option>
+    <select id="mySelect"  class="mySelect"  v-model="selectedOption">
+      <option v-for="(item,index) in typeList" :key="index" :value="index">{{item}}</option>
    </select>
-->
-    <el-select
-        multiple
-        :multiple-limit="isMultiple ? 2 : 1"
-        v-model="selectedOption"
-        value-key="name"
-        class="elSelect"
-        collapse-tags="collapse-tags"
-        placeholder="请选择"  style="width: 55%"
-    >
-      <el-option
-          v-for="item in vehicleTypes"
-          :key="item.name"
-          :label="item.name"
-          :value="item.value"
-          :disabled="!item.disabled ? false : true"
-      >
-      </el-option>
-    </el-select>
-
-  </div>
-  <div class="itemContent">
-    <div class="titleType">
-      <span>牌照</span>
-    </div>
-    <el-select
-      v-model="vehicleLicense"
-      disabled
-      value-key="name"
-      class="elSelect"
-      collapse-tags="collapse-tags"
-      placeholder="请选择"  style="width: 55%"
-    >
-      <el-option
-        v-for="item in vehicleLicenseOptions"
-        :key="item.name"
-        :label="item.name"
-        :value="item.value"
-      >
-      </el-option>
-    </el-select>
-
  </div>
  <div class="lineBot"></div>
  <div class="itemContent">
@ -207,133 +138,35 @@ export default {
      checked: true,
      carNum:"",//车牌号
      typeList:[],//车辆类型列表
-      selectedOption:[],//车辆类型
+      selectedOption:'1',//车辆类型
      id:'',//车辆Id
      serviceIds:[],//车辆服务种类,
      supplierServiceList:[],
-      oldSupplierServiceList:[],
      show:false,
      imageUrl: require('@/assets/arr_right.png'),
      vehicleLicenseFrontList: [],
      vehicleLicenseBackList: [],
-      vehicleLicenseCarPhotoList: [],
      vehicleFrontPhotoList: [],
      vehicleLicenseFront: '',  // 行驶证首页
      vehicleLicenseBack: '',   // 行驶证副页
-      vehicleLicenseCarPhoto: '',  // 行驶证车辆照片
      vehicleFrontPhoto: '',    // 车头照
      vehicleLicenseInfo: {},
      vehicleLicenseBackOcrFlag: false,   // 行驶证副页 修改时默认不需要 ocr识别
-      isMultiple: false,     // 是否支持多选
-      vehicleLicense:'',//牌照
-      vehicleFrontLicensePlate:'',//车头照车牌号码
-      vehicleTypes:[{
-        name: '小修车',
-        value: 1
-      },{
-        name: '一般平板车',
-        value: 2
-      },{
-        name: '落地平板车',
-        value: 3
-      },{
-        name: '地库车',
-        value: 4
-      },
-        {
-          name:'牵引车',
-          value: 5 },
-        {
-          name:'大力神',
-          value:6},
-        {
-          name:'充电车',
-          value: 7 },
-        {
-          name:'吊车',
-          value: 8 },
-        {
-          name:'公车',
-          value: 9 },
-        {
-          name:'箱式拖车',
-          value: 10 },
-
-      ],
-      vehicleLicenseOptions: [{
-        name: '蓝牌',
-        value: 1
-      }, {
-        name: '黄牌',
-        value: 2
-      }, {
-        name: '新能源',
-        value: 3
-      }, {
-        name: '临牌',
-        value: 4
-      }, {
-        name: '其他',
-        value: 5
-      }]
    }
  },
-  watch:{
-    selectedOption(newVal){
-      if(newVal == 4){
-        this.isMultiple = true
-        this.vehicleTypes[2].disabled=true
-        this.vehicleTypes[5].disabled=true
-        this.vehicleTypes[6].disabled=true
-        this.vehicleTypes[7].disabled=true
-        this.vehicleTypes[8].disabled=true
-        this.vehicleTypes[9].disabled=true
-      }else{
-        this.isMultiple = false
-        this.vehicleTypes[2].disabled=false
-        this.vehicleTypes[5].disabled=false
-        this.vehicleTypes[6].disabled=false
-        this.vehicleTypes[7].disabled=false
-        this.vehicleTypes[8].disabled=false
-        this.vehicleTypes[9].disabled=false
-      }
-      if (newVal == 1 || newVal == 7){
-        let arr = []
-        this.supplierServiceList.forEach((item)=>{
-          if(!(item.name == '拖车服务' || item.name == '大型车救援')){
-            arr.push(item)
-          }
-        })
-        this.supplierServiceList = arr
-      }else{
-        this.supplierServiceList = this.oldSupplierServiceList
-      }
-
-    },
-  },
-
  async mounted() {
    this.id=this.$route.params?.id
-    await this.getSupplierServiceTree();
+    const selectElement = document.getElementById('mySelect');
+    selectElement.addEventListener('change', function() {
+     this.selectedOption=selectElement.value;
+    });
    await this.getTypeList();
    if( this.id){
      await this.vehicleInfo()
    }
+    await this.getSupplierServiceTree();
  },
  methods:{
-    getVehicleLicense(color) {
-      if( color == '蓝' ) {
-        this.vehicleLicense = 1
-      } else if(color == '黄') {
-        this.vehicleLicense = 2
-      } else if(color == '临牌') {
-        this.vehicleLicense = 4
-      } else if(color.includes('绿')) {
-        this.vehicleLicense = 3
-      } else {
-        this.vehicleLicense = 5
-      }
-    },
    async vehicleLicenseFrontHandler(file) {    // 上传 行驶证首页
      const formData = new FormData();
      formData.append("file" , file.file);
@ -349,27 +182,11 @@ 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);
      let res = await uploadImage(formData);
      this.vehicleFrontPhoto = res.data;
-      await this.ocrCarFrontHandler()
-    },
-    async ocrCarFrontHandler() {     // 车辆正面 orc 识别
-      let res = await ocrHandler({
-        ocrType: 10,
-        imageUrl: this.vehicleFrontPhoto,
-        cardSide: 'FRONT'
-      });
-      this.vehicleFrontLicensePlate=res.data?.number
-      this.getVehicleLicense(res.data.color)
    },
    async vehicleOcrHandler() {     // 行驶证首页 ocr 识别
      this.vehicleLicenseInfo.licensePlateNumber = '';
@ -448,53 +265,31 @@ export default {
    },
    async getTypeList() {
        let result=await vehicleTypeList();
-        this.typeList=[]
        if(result.code === 200){
-          for (const key in result.data){
-            // console.log("keys",result.data[key])
-            this.typeList.push({name:result.data[key],disabled:false,value:(key+1)})
-            // this.typeList.push(result.data[key])
-
-          }
+          this.typeList=result.data
        }
    },
    async getSupplierServiceTree(){
      let res = await supplierServiceTree();
      this.supplierServiceList=res.data
-      this.oldSupplierServiceList=this.supplierServiceList
    },
    async vehicleInfo(){
      let res= await  getInfoById({
        vehicleId:this.id
      })
      let result=res.data;
-      console.log("result",result)
      this.id=result.vehicleId
      this.carNum=result.plateNumber
      this.isJoin=result.hasPolymerization.code
-      this.selectedOption=result.vehicleType?.split(',').map((item)=>{
-        return Number(item);
-      });
+      this.selectedOption=result.vehicleType;
      this.serviceIds=result.serviceIds
      this.vehicleLicenseFront = result.vehicleLicenseFront;
      this.vehicleLicenseBack = result.vehicleLicenseBack;
      this.vehicleFrontPhoto = result.vehicleFrontPhoto;
      this.vehicleLicenseInfo = result.vehicleLicenseInfo;
-      this.vehicleLicenseCarPhoto = result.vehicleLicenseCarPhoto;
-      this.vehicleLicense = result.vehicleLicense;
-      this.vehicleFrontLicensePlate = result.vehicleFrontLicensePlate;
-      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
@ -508,11 +303,7 @@ export default {
        this.$toast('行驶证副页照片不能为空')
        return
      }
-      if( !this.vehicleLicenseCarPhoto ) {
-        this.$toast('行驶证车辆照片页不能为空')
-        return
-      }
-      if( !this.vehicleFrontPhoto ) {
+      if( !this.vehicleLicenseBack ) {
        this.$toast('车头照片不能为空')
        return
      }
@ -524,27 +315,16 @@ export default {
        this.$toast('行驶证副页识别失败')
        return
      }
-      if(!(this.selectedOption.length > 0)){
-        this.$toast('车辆类型不能为空')
-        return
-      }
-      if(this.selectedOption?.length==1 && this.selectedOption.includes(1)){//选择小修车时需清除原本的拖车服务类型
-        let data=this.oldSupplierServiceList.filter(item => item.name ==='拖车服务')
-        this.serviceIds = this.serviceIds.filter(item => !data[0].children.some(obj => obj.id === item));
-      }
        await saveVehicle({
          vehicleId:this.id ? this.id : '',
          plateNumber:this.carNum ? this.carNum :'',
-          vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '',
+          vehicleType:this.selectedOption ? this.selectedOption : '',
          hasPolymerization:this.isJoin,
          serviceIds:this.serviceIds ? this.serviceIds : [],
          vehicleLicenseFront: this.vehicleLicenseFront,
          vehicleLicenseBack: this.vehicleLicenseBack,
          vehicleFrontPhoto: this.vehicleFrontPhoto,
          vehicleLicenseInfo: this.vehicleLicenseInfo,
-          vehicleLicenseCarPhoto: this.vehicleLicenseCarPhoto,
-          vehicleLicense: this.vehicleLicense,
-          vehicleFrontLicensePlate:this.vehicleFrontLicensePlate,
        })
        if(this.id){
          this.$toast('修改成功')
@ -663,8 +443,4 @@ export default {
    margin: 40px 0 30px 8px;
  }
 }
-.elSelect ::v-deep .el-input__inner{
-  border: none !important;
-  text-align: right !important;
-}
 </style>
--- a/src/views/kpi/components/noFit-table.vue
+++ b/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===4">
+      <template v-else-if="active===3">
        <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'">
@ -46,7 +46,7 @@ export default {
  },
  computed: {
    filteredLabelList() {
-      if(this.active!==4){
+      if(this.active!==3){
        return
      }
      return this.labelList.filter(column => column.label !== '星级评分');
--- a/src/views/kpi/kpiIndex.vue
+++ b/src/views/kpi/kpiIndex.vue
@ -39,15 +39,14 @@
    <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 && !([9,10].includes(active))" class="tipArrow right">>>></div>
+      <div v-if="isMobile && !([8,9].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">
-<!--            indexData && -->
-            <div class="num">{{ formatCurrency(indexData?.receiveOrderCount) }}</div>
+            <div class="num">{{ indexData && indexData.receiveOrderCount }}</div>
            <div class="itemTitle">承接案件量</div>
          </div>
          <div class="center common" @click="clickJumpHandle(5)">
@ -202,8 +201,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,4,5].includes(active)">
-      <div class="searchDriverName" v-if="[5,4].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,3,4].includes(active)">
+      <div class="searchDriverName" v-if="[3,4].includes(active)">
        <el-select
            v-model="driverName"
            filterable
@ -225,12 +224,12 @@
        </el-select>
      </div>
      <div :class="{'tabWrap':true,'webTabWrap':!isMobile,'mobileTab':isMobile}">
-        <div v-for="(item,index) in (active===4 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
+        <div v-for="(item,index) in (active===3 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
             :key="index"
             @click="changeTab(index)">{{ item.name }}
        </div>
      </div>
-      <div :class="{'comTab':active !== 4,'comTabActive3':active === 4}">
+      <div :class="{'comTab':true}">
        <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
      </div>
      <el-pagination
@ -245,13 +244,13 @@
          :total="total">
      </el-pagination>
    </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[3,6,7,8,9,10].includes(active)">
+    <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"
                     ></noFit-table>
      </div>
      <el-pagination
-          v-if="active !== 10"
+          v-if="active !== 9"
          small
          :page-sizes="[20, 50, 100]"
          :current-page.sync="pageNum"
@ -272,9 +271,10 @@ import {
  getKpiDetailsData,
  getStatisticsKpiByMonth,
  getStatisticsKpi,
+  getDriverStatisticsKpi,
  getSupplierId,
-  getDriverName,getDriverStatisticsKpi,
-  getRecentSupplierKpi, querySupplierDriverStatisticsScore
+  getDriverName,
+  getRecentSupplierKpi
 } from "@/api/kpi.js"
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
@ -289,9 +289,8 @@ export default {
    return {
      active:0,
      activeIndex: 0,
-      //
      tabArr: [
-        {name: '总览'}, {name: '月/总'}, {name: '日/总'},{name: '师傅满意度'},{name: '月/师傅'}, {name: '日/师傅'},  {name: '拒单明细'},
+        {name: '总览'}, {name: '月/总'}, {name: '日/总'}, {name: '月/师傅'}, {name: '日/师傅'}, {name: '拒单明细'},
        {name: '超时明细'}, {name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'}
      ],
      list: [{name: '接单指标'}, {name: '客户评价'}, {name: 'APP使用'}, {name: ' 时效 '}],
@ -465,23 +464,6 @@ 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;
@ -509,16 +491,13 @@ export default {
      let series1 = [{
        name: '派遣案件量',
        type: 'bar',
-        data: this.v1?.map(item => Number(item?.toString()?.replace(/,/g, ''))),
+        data: this.v1,
        yAxisIndex: 0,
        smooth: true,
        barWidth: this.isMobile ? 35 : 60,
        label: {
          show: true, // 显示标签
          position: 'top', // 标签位置在柱形顶部
-          formatter: (params) => {
-            return params.value.toLocaleString();
-          }
        }
      },
        {
@ -924,10 +903,6 @@ export default {
      }
      let myChart = echarts.init(document.getElementById('allDataChart'))
      let option = {
-        grid: {
-          top: '15%',
-          bottom: '12%',
-        },
        tooltip: {
          trigger: 'axis',
          axisPointer: {
@ -1054,39 +1029,15 @@ 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 (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: 'orderCount'},
-            {label: '满意度得分  ', prop: 'driverSatisfaction'},
-          ]
-          this.loading = false;
-        }
-        else if ([4,5].includes(this.active)) {
+        } else if ([3, 4].includes(this.active)) {
          let res = await getDriverStatisticsKpi({
            startTime: this.startTime ,
            endTime: this.endTime,
-            statisticsType:this.active === 4 ? 1 : 2,
+            statisticsType: this.active === 3 ? 1 : 2,
            supplierId: this.supplierId,
            driverId: this.driverId,
            driverName:this.driverName,
@ -1113,13 +1064,12 @@ export default {
            return {...item, date: formatVal};
          });
          this.loading = false;
-          if(this.active===5 && !this.driverName){
+          if(this.active===4 && !this.driverName){
            this.detailList=[]
            this.total=0
          }
          await this.twoTabHanldeData();
-        }
-        else if ([ 6, 7, 8,9,10].includes(this.active)) {
+        } else if ([5, 6, 7, 8, 9].includes(this.active)) {
          this.detailList = []
          this.labelList = []
          let result = await getKpiDetailsData({
@ -1136,7 +1086,7 @@ export default {
            return {...item, date: formatVal};
          });
          this.loading = false
-          if (this.active === 6) {//拒单明细
+          if (this.active === 5) {//拒单明细
            this.labelList = [
              {label: '案件编号', prop: 'orderCode'},
              {label: '服务内容', prop: 'serviceName'},
@ -1147,7 +1097,7 @@ export default {
              {label: '中道派单时间', prop: 'dispatchTime'},
              {label: '拒绝原因', prop: 'reason'},
            ]
-          } else if (this.active === 7) {//超时明细
+          } else if (this.active === 6) {//超时明细
            this.labelList = [
              {label: '案件编号', prop: 'orderCode'},
              {label: '服务内容', prop: 'serviceName'},
@ -1157,7 +1107,7 @@ export default {
              {label: '上游接单来源', prop: 'workSource'},
              {label: '中道派单时间', prop: 'dispatchTime'},
            ]
-          } else if (this.active === 8) {//投诉明细
+          } else if (this.active === 7) {//投诉明细
            this.labelList = [
              {label: '案件编号', prop: 'orderCode'},
              {label: '服务内容', prop: 'serviceName'},
@ -1166,7 +1116,7 @@ export default {
              {label: '投诉时间', prop: 'complainCreateTime'},
              {label: '投诉类型', prop: 'complainTypeString'},
            ]
-          } else if (this.active === 9) {//不使用App案件明细
+          } else if (this.active === 8) {//不使用App案件明细
            this.labelList = [
              {label: '案件编号', prop: 'orderCode'},
              {label: '服务内容', prop: 'serviceName'},
@ -1174,7 +1124,7 @@ export default {
              {label: '工单创建时间', prop: 'orderCreateTime'},
              {label: '事发地', prop: 'vehiclePointAddress'},
            ]
-          } else if (this.active === 10) {//车辆在线情况
+          } else if (this.active === 9) {//车辆在线情况
            this.labelList = [
              {label: '日期', prop: 'date'},
              {label: '0点在线车辆数量', prop: 'zeroClockVehicleCount'},
@ -1183,6 +1133,7 @@ export default {
              {label: '16点在线车辆数量', prop: 'sixteenClockVehicleCount'},
              {label: '20点在线车辆数量', prop: 'twentyClockVehicleCount'},
              {label: '22点在线车辆数量', prop: 'twentyTwoClockVehicleCount'},
+
            ]
          }
        }
@ -1275,12 +1226,6 @@ 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('%', ''))
@ -1458,11 +1403,7 @@ export default {
            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
          ]
        }
-      }
-     /* else if(this.active === 3){
-
-      } */
-      else if (this.active === 4) {
+      } else if (this.active === 3) {
        if (this.activeIndex === 0) {
          this.labelList = [
            {label: '师傅姓名', prop: 'driverName'},
@ -1532,7 +1473,7 @@ export default {
            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
          ]
        }
-      } else if (this.active === 5) {
+      } else if (this.active === 4) {
        if (this.activeIndex === 0) {//接单指标
          this.labelList = [
            {label: '日', prop: 'date'},
@ -1587,15 +1528,15 @@ export default {
    },
    setType(type) {
      switch (type) {
-        case 6:
+        case 5:
          return 1;
-        case 7:
+        case 6:
          return 2;
-        case 8:
+        case 7:
          return 3;
-        case 9:
+        case 8:
          return 4;
-        case 10:
+        case 9:
          return 5;
      }
    },
@ -1662,6 +1603,19 @@ 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;
@ -1743,6 +1697,12 @@ export default {
        display: flex;
        justify-content:center;
      }
+
+     /* .defen{
+        display: inline-block;
+        //width: 92px;
+        //text-align: right;
+      }*/
      .left{
        text-align: right;
        padding-right: 5px;
@ -1796,9 +1756,8 @@ export default {
    }
  }
  .allDataChartWrap{
-  /*  width: 375px;
-    height: 220px;*/
-    @include whBg(375px, 200px, #FFFFFF);
+    width: 375px;
+    height: 220px;

  }
  .allDataChart{
@ -1806,10 +1765,8 @@ export default {
    height: 100%;
  }
  .webComAllData{
-    width: 420px;
-    height: 200px;
-    /*width: 375px;
-    height: 146px;*/
+    width: 400px;
+    height: 255px;
    float: left;
    margin: 10px;
  }
@ -1927,6 +1884,7 @@ export default {
  width: 100%;
  height: 95%;
 }
+
 ::v-deep .el-table {
  height: 100%;
 }
@ -1934,11 +1892,7 @@ 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%;
--- a/src/views/workOrder/accounting.vue
+++ b/src/views/workOrder/accounting.vue
@ -897,11 +897,11 @@ export default {

  .leftTitle {
    opacity: .5;
-    width: 60px;
+    @include wh(60px, 189px);
  }

  .rightContent {
-    /*height: 189px;*/
+    height: 189px;
    width: calc(100% - 60px);
  }

@ -980,7 +980,6 @@ img {

    .inputContent {
      text-align: right;
-      flex: 1;
    }
  }