task#14504,kpi的pc端适配js代码影响了后台挂载的H5页面，只给window.location.pathname=='/h5/supplier/dispatch/kpiIndex'加适配

task#14504,记账-》查看详情加车衣，电瓶费用展示
task#14504,记账-》车衣，电瓶费用展示详情界面
2024-08-07 13:58:50 +08:00 · 2024-07-31 16:57:30 +08:00 · 2024-07-31 14:48:37 +08:00 · 2024-07-31 13:56:46 +08:00 · 2024-07-30 15:29:56 +08:00 · 2024-07-30 14:48:15 +08:00
5 changed files with 725 additions and 619 deletions
--- a/public/index.html
+++ b/public/index.html
@ -3,6 +3,7 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+<!--      <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover,user-scalable=no">
    <meta name="format-detection" content="telephone=yes"/>
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
@ -34,11 +35,11 @@
        // VConsole 默认会挂载到 `window.VConsole` 上
        // let vConsole = new window.VConsole();
        (function (doc, win) {
+            console.log("==window.location.pathname===",window.location.pathname)
            let docEl = doc.documentElement
            let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'
            recalc = function () {
                var clientWidth = docEl.clientWidth;
-                // console.log("clientWidth",clientWidth)
                if (!clientWidth) return;
                if (clientWidth < 400) {
                    clientWidth = 400;
@ -48,13 +49,20 @@
            if (!doc.addEventListener) return;
            var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
            if (isMobile) {// 是移动端不变
-
+                // console.log("是移动端不变")
            }else{
+                if(window.location.pathname=='/h5/supplier/dispatch/kpiIndex'){
+                    // console.log("执行了执行了")
                    win.addEventListener(resizeEvt, recalc, false);
                    doc.addEventListener('DOMContentLoaded', recalc, false);
                }
-            // console.log("isMobile",isMobile)
+                /*else{
+                    console.log("走着了这种饿 ")
+                }*/
+            }
        })(document, window);
+
    </script>
+
  </body>
 </html>
--- a/src/views/kpi/components/common-table.vue
+++ b/src/views/kpi/components/common-table.vue
@ -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>
--- a/src/views/kpi/kpiIndex.vue
+++ b/src/views/kpi/kpiIndex.vue
@ -210,7 +210,7 @@
              v-for="item in driverselectOption"
              :key="item.id"
              :label="item.name"
-              :value="item.id">
+              :value="item.name">
          </el-option>
        </el-select>
      </div>
@ -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
@ -250,6 +250,7 @@
          :total="total">
      </el-pagination>-->
      <el-pagination
+          v-if="active !== 9"
          small
          :page-sizes="[20, 50, 100]"
          :current-page.sync="pageNum"
@ -323,7 +324,7 @@ export default {
      pageSize: 20,
      total: 0,
      swithVal: true,
-      supplierId:'',//1128
+      supplierId:'',
      selectLoading: false,
      selectOption: [],
      driverId:'',//68517
@ -351,7 +352,6 @@ export default {
  },
  methods: {
    async selectSupplierNameHanldle(){
-      console.log("supplierId",this.supplierId)
      await this.getData()
      setTimeout(()=>{
        this.$refs.Doughnut1.initCircle()
@ -361,7 +361,7 @@ export default {
        this.$refs.Doughnut5.initCircle()
        this.$refs.Doughnut6.initCircle()
        this.$refs.Doughnut7.initCircle()
-      },1000)
+      },1500)
    },
    async remoteMethod(query) {
      if (query !== '') {
@ -398,6 +398,8 @@ export default {
      console.log("搜索按钮")
    },
    async changeHandle() {
+      this.v1=[]
+      this.v2=[]
      await this.twoTabHanldeData();
      await this.drawLine();
    },
@ -435,6 +437,7 @@ export default {
      this.activeIndex = 0;
      this.detailList = [];
      this.labelList = [];
+      this.driverName=''
      this.getData();
      if (this.active === 1) {
        setTimeout(() => {
@ -507,6 +510,7 @@ export default {
        label: {
          show: true, // 显示标签
          position: 'top', // 标签位置在柱形顶部
+          formatter: '{c}%'
        }
      },
        {
@ -854,19 +858,37 @@ export default {
          this.indexData = res.data;
          this.supplierName=res.data?.supplierName
          this.indexData.refuseOrderRate=this.indexData.refuseOrderRate*100
-          this.indexData.timeoutOrderRate=this.indexData.timeoutOrderRate*100
          if (this.indexData.refuseOrderRate % 1 !== 0) {
            this.indexData.refuseOrderRate = this.indexData.refuseOrderRate.toFixed(2);
          }
+          this.indexData.timeoutOrderRate=this.indexData.timeoutOrderRate*100
          if (this.indexData.timeoutOrderRate % 1 !== 0) {
            this.indexData.timeoutOrderRate = this.indexData.timeoutOrderRate.toFixed(2);
          }
          this.indexData.complainOrderRate=this.indexData.complainOrderRate*100
+          if (this.indexData.complainOrderRate % 1 !== 0) {
+            this.indexData.complainOrderRate = this.indexData.complainOrderRate.toFixed(2);
+          }
          this.indexData.customerSatisfaction=this.indexData.customerSatisfaction*100
+          if (this.indexData.customerSatisfaction % 1 !== 0) {
+            this.indexData.customerSatisfaction = this.indexData.customerSatisfaction.toFixed(2);
+          }
          this.indexData.threeMinutesContactRate=this.indexData.threeMinutesContactRate*100
+          if (this.indexData.threeMinutesContactRate % 1 !== 0) {
+            this.indexData.threeMinutesContactRate = this.indexData.threeMinutesContactRate.toFixed(2);
+          }
          this.indexData.urgeRate=this.indexData.urgeRate*100
+          if (this.indexData.urgeRate % 1 !== 0) {
+            this.indexData.urgeRate = this.indexData.urgeRate.toFixed(2);
+          }
          this.indexData.appRate=this.indexData.appRate*100
+          if (this.indexData.appRate % 1 !== 0) {
+            this.indexData.appRate = this.indexData.appRate.toFixed(2);
+          }
          this.indexData.polymerizationSuccessRate=this.indexData.polymerizationSuccessRate*100
+          if (this.indexData.polymerizationSuccessRate % 1 !== 0) {
+            this.indexData.polymerizationSuccessRate = this.indexData.polymerizationSuccessRate.toFixed(2);
+          }
        } else if ([1, 2].includes(this.active)) {
          let res = await getStatisticsKpi({
            startTime: this.active === 1 ? this.startMonthTime : this.startTime,
@ -953,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
@ -1178,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 = {}
@ -1202,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 {
@ -1694,6 +1718,10 @@ export default {
  ::v-deep .el-input__inner{
    height: 30px;
  }
+  ::v-deep .el-input__suffix {
+    top: 4px; /* 给清除按钮预留空间 */
+  }
+
 }
 .comTab {
  width: 100%;
--- a/src/views/workOrder/accounting.vue
+++ b/src/views/workOrder/accounting.vue
--- a/src/views/workOrder/aduitCompleteDetail.vue
+++ b/src/views/workOrder/aduitCompleteDetail.vue
@ -11,7 +11,7 @@
        @click-left="goback"
    />
  </div>
-  <div class="baseInfo common">
+  <div class="baseInfo common" style="height: 344px">
    <div class="title">基本信息:</div>
    <div class="line"></div>
    <div class="item">
@ -47,9 +47,16 @@
    </div>
    <div class="item">
      <span class="titleLeft">扣除责任险费：</span>
-      <span class="content">{{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount}}</span>
+      <span class="content">{{orderInfo.policyAmount}}</span>
+    </div>
+    <div class="item">
+      <span class="titleLeft">车衣费用：</span>
+      <span class="content">{{orderInfo.carClothingToolAmount}}</span>
+    </div>
+    <div class="item">
+      <span class="titleLeft">换电瓶费用：</span>
+      <span class="content">{{orderInfo.replaceBatteryAmount}}</span>
    </div>
-
  </div>
  <div class="baseInfo common">
    <div class="title">审核数据:</div>
Author	SHA1	Message	Date
zhouxueli	dedb0f53e9	task#14504,kpi的pc端适配js代码影响了后台挂载的H5页面，只给window.location.pathname=='/h5/supplier/dispatch/kpiIndex'加适配	2024-08-07 13:58:50 +08:00
zhouxueli	8bed0868f8	task#14504,记账-》查看详情加车衣，电瓶费用展示	2024-07-31 16:57:30 +08:00
zhouxueli	70cea4d888	task#14504,记账-》车衣，电瓶费用展示详情界面	2024-07-31 14:48:37 +08:00
zhouxueli	6d1df4a720	task#14504,记账-》添加车衣，电瓶，责任险费用有就扣除；新增结算比例，按地库费用结算	2024-07-31 13:56:46 +08:00
zhouxueli	a7cf0a837e	task#14504,删除首页默认服务商id	2024-07-30 15:29:56 +08:00
zhouxueli	ec995b7548	task#14504,月总，客户评价率缺少百分号，移动端时效切换折线图数据bugfix,table双loading优化，请求慢时，日期渲染无效日期格式优化	2024-07-30 14:48:15 +08:00
zhouxueli	372bbc44c0	task#14504,清除按钮位置调整，司机搜索使用name	2024-07-25 17:12:31 +08:00