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
11 changed files with 2554 additions and 979 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,7 +6,7 @@ node_modules
 # local env files
 .env.local
 .env.*.local
-/http.js
+src/http.js
 http.js
 # Log files
 npm-debug.log*
--- 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">
@ -29,5 +30,39 @@
        }
    </script>
    <script src="https://webapi.amap.com/maps?v=1.4.15&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.Polyline"></script>
+
+    <script>
+        // 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;
+                if (!clientWidth) return;
+                if (clientWidth < 400) {
+                    clientWidth = 400;
+                }
+                docEl.style.fontSize = 18 * (clientWidth / 650) + 'px';
+            };
+            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);
+                }
+                /*else{
+                    console.log("走着了这种饿 ")
+                }*/
+            }
+        })(document, window);
+
+    </script>
+
  </body>
 </html>
--- a/src/api/kpi.js
+++ b/src/api/kpi.js
@ -4,7 +4,7 @@ export function getStatisticsKpiByMonth(data){
  return request({
    url: '/supplier/supplierKPI/querySupplierStatisticsKpiByMonth',
    method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
    data
  })
 }
@ -13,7 +13,7 @@ export function getStatisticsKpi(data){
  return request({
    url: '/supplier/supplierKPI/querySupplierStatisticsKpi',
    method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
    data
  })
 }
@ -23,7 +23,7 @@ export function getDriverStatisticsKpi(data){
  return request({
    url: '/supplier/supplierKPI/querySupplierDriverStatisticsKpi',
    method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
    data
  })
 }
@ -32,7 +32,27 @@ export function getKpiDetailsData(data){
  return request({
    url: '/supplier/supplierKPI/querySupplierKpiDetailsData',
    method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
    data
  })
 }
+// 关键词搜索服务商名称
+export function getSupplierId(key) {
+  return request({
+    url: '/supplier/select/supplier',
+    method: 'GET',
+    params: {
+      key: key ,
+    }
+  });
+}
+// supplier/select/driver 关键词搜索司机名称
+export function getDriverName(key) {
+  return request({
+    url: '/supplier/select/driver',
+    method: 'GET',
+    params: {
+      key: key ,
+    }
+  });
+}
--- a/src/views/index/reporting.vue
+++ b/src/views/index/reporting.vue
@ -111,7 +111,7 @@ export default {
  padding: 13px 24px 0;
  width: 100%;
  height: 100%;
-  //overflow-y: auto;
+  overflow-y: auto;
 }

 .title {
--- a/src/views/kpi/components/circleChar.vue
+++ b/src/views/kpi/components/circleChar.vue
@ -1,6 +1,6 @@
 <template>
 <div class="wrap">
-  <div id="supplierScore" ref="supplierScore" style="width: 100%;height: 125px" @click="handle"></div>
+  <div  id="supplierScore" ref="supplierScore" class="chart" @click="handle"></div>
 </div>
 </template>

@ -14,14 +14,25 @@ export default {
    }
  },
  mounted() {
+  /*  if(this.data){
      this.drawHandle();
+    }*/
+    setTimeout(()=>{
+      this.drawHandle();
+    },500)
+
  },
  methods:{
+    initCircle(){
+      // setTimeout(()=>{
+        this.drawHandle();
+      // },500)
+    },
    handle(){
      if(this.titleText == '投诉率'){
-        console.log(this.titleText)
+        this.$emit('clickComplain')
      }else if(this.titleText == '使用率'){
-        console.log(this.titleText)
+        this.$emit('clickUse')
      }
    },
    // 绘制 总分图表
@ -95,4 +106,8 @@ export default {
 .img{
  @include whMarLe(12px,10px,4px);
 }
+.chart{
+  width: 100%;
+  height: 125px;
+}
 </style>
--- 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/components/noFit-table.vue
+++ b/src/views/kpi/components/noFit-table.vue
@ -0,0 +1,172 @@
+<template>
+  <div class="wrap">
+    <el-table :data="tableData"
+              stripe
+              border
+              style="width: 100%"
+              height="100%"
+              v-loading="loading"
+              :cell-style="setTableCellStyle"
+              class="custom-table">
+      <template v-if="active===1">
+        <el-table-column v-for="item in labelList" :key="item.prop" :label="item.label" :prop="item.prop" align="center">
+          <template slot-scope="scope">{{scope.row[item.prop]}}  </template>
+        </el-table-column>
+      </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'">
+        </el-table-column>
+      </template>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "noFit-table",
+  props: ['tableData', 'labelList', 'loading', 'isMobile','active'],
+  data() {
+    return {}
+  },
+  mounted() {
+  },
+  methods: {
+    setTableCellStyle({ row, column,columnIndex }) {
+      // 月总表格被转置，原始方法失效，重新定义对比
+      if(this.active===1){
+        if(row.month == '3′接单率(%)'){
+          if(columnIndex){
+            let res=row[column.property]
+            const rate = parseFloat(res && res.replace('%', ''));
+            if(rate < 95){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '接单时效(分)'){
+          if(columnIndex){
+            let res=row[column.property]
+            if(res > 5){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '到达时效(分)'){
+          if(columnIndex){
+            let res=row[column.property]
+            if(res > 40){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '总聚合成功率(%)'){
+          if(columnIndex){
+            let res=row[column.property]
+            const rate = parseFloat(res && res.replace('%', ''));
+            if(rate < 80){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '使用率(%)'){
+          if(columnIndex){
+            let res=row[column.property]
+            const rate = parseFloat(res && res.replace('%', ''));
+            if(rate < 95){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '投诉率(%)'){
+          if(columnIndex){
+            let res=row[column.property]
+            const rate = parseFloat(res && res.replace('%', ''));
+            if(rate > 0.1){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+      }
+      // 接单率
+      if(column.property=='threeMinutesReceivingRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.threeMinutesReceivingRate && row.threeMinutesReceivingRate.replace('%', ''));
+          if(rate < 95){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //师傅接单时效》5
+      if(column.property=='receiving'){
+        if(columnIndex){
+          if(row.receiving > 5){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //到达时效》40
+      if(column.property=='arriving'){
+        if(columnIndex){
+          if(row.arriving > 40){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //聚合成功率《80
+      if(column.property=='polymerizationSuccessRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.polymerizationSuccessRate && row.polymerizationSuccessRate.replace('%', ''));
+          if(rate < 80){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //app使用率《95
+      if(column.property=='appRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.appRate && row.appRate.replace('%', ''));
+          if(rate < 95){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //催促率》3
+      if(column.property=='urgeRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.urgeRate && row.urgeRate.replace('%', ''));
+          if(rate > 3){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //投诉率》0.1
+      if(column.property=='complainOrderRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.complainOrderRate.replace('%', ''));
+          if(rate > 0.1){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+::v-deep .el-table{
+  font-size: 11px;
+}
+::v-deep .el-table thead{
+  color: #1D2129;
+  font-weight: bold;
+}
+::v-deep .el-table th.el-table__cell.is-leaf {
+  background-color: #E5E6EB;
+}
+::v-deep .el-table .el-table__cell{
+  padding: 4px 0 !important;
+}
+</style>
--- a/src/views/kpi/kpiIndex.vue
+++ b/src/views/kpi/kpiIndex.vue
--- a/src/views/vehicle-maintenance/maintenance-application.vue
+++ b/src/views/vehicle-maintenance/maintenance-application.vue
@ -24,7 +24,7 @@
      <div ><span class="opa">车辆名称:</span><span>{{ detailInfo.vehicleName }}</span></div>
      <div><span class="opa">车牌号:</span><span>{{ detailInfo.plateNumber }}</span></div>
 <!--      审批中，通过，终止detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3-->
-      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" >门店信息:</span><span>{{detailInfo.repairPoint || ''}}</span></div>
+      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" >门店信息:</span><span class="textarea">{{detailInfo.repairPoint || ''}}</span></div>
      <div class="shopImgList" v-if="[1,2,3].includes(detailInfo.states)">
        <template v-if="detailInfo.storePhotoUrls && detailInfo.storePhotoUrls.indexOf(',') !== -1">
          <div v-for="(item,index) in (detailInfo.storePhotoUrls?.split(','))" :key="index">
@ -40,7 +40,7 @@
      <div v-if="noPassStatus"><span class="opa">车辆里程:</span><span>{{ parseInt(detailInfo.mileage) || '' }}km</span></div>
      <div v-if="noPassStatus"><span class="opa">结算类型:</span><span>{{ detailInfo.paymentType?.label || '' }}</span></div>
      <div v-if="noPassStatus && detailInfo.paymentType?.code !=2"><span class="opa">维修金额:</span><span>{{ detailInfo.amount || ''}}元</span></div>
-      <div v-if="noPassStatus && detailInfo.paymentType?.code !=2" class="shopName"><span class="opa">维保项目:</span><span class="project">{{ detailInfo.information ||'' }}</span></div>
+      <div v-if="noPassStatus && detailInfo.paymentType?.code !=2" class="shopName"><span class="opa">维保项目:</span><span class="project textarea">{{ detailInfo.information ||'' }}</span></div>
    </div>
 <!--   不通过-->
    <div class="detailInfo"  v-if="noPassStatus  && detailInfo.paymentType?.code !=2">
@ -335,13 +335,16 @@ export default {
    line-height: 27px;
  }
  .shopName{
-    //width: 100%;
+    width: 100%;
    display: flex;
    align-items: baseline;
+    .textarea{
+      width: calc(100% - 60px);
+    }
  }
  .project{
    color: #E8A524;
-    width: calc(100% -  60px);
+    //width: calc(100% -  60px);
  }
  .shopImgList{
    margin-top: 6px;
--- 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
zhouxueli	7b160e12fb	task#14504,清除按钮位置调整	2024-07-25 11:17:36 +08:00
zhouxueli	4c393f3f1e	task#14504,服务商搜索删除放大镜图标	2024-07-25 11:03:11 +08:00
zhouxueli	5afbf9df90	task#14504, 分数文字右对齐，分数左对齐，订单相关的页面，全部加上分页，搜索服务商，加清除键	2024-07-23 14:18:15 +08:00
zhouxueli	073814bd69	bug#4506, 重新记账模块是否扣除保险费int型转string展示	2024-07-18 11:25:47 +08:00
zhouxueli	06fdbc4f84	story#4506, 司机名称搜索框加可清除功能	2024-07-11 21:06:55 +08:00
zhouxueli	86ed97f265	story#4506, 页码调整	2024-07-11 09:36:59 +08:00
zhouxueli	0aa9f3ec04	story#4506, KPI演示优化-240709	2024-07-10 21:19:53 +08:00
zhouxueli	48cd129290	task#14196,二级tab切换bugfix	2024-07-09 16:20:30 +08:00
zhouxueli	b8096b39f3	task#14196，高亮背景色改为蓝色	2024-07-09 15:41:56 +08:00
zhouxueli	3a45615e4f	task#14196，默认首页	2024-07-09 15:39:58 +08:00
zhouxueli	d1b04ec51c	task#14196，web端时效优化	2024-07-09 15:32:06 +08:00
zhouxueli	dc091c6dd5	task#14196，保留两位小数	2024-07-09 15:16:44 +08:00
zhouxueli	45914f0577	task#14196，折线图百分号处理	2024-07-09 15:02:02 +08:00
zhouxueli	42694d57de	task#14196，高亮提示	2024-07-09 10:06:54 +08:00
zhouxueli	61ccb58af2	task#14196，首页	2024-07-08 21:22:03 +08:00
zhouxueli	f6c33c8c36	task#14196，日总不需要筛选框	2024-07-08 20:49:41 +08:00
zhouxueli	1fbc66a1d6	task#14196，师傅加司机名称筛选	2024-07-08 20:32:51 +08:00
zhouxueli	b80a748dc9	task#14196，率*100保留两位小数	2024-07-08 19:05:07 +08:00
zhouxueli	f38e2ce614	task#14196，客户满意度是率	2024-07-08 18:33:51 +08:00
zhouxueli	febf9a636e	task#14196，客户满意度是率	2024-07-08 18:15:54 +08:00
zhouxueli	8deaa85c1c	task#14196，数据率显示带百分号	2024-07-08 18:09:31 +08:00
zhouxueli	70675fde50	task#14196，数据率*100	2024-07-08 18:02:56 +08:00
zhouxueli	af297b5892	task#14196，web端搜索框字体大小优化	2024-07-08 17:43:09 +08:00
zhouxueli	f472c878e8	task#14196，web端柱形图优化	2024-07-08 17:38:41 +08:00
zhouxueli	5df83abfcf	task#14196，中道首页不显示数据问题	2024-07-08 17:27:27 +08:00
zhouxueli	11664e92bf	task#14196，师傅日字段获取	2024-07-08 15:58:30 +08:00
zhouxueli	4be4015e30	task#14196，数据显示优化	2024-07-08 14:24:31 +08:00
zhouxueli	39603134fb	task#14196，border适配问题	2024-07-08 13:59:47 +08:00
zhouxueli	ad49a716b9	task#14196，.active的border样式更改	2024-07-08 13:33:29 +08:00
zhouxueli	b1945ab42f	task#14196，拖车小修40分钟到达率字段更换	2024-07-08 10:36:14 +08:00
zhouxueli	4da4cacd7b	task#14196，h5服务商名称动态	2024-07-08 09:51:09 +08:00
zhouxueli	39c8bb857b	task#14196，kpiWEB端优化	2024-07-08 09:37:02 +08:00
zhouxueli	0dd54330af	task#14196，kpiWEB端优化	2024-07-08 09:36:09 +08:00
zhouxueli	a7c7dafa33	task#14196，kpi优化	2024-07-05 17:31:17 +08:00
zhouxueli	b2af0684fa	task#14196，kpi优化	2024-07-05 17:25:00 +08:00
zhouxueli	cb50de4039	task#14196，kpi明细表格调整	2024-07-04 13:22:25 +08:00
zhouxueli	7785c7ecbe	task#14196，kpi界面适配web端更改css样式	2024-07-03 14:05:14 +08:00
zhouxueli	f45792b527	task#14196，报备事项超出高度滚动条	2024-07-01 16:46:56 +08:00
zhouxueli	793be9d28d	task#14196，添加响应式判断，师傅表格数据调整	2024-07-01 16:32:37 +08:00
zhouxueli	d4c6081f34	task#14196，data数据目前只有6月份，日期写死6月份	2024-07-01 13:41:01 +08:00
zhouxueli	e11946352c	task#14196，data动态数据添加	2024-07-01 10:32:19 +08:00
zhouxueli	481c37f708	task#14196，忽略配置文件更改	2024-06-29 16:57:46 +08:00
zhouxueli	605bc306a5	Merge branch 'master' into prod-24-06-20	2024-06-29 16:35:51 +08:00
zhouxueli	d5d090cdc8	task#14072，门店信息换行bug	2024-06-21 14:33:28 +08:00