task#15638,电瓶详情列表根据时间排序

package-lock.json

@@ -1713,9 +1713,9 @@
       }
     },
     "@vant/icons": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
-      "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-3.0.2.tgz",
+      "integrity": "sha512-4OlRVMd0uiDtD9hgSISZW8hB95vU0fFtc41tQchRIyiXkR0tS+DydZOLb8/bQkithrNWhW7Uud38MbKjlJ9lJw=="
     },
     "@vant/popperjs": {
       "version": "1.3.0",
@@ -2030,6 +2030,49 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
+      },
+      "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.11.1",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
+          "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2194,47 +2237,6 @@
         }
       }
     },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.11.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
-      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
-      }
-    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -3542,10 +3544,16 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
       "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
+    "dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+      "dev": true
     },
     "debug": {
       "version": "4.3.4",
@@ -4880,7 +4888,8 @@
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
     },
     "highlight.js": {
       "version": "10.7.3",
@@ -5508,7 +5517,8 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -8025,12 +8035,12 @@
       }
     },
     "vant": {
-      "version": "2.12.54",
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.54.tgz",
-      "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==",
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.13.2.tgz",
+      "integrity": "sha512-anZbbLqXCq+rUJk10D67mn+V/1/i9tfOTdoR+64B0e+0BzV3KFgpHBF76noLa+yX9i/L+8DeL560WMk0GEN38g==",
       "requires": {
         "@babel/runtime": "7.x",
-        "@vant/icons": "^1.7.1",
+        "@vant/icons": "^3.0.2",
         "@vant/popperjs": "^1.1.0",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "vue-lazyload": "1.2.3"
@@ -8245,6 +8255,7 @@
       "version": "2.7.14",
       "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
       "integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
+      "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.2.0"

package.json

@@ -18,7 +18,7 @@
     "qs": "^6.11.2",
     "sass": "^1.65.1",
     "sass-loader": "^13.3.2",
-    "vant": "^2.12.54",
+    "vant": "^2.13.2",
     "vue": "^2.6.14",
     "vue-router": "^3.0.7",
     "vuex": "^3.6.2",

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,16 +30,16 @@
         }
     </script>
     <script src="https://webapi.amap.com/maps?v=1.4.15&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.Polyline"></script>
-
+<!--    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></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;
-                // 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{
-                win.addEventListener(resizeEvt, recalc, false);
-                doc.addEventListener('DOMContentLoaded', recalc, false);
+                if(window.location.pathname=='/h5/supplier/dispatch/kpiIndex'){
+                    // console.log("执行了执行了")
+                    win.addEventListener(resizeEvt, recalc, false);
+                    doc.addEventListener('DOMContentLoaded', recalc, false);
+                }
+                /*else{
+                    console.log("走着了这种饿 ")
+                }*/
             }
-            // console.log("isMobile",isMobile)
         })(document, window);
+
     </script>
+
   </body>
 </html>

src/api/kpi.js

@@ -36,14 +36,7 @@ export function getKpiDetailsData(data){
     data
   })
 }
-/*export function getSupplierId(data){
-  return request({
-    url: '/supplier/select/supplier',
-    method:'GET',
-    // contentType: 'application/json',
-    data
-  })
-}*/
+// 关键词搜索服务商名称
 export function getSupplierId(key) {
   return request({
     url: '/supplier/select/supplier',
@@ -53,3 +46,13 @@ export function getSupplierId(key) {
     }
   });
 }
+// supplier/select/driver 关键词搜索司机名称
+export function getDriverName(key) {
+  return request({
+    url: '/supplier/select/driver',
+    method: 'GET',
+    params: {
+      key: key ,
+    }
+  });
+}

src/api/mine.js

@@ -132,7 +132,7 @@ export function deleteImage(data){
     })
 }
 //新增记账图片 form-data
-export function insertRecordPicture(data){
+/*export function insertRecordPicture(data){
     return request({
         url:'/supplierAppV2/dispatchApp/accountRecord/insertRecordPicture',
         method:'POST',
@@ -142,7 +142,7 @@ export function insertRecordPicture(data){
         //     'Content-Type': 'multipart/form-data',
         // },
     })
-}
+}*/
 
 //开票通知列表
 export function notifyInvoiceList(data){
@@ -162,7 +162,7 @@ export function notifyInvoiceDetail(data){
         data
     })
 }
-// /supplier/supplierTrainingMaterials/pageList 获取培训材料列表
+//  调度app获取新签列表
 export function pageList(data){
     return request({
         url:'/supplierAppV2/dispatchApp/user/supplierTrainingMaterialsPageList',
@@ -171,6 +171,31 @@ export function pageList(data){
         data
     })
 }
+//  司机app获取新签列表
+export function driverTrainList(key){
+    return request({
+        url:'/supplier/supplierTraining/trainingTask',
+        method:'GET',
+        params:key
+    })
+}
+
+//获取普通材料
+export function getNormalList(key) {
+    return request({
+        url: '/supplier/supplierTraining/normalList',
+        method: 'GET',
+        params:key
+    });
+}
+//获取培训材料
+export function getTrainingList(key) {
+    return request({
+        url: '/supplier/supplierTraining/trainingList',
+        method: 'GET',
+        params:key
+    });
+}
 //用户操作权限
 export function userOperationPermissions(){
     return request({

src/api/order.js

@@ -77,3 +77,21 @@ export function updateOrderSettlement(data){
     data
   })
 }
+// 电瓶数量列表
+export function batteryCountList(){
+  return request({
+    url:'/supplierAppV2/dispatchApp/battery/batteryCountList',
+    method:'POST',
+    contentType:'application/json',
+    // data
+  })
+}
+// 电瓶详情
+export function batteryDetailList (data){
+  return request({
+    url:'/supplierAppV2/dispatchApp/battery/batteryDetailList',
+    method:'POST',
+    contentType:'application/json',
+    data
+  })
+}

src/router/index.js

@@ -131,6 +131,14 @@ const routes = [
         path: '/trainDocment',
         name: 'trainDocment',
         component:()=>import('@/views/documentView/trainDocment.vue'),
+        meta: {
+            title:'培训文档',
+        }
+    },
+    {
+        path: '/diverTrainDocment',
+        name: 'diverTrainDocment',
+        component:()=>import('@/views/documentView/diverTrainDocment.vue'),
         meta: {
             title:'培训文档'
         }
@@ -180,7 +188,15 @@ const routes = [
         name: 'newTrainingList',
         component:()=>import('@/views/newcomerTraining/newTrainingList.vue'),
         meta: {
-            title:'新人培训'
+            title:'新服务商培训'
+        }
+    },
+    {
+        path: '/driverTrainingList',
+        name: 'driverTrainingList',
+        component:()=>import('@/views/newcomerTraining/driverTrainingList.vue'),
+        meta: {
+            title:'新师傅培训'
         }
     },
     {
@@ -199,6 +215,22 @@ const routes = [
             title:'维保申请'
         }
     },
+    {
+        path: '/batteryList',
+        name: 'batteryList',
+        component:()=>import('@/views/battery/batteryList.vue'),
+        meta: {
+            title:'电瓶进销存'
+        }
+    },
+    {
+        path: '/batteryDetail',
+        name: 'batteryDetail',
+        component:()=>import('@/views/battery/batteryDetail.vue'),
+        meta: {
+            title:'电瓶详情'
+        }
+    },
     ...kpiRouter,
   ]
 

src/styles/docment.scss

@@ -1,8 +1,9 @@
 @import "@/styles/mixin.scss";
+
 .wrap{
   @include wh(100%,100%);
   background-color: #F4F5F7;
-  overflow-y: auto;
+
 }
 .navBar{
   margin-bottom: 46px;
@@ -13,16 +14,44 @@
     @include wh(17px, 17px);
   }
 }
+.tab_wrap {
+  @include fontWeightSize(bold, 12px);
+  display: flex;
+  justify-content: space-around;
+  padding: 5px 0 5px 0;
+  @include colorOpa(#737373,0.7);
+  div {
+    padding-top: 8px;
+  }
+  .active {
+    color: #3678FF;
+    position: relative;
+  }
+  .active:after {
+    content: '';
+    display: block;
+    @include wh(50px,2px);
+    background: linear-gradient(270deg, #33A3FF 0%, #176AFE 100%);
+    border-radius: 2px;
+    position: absolute;
+    margin-top: 3px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
 .contentWrap{
   @include sizingPadding(0,8px);
+  overflow-y: auto;
   width: 100%;
-  margin-top: 20px;
+  height: calc(100% - 100px);
+  margin-top: 10px;
   .itemWrap{
     margin-bottom: 16px;
-    @include wh(100%, 300px);
+    width: 100%;
+    //@include wh(100%, 300px);
     background: #FFFFFF;
     box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
-    @include sizingPadRadius(6px ,0,3px);
+    @include sizingPadRadius(6px ,0,6px);
     @include flexAround;
     @include fontWeightSize(400, 12px);
     .flexBetween{
@@ -31,18 +60,16 @@
     .common{
       margin: 0 15px ;
     }
+    .time{
+      color: rgba(0,0,0,0.7);
+      margin-top: 5px;
+    }
     .imgWrap{
       @include wh(100%,200px);
       position: relative;
+      margin: 6px 0;
       img{
-        @include wh(100%,200px);
-      }
-      .name{
-        position: absolute;
-        left: 30px;
-        bottom: 30px;
-        @include fontWeightSize(bold,14px);
-        color: #FFFFFF;
+        @include wh(100%,100%);
       }
     }
     .left{

src/styles/driverDocment.scss

@@ -0,0 +1,103 @@
+@import "@/styles/mixin.scss";
+::v-deep .van-nav-bar__content{
+  background-color: #3A3A3A !important;
+}
+.wrap{
+  @include wh(100%,100%);
+  background-color: #F4F5F7;
+
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.search{
+  color: #AAADB3  !important;
+  font-weight: bolder;
+  margin-right: 10px;
+}
+.navLeft{
+  display: flex;
+  flex-direction: column;
+  color: #9C9C9C;
+  font-size: 8px;
+  .icon{
+    font-size: 10px;
+    font-weight: bold;
+    margin-right: 5px;
+    margin-top: 5px;
+  }
+}
+.statisticContainer{
+  box-sizing: border-box;
+  padding: 8px;
+}
+.statisticWrap{
+  @include wh(100%,100px);
+  background: #FFFFFF;
+  box-sizing: border-box;
+  padding: 8px 8px 15px;
+  border-radius: 8px;
+  border: 1px solid #c7c1c1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .line1{
+    display: flex;
+    justify-content: space-between;
+    span:first-child{
+      font-weight: bolder;
+    }
+    span:last-child{
+      opacity: .7;
+      //font-size: 12px;
+    }
+  }
+  .numWrap{
+    display: flex;
+    justify-content: space-around;
+    div{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      font-size: 14px;
+      font-weight: 500;
+      span:first-child{
+        margin-bottom: 3px;
+        font-size: 18px;
+      }
+    }
+  }
+}
+.rightWrap {
+  @include flexCenter;
+  .img2 {
+    @include wh(17px, 17px);
+  }
+}
+.driver_tab_wrap {
+  font-size: 12px;
+  display: flex;
+  justify-content: space-around;
+  padding: 5px 0 5px 0;
+  div {
+    padding-top: 8px;
+  }
+  .active {
+    position: relative;
+  }
+  .active:after {
+    content: '';
+    display: block;
+    @include wh(100px,2px);
+    background-color: #E8A524;
+    border-radius: 2px;
+    position: absolute;
+    margin-top: 3px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
+.empty{
+  margin-top: 14px;
+
+}

src/utils/http.js

@@ -16,18 +16,20 @@ localStorage.setItem('token', token);
 service.interceptors.request.use(
     config => {
       let reqUrl=config.url
+        // console.log("reqUrl",reqUrl)
       config.data = config.contentType ? config.data : qs.stringify(config.data)
       config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded'
       let token = localStorage.getItem('token');
-       // alert(token);
       // let token='4099761587129c46b03c9316c9e866c9'
       // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MTI0NTQ5NTMsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiJDLeS4iua1t-a1i-ivleacjeWKoeWVhiIsInN1cHBsaWVySWQiOjMzMDQxLCJzdXBwbGllclR5cGUiOjIsInVzZXJuYW1lIjoic29uZyIsInVzZXJUeXBlIjoicmVzY3VlQXBwIiwiZGV2aWNlSWQiOiIyMmI0OWNhMjBmOWI4MzMwZDk4NzIxNzNmMzllYTY4YmMiLCJhdXRob3JpdGllcyI6W119LCJzY29wZSI6WyJhbGwiXSwiaXNzIjoiaHR0cHM6Ly9zaW5vYXNzaXN0LmNvbSIsImV4cCI6MTcxMjU0MTM1MywiaWF0IjoxNzEyNDU0OTUzfQ.sPU9_OD_TOWcTwqmlawEGyo4mCPrEaRYw2R02gnvYJw'
-          // console.log("tokentokentoken",token)
       if (reqUrl.includes("/driverApp")) {
+          //  console.log("司机app")
           config.headers['token'] = `${token}`;
-      } else {
-          console.log("调度app")
+      } else if(reqUrl.includes("/supplierApp") || reqUrl.includes("/supplierKPI") || reqUrl.includes('/supplier/select')){
+          // console.log("调度app，服务商kpi")
           config.headers['Authorization'] = `${token}`;
+      }else{
+          config.headers['token'] = `${token}`;
       }
       return config
     },

src/utils/myMixins.js

@@ -34,19 +34,26 @@ export const myMixins = {
         window.android.sendMessage("goBack");
       }
     },
-    goH5Detail(item){//h5传参到app文档资料，培训文档
+    goH5Detail(item,type){//h5传参到app文档资料，培训文档
+      // console.log("type",type)
       let data = {
         "action": "goTraining",
         "params": {
-          "id": item.id,
+          "id":type == '培训文档' ? Number(1000000+item.id) : item.id,
         }
       };
+
       let u = navigator.userAgent;
       let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
       if(isiOS){
+        // console.log("data",data)
         window.webkit.messageHandlers.nativeObject.postMessage(data);
       }else {
-        window.android.sendMessage("articleId=" + item.id);
+        if(type == '培训文档'){
+          window.android.sendMessage("articleId=" +'q'+ item.id);
+        }else{
+          window.android.sendMessage("articleId=" + item.id);
+        }
       }
     },
     h5GoBack(){

src/views/battery/batteryDetail.vue

@@ -0,0 +1,138 @@
+<template>
+  <div class="wrap" >
+    <div class="navBar">
+      <van-nav-bar
+          title="已售电瓶"
+          left-arrow
+          left-arrow-color="#FFFFFF"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="h5GoBack"
+      > </van-nav-bar>
+    </div>
+    <div class="container" v-if="batteryDetailList && batteryDetailList.length>0">
+      <div class="itemWrap" v-for="(item,index) in batteryDetailList" :key="index">
+        <div>
+          <span class="halfOpci">设备号</span>
+          <span class="allOpci">{{ item.productNo }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">品牌</span>
+          <span class="allOpci">{{ item.brand }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">型号</span>
+          <span class="allOpci">{{ item.model }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">售卖人员</span>
+          <span class="allOpci">{{ item.saleName }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">售卖时间</span>
+          <span class="allOpci">{{ item.createTime }}</span>
+        </div>
+      </div></div>
+  </div>
+</template>
+
+<script>
+
+import {myMixins} from "@/utils/myMixins"
+import {batteryDetailList} from  "@/api/order"
+export default {
+  name: "batteryDetail",
+  mixins:[myMixins],
+  data(){
+    return{
+      batteryDetailList:[],
+      isLoading: false,
+      loading: false,
+      brand: '',
+      model:'',
+    }
+  },
+  async mounted() {
+    this.brand = this.$route.params.brand;
+    this.model = this.$route.params.model;
+    await this.getDetailList()
+  },
+  methods:{
+    async getDetailList(){
+      let res = await batteryDetailList({
+        brand:this.brand,
+        model:this.model,
+      })
+      this.batteryDetailList=res.data.reverse();
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+@import "@/styles/common.scss";
+
+.wrap {
+  background: #F4F5F7;
+  @include wh(100%, 100%);
+}
+.navBar{
+  margin-bottom: 46px;
+  .rightWrap{
+    @include wh(50px,20px);
+    border-radius: 10px;
+    opacity: 0.7;
+    border: 1px solid #FFFFFF;
+    @include flexTwoCenter;
+    img{
+      @include widHeiMar(9px,8px,4px);
+    }
+    .addTxt{
+      @include fontWeightSize(bolder,11px);
+      @include colorOpa( #FFFFFF,0.7);
+    }
+  }
+}
+.container{
+  @include wh(100%, calc(100% - 56px));
+  overflow-y: auto;
+  @include sizingPadding(13px,13px);
+}
+.itemWrap {
+  @include wh(100%, 104px);
+  @include radiusSizing(6px);
+  @include fontWeightSize(400, 12px);
+  @include flexBetween;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
+  margin-bottom: 10px;
+  padding: 11px 13px 9px 15px;
+  position: relative;
+  .halfOpci {
+    display: inline-block;
+    width: 60px;
+    opacity: .5;
+    margin-right: 5px;
+  }
+  .allOpci {
+    opacity: 1;
+  }
+  .statusNo {
+    color: #FF0000;
+  }
+  .statusYes {
+    color: #09B820
+  }
+  .img{
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    right: 10px;
+    top: 35%;
+    cursor: pointer;
+  }
+}
+
+</style>

src/views/battery/batteryList.vue

@@ -0,0 +1,171 @@
+<template>
+  <div class="wrap" >
+    <div class="navBar">
+      <van-nav-bar
+          title="电瓶进销存"
+          left-arrow
+          left-arrow-color="#FFFFFF"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="goBack"
+      >
+      </van-nav-bar>
+    </div>
+    <van-field class="input" right-icon="search" v-model="keyword" placeholder="请输入品牌或型号"   @input="filterBatteryList"/>
+    <div class="container" v-if="batteryList && batteryList.length>0">
+      <div class="itemWrap" v-for="(item,index) in batteryList" :key="index">
+        <div>
+          <span class="halfOpci">品牌</span>
+          <span class="allOpci">{{ item.brand }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">型号</span>
+          <span class="allOpci">{{ item.model }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">总量</span>
+          <span class="allOpci">{{ item.totalNum }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">库存数量</span>
+          <span class="allOpci">{{ item.stockNum }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">已售数量</span>
+          <span class="allOpci">{{ item.sellNum }}</span>
+        </div>
+        <img @click="goBatteryDetail(item)" class="img" src="@/assets/arrow_rht.png" />
+      </div>
+    </div>
+    <div class="bgEmptyImg" v-show="show" >
+      <img  src="@/assets/empty.png" />
+    </div>
+  </div>
+</template>
+
+<script>
+
+import {myMixins} from "@/utils/myMixins"
+import {batteryCountList} from  "@/api/order"
+export default {
+  name: "batteryList",
+  mixins:[myMixins],
+  data(){
+    return{
+      batteryList:[],
+      isLoading: false,
+      keyword:'',
+    }
+  },
+  computed:{
+    show() {
+      return (this.batteryList.length < 0 || this.batteryList.length == 0); // 判断数组长度是否大于 0
+    },
+  },
+  mounted() {
+    this.getList()
+  },
+  methods:{
+    async filterBatteryList(){
+      await this.getList()
+      this.batteryList = this.batteryList.filter(item =>
+          item.brand.includes(this.keyword) || item.model.includes(this.keyword)
+      );
+    },
+    goBatteryDetail(item){//电瓶详情
+      this.$router.push({
+        name: "batteryDetail",
+        params: {
+          brand: item.brand,
+          model: item.model,
+        }
+      })
+    },
+    async getList(){
+      let res = await batteryCountList()
+      this.batteryList=res.data
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+@import "@/styles/common.scss";
+
+.wrap {
+  background: #F4F5F7;
+  @include wh(100%, 100%);
+}
+.navBar{
+  margin-bottom: 46px;
+  .rightWrap{
+    @include wh(50px,20px);
+    border-radius: 10px;
+    opacity: 0.7;
+    border: 1px solid #FFFFFF;
+    @include flexTwoCenter;
+    img{
+      @include widHeiMar(9px,8px,4px);
+    }
+    .addTxt{
+      @include fontWeightSize(bolder,11px);
+      @include colorOpa( #FFFFFF,0.7);
+    }
+  }
+}
+.input{
+  //@include sizingPadding(13px,13px);
+  //margin: 13px 0;
+}
+.container{
+  @include sizingPadding(13px,13px);
+  overflow-y: auto;
+  @include wh(100%, calc(100% - 96px));
+}
+
+.itemWrap {
+  @include wh(100%, 104px);
+  @include radiusSizing(6px);
+  @include fontWeightSize(400, 12px);
+  @include flexBetween;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
+  margin-bottom: 10px;
+  padding: 11px 13px 9px 15px;
+  position: relative;
+  //margin-top: 10px;
+  .halfOpci {
+    display: inline-block;
+    width: 60px;
+    opacity: .5;
+    margin-right: 5px;
+  }
+  .allOpci {
+    opacity: 1;
+  }
+  .statusNo {
+    color: #FF0000;
+  }
+  .statusYes {
+    color: #09B820
+  }
+  .img{
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    right: 10px;
+    top: 35%;
+    cursor: pointer;
+  }
+}
+.bgEmptyImg{
+  @include flexTwoCenter;
+  height: 90% ;
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
+</style>

src/views/documentView/diverTrainDocment.vue

@@ -0,0 +1,175 @@
+<template>
+<div class="wrap">
+  <div class="navBar">
+    <van-nav-bar
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+    >
+      <template slot="title">
+        <van-field
+            v-model="keyword"
+            placeholder="名称/关键词/简介"
+        >
+        </van-field>
+      </template>
+      <template slot="left">
+        <div class="navLeft" @click="goBack">
+          <van-icon class="icon" name="arrow-left" />
+          <div>返回</div>
+        </div>
+      </template>
+      <template slot="right">
+          <van-icon class="search" name="search" size="20"  @click="getTrainingList"/>
+      </template>
+    </van-nav-bar>
+  </div>
+  <div class="statisticContainer">
+    <div class="statisticWrap">
+      <div class="line1">
+        <span>培训统计</span>
+        <span>更新时间：{{time}}</span>
+      </div>
+      <div class="numWrap">
+        <div>
+          <span>{{ numInfo?.totalNum }}</span>
+          <span>文章总数</span>
+        </div>
+        <div>
+          <span>{{ numInfo?.readNum }}</span><span>已培训数量</span>
+        </div>
+        <div>
+          <span>{{ numInfo?.notReadNum }}</span> <span>未培训数量</span>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="driver_tab_wrap">
+    <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
+         @click="changeTab(index)">
+      {{ item.name }}
+    </div>
+  </div>
+  <div class="contentWrap" v-show="!showEmpty">
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
+      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'培训文档')">
+        <div class="info flexBetween common">
+          <div class="title">{{ item.name }}<span v-if="item.mustRead===1" class="read">必读</span></div>
+        </div>
+        <div class="imgWrap">
+          <img :src="item.themePicture">
+        </div>
+        <div class="num common">{{ item.synopsis }}</div>
+        <div  class="info flexBetween common" >
+          <div class="time">{{ item.pushTime		 }}</div>
+          <span style="color: red;font-size: 14px;margin-right: 8px" :class="item.alreadyRead===1 ? 'alRead' : ''">{{ item.alreadyRead===1 ? '已处理' :  '未处理' }}</span>
+        </div>
+      </div>
+    </van-pull-refresh>
+</div>
+  <div class="empty" v-show="showEmpty">
+    <img src="@/assets/empty.png" />
+  </div>
+</div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+import {getTrainingList} from  "@/api/mine"
+import {timeFormat} from "@/utils/common";
+export default {
+  name: "diverTrainDocment",
+  computed: {
+  },
+  mixins:[myMixins],
+  data(){
+    return{
+      tabArr: [{name: '车型技术参数', status: 1}, {name: '中道服务规范', status:2},{name: '中道小课堂', status: 3}],
+      activeIndex: 0,
+      pageList:[],
+      totalList:[],
+      numInfo:'',
+      keyword:'',
+      show:false,
+      showEmpty:false,
+      isLoading:false,
+      driverId:'',
+      time:'',
+    }
+  },
+  mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.driverId = urlParams.get('driverId');
+    this.time=timeFormat(Date.now())
+    this.getTrainingList();
+    document.addEventListener('visibilitychange', async (  ) => {
+      let state = document.visibilityState
+      if (state == 'hidden') {  // 用户离开了
+      }
+      if (state == 'visible') {
+        this.getTrainingList();
+      }
+    });
+  },
+  methods:{
+    onRefresh() {
+      this.getTrainingList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+    async changeTab(index) {
+      this.activeIndex = index
+      await this.getTrainingList()
+    },
+    async getTrainingList(){
+      let res= await getTrainingList({
+        type:1,
+        id:this.driverId,
+        text:this.keyword || '',
+      })
+      this.totalList=[]
+      this.pageList=[]
+      this.numInfo=res.data
+      this.totalList=res.data.list
+      let result=[]
+      if(this.activeIndex === 0){
+        result=this.totalList?.filter(q => q.title === '车型技术参数');
+      }else if(this.activeIndex === 1){
+        result=this.totalList?.filter(q => q.title === '中道服务规范');
+      }else if(this.activeIndex === 2){
+        result=this.totalList?.filter(q => q.title === '中道小课堂');
+      }
+      if(result){
+        this.pageList=result[0].materials
+        this.time=timeFormat(Date.now())
+      }
+      if(this.pageList?.length === 0){
+        this.showEmpty  = true
+      }else {
+        this.showEmpty = false
+      }
+    },
+  }
+}
+</script>
+<style scoped lang="scss">
+@import "@/styles/common.scss";
+@import "@/styles/mixin.scss";
+@import "@/styles/docment.scss";
+@import "@/styles/driverDocment.scss";
+.read{
+  padding: 2px 8px;
+  border-radius: 5px;
+  border: 1px solid red;
+  color: red;
+  font-size: 8px;
+}
+.alRead{
+  color: #cccccc !important;
+}
+.contentWrap{
+  height: calc(100% - 180px) !important;
+}
+</style>

src/views/documentView/docmentList.vue

@@ -1,28 +1,59 @@
 <template>
 <div class="wrap">
-  <div class="navBar">
-    <van-nav-bar
-        left-arrow
-        left-arrow-color="#FFFFFF"
-        :border="false"
-        :fixed="true"
-        :safe-area-inset-top="true"
-        @click-left="goBack"
-    >
-      <template slot="title">
-        <div v-show="!show">文档资料</div>
-        <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getList"/>
-      </template>
-      <template slot="right">
-        <div class="rightWrap" @click="show = !show">
-          <img src="@/assets/serach.png" class="img2" v-show="!show"/>
-          <img src="@/assets/delKey.png" class="img2" v-show="show" @click="initShow"/>
-        </div>
-      </template>
-    </van-nav-bar>
-  </div>
-
- <div class="tab_wrap">
+  <template v-if="supplierId">
+    <div class="navBar">
+      <van-nav-bar
+          left-arrow
+          left-arrow-color="#FFFFFF"
+          class="supplier"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="goBack"
+      >
+        <template slot="title">
+          <div v-show="!show">文档资料</div>
+          <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getNormalList"/>
+        </template>
+        <template slot="right">
+          <div class="rightWrap" @click="show = !show">
+            <img src="@/assets/serach.png" class="img2" v-show="!show"/>
+            <img src="@/assets/delKey.png" class="img2" v-show="show" @click="initShow"/>
+          </div>
+        </template>
+      </van-nav-bar>
+    </div>
+  </template>
+  <template v-if="driverId">
+    <div class="navBar">
+      <van-nav-bar
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+      >
+        <template slot="title">
+          <van-field
+              v-model="keyword"
+              placeholder="名称/关键词/简介"
+          >
+            <!--          <template #button>
+                        <van-icon class="search" name="search" size="20"  @click="getTrainingList"/>
+                      </template>-->
+          </van-field>
+        </template>
+        <template slot="left">
+          <div class="navLeft" @click="goBack">
+            <van-icon class="icon" name="arrow-left" />
+            <div>返回</div>
+          </div>
+        </template>
+        <template slot="right">
+          <van-icon class="search" name="search" size="20"  @click="getNormalList"/>
+        </template>
+      </van-nav-bar>
+    </div>
+  </template>
+ <div :class="supplierId ? 'tab_wrap' : 'driver_tab_wrap'">
     <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
          @click="changeTab(index)">
       {{ item.name }}
@@ -30,23 +61,15 @@
   </div>
   <div class="contentWrap" v-show="!showEmpty">
     <van-pull-refresh v-model="isLoading" @refresh="onRefresh" style="min-height:85vh">
-      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item)">
+      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'文档资料')">
         <div class="info flexBetween common">
-          <div class="title">{{ item.pushUser }}</div>
-          <div class="time">{{ item.pushTime }}</div>
+          <div class="title">{{ item.name }}</div>
         </div>
         <div class="imgWrap">
           <img :src="item.themePicture">
-          <div class="name">{{item.name}}</div>
         </div>
         <div class="num common">{{ item.synopsis }}</div>
-        <div class="doc flexBetween common">
-          <div class="left">{{ item.docType?.label }}</div>
-          <div class="right">
-            <span style="color: red;font-size: 14px;margin-right: 8px">{{ item.listShowButton==null ? '已处理' :  '未处理' }}</span>
-            <span style="opacity: .9;color: #ccc">阅读  {{item.readCount}}</span>
-          </div>
-        </div>
+        <div class="time common">{{ item.pushTime		 }}</div>
       </div>
     </van-pull-refresh>
  </div>
@@ -58,30 +81,33 @@
 
 <script>
 import {myMixins} from "@/utils/myMixins"
-import {pageList} from "@/api/mine";
+import {getNormalList} from "@/api/mine";
 export default {
-  name: "trainDocment",
+  name: "docmentList",
   mixins:[myMixins],
   data(){
     return{
-      tabArr: [{name: '中道制度', status: 1}, {name: '技术参数', status: 2},],
+      tabArr: [{name: '车型技术参数', status: 1}, {name: '中道服务规范', status:2},{name: '中道小课堂', status: 3}, {name: '新手入列', status: 4},],
       activeIndex: 0,
       pageList:[],
-      pageNum:1,
-      pageSize:10,
+      totalList:[],
       keyword:'',
-      trainingType:1,
       isLoading:false,
       show:false,
-      showEmpty:false
+      showEmpty:false,
+      supplierId:'',
+      driverId:'',
     }
   },
   mounted() {
-    this.getList()
+    const urlParams = new URLSearchParams(window.location.search);
+    this.supplierId = urlParams.get('supplierId');
+    this.driverId = urlParams.get('driverId');
+    this.getNormalList()
   },
   methods:{
     onRefresh() {
-      this.getList()
+      this.getNormalList()
       setTimeout(() => {
         this.$toast('刷新成功');
         this.isLoading = false;
@@ -89,32 +115,41 @@ export default {
     },
    async changeTab(index) {
     this.activeIndex = index
-    this.pageNum = 1
-    this.pageList = [];
-    if(this.activeIndex === 0){
-      this.trainingType =1
-    }else{
-      this.trainingType=2
-    }
-    await this.getList()
+    await this.getNormalList()
   },
-    async getList(){
-      let res= await pageList({
-        pageNum:this.pageNum,
-        pageSize:this.pageSize,
-        docType:2,
-        trainingType:this.trainingType,
-        keyword:this.keyword || ''
+    async getNormalList(){
+      let res= await getNormalList({
+        type:this.supplierId ? 2 : 1,
+        // type:2,
+        id: this.supplierId ? this.supplierId : this.driverId,
+        // id:this.supplierId,//33041,
+        text:this.keyword || '',
       })
-      this.pageList=res.data;
-      if(res.data.length === 0){
+      this.totalList=[]
+      this.pageList=[]
+      this.totalList=res.data.list
+      let result=[]
+      if(this.activeIndex === 0){
+        result=this.totalList?.filter(q => q.title === '车型技术参数');
+      }else if(this.activeIndex === 1){
+        result=this.totalList?.filter(q => q.title === '中道服务规范');
+      }else if(this.activeIndex === 2){
+        result=this.totalList?.filter(q => q.title === '中道小课堂');
+      }else if(this.activeIndex === 3){
+        result=this.totalList?.filter(q => q.title === '新手入列');
+      }
+      if(result){
+        this.pageList=result[0].materials
+      }
+      if(this.pageList?.length === 0){
         this.showEmpty  = true
       }else {
         this.showEmpty = false
-      }    },
+      }
+    },
     initShow(){
       this.keyword= '',
-      this.getList()
+      this.getNormalList()
     }
 }
 }
@@ -124,29 +159,8 @@ export default {
 @import "@/styles/common.scss";
 @import "@/styles/mixin.scss";
 @import "@/styles/docment.scss";
-.tab_wrap {
-  @include fontWeightSize(bolder, 15px);
-  display: flex;
-  justify-content: space-around;
-  padding: 5px 0 5px 0;
-  @include colorOpa(#737373,0.7);
-  div {
-    padding-top: 8px;
-  }
-  .active {
-    color: #3678FF;
-    position: relative;
-  }
-  .active:after {
-    content: '';
-    display: block;
-    @include wh(50px,3px);
-    background: linear-gradient(270deg, #33A3FF 0%, #176AFE 100%);
-    border-radius: 2px;
-    position: absolute;
-    margin-top: 3px;
-    left: 50%;
-    transform: translateX(-50%);
-  }
+@import "@/styles/driverDocment.scss";
+.supplier ::v-deep .van-nav-bar__content{
+  background-color: #2C395F !important;
 }
 </style>

src/views/documentView/trainDocment.vue

@@ -11,7 +11,7 @@
     >
       <template slot="title">
          <div v-show="!show">培训文档</div>
-         <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getList"/>
+         <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getTrainingList"/>
       </template>
       <template slot="right">
         <div class="rightWrap" @click="show = !show">
@@ -21,25 +21,26 @@
       </template>
     </van-nav-bar>
   </div>
-
+  <div class="tab_wrap">
+    <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
+         @click="changeTab(index)">
+      {{ item.name }}
+    </div>
+  </div>
   <div class="contentWrap" v-show="!showEmpty">
     <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
-      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item)">
+      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'培训文档')">
         <div class="info flexBetween common">
-          <div class="title">{{ item.pushUser }}</div>
-          <div class="time">{{ item.pushTime }}</div>
+          <div class="title">{{ item.name }}<span v-if="item.mustRead===1" class="read">必读</span></div>
+<!--          <div class="time">{{ item.pushTime		 }}</div>-->
         </div>
         <div class="imgWrap">
           <img :src="item.themePicture">
-          <div class="name">{{item.name}}</div>
         </div>
         <div class="num common">{{ item.synopsis }}</div>
-        <div class="doc flexBetween common">
-          <div class="left">{{ item.docType?.label }}</div>
-          <div class="right">
-            <span style="color: red;font-size: 14px;margin-right: 8px">{{ item.listShowButton==null ? '已处理' :  '未处理' }}</span>
-            <span style="opacity: .9;color: #ccc">阅读  {{item.readCount}}</span>
-          </div>
+        <div  class="info flexBetween common" >
+          <div class="time">{{ item.pushTime		 }}</div>
+          <span style="color: red;font-size: 14px;margin-right: 8px" :class="item.alreadyRead===1 ? 'alRead' : ''">{{ item.alreadyRead===1 ? '已处理' :  '未处理' }}</span>
         </div>
       </div>
     </van-pull-refresh>
@@ -52,7 +53,7 @@
 
 <script>
 import {myMixins} from "@/utils/myMixins"
-import {pageList} from  "@/api/mine"
+import {getTrainingList} from  "@/api/mine"
 export default {
   name: "trainDocment",
   computed: {
@@ -60,35 +61,65 @@ export default {
   mixins:[myMixins],
   data(){
     return{
+      tabArr: [{name: '车型技术参数', status: 1}, {name: '中道服务规范', status:2},{name: '中道小课堂', status: 3}],
+      activeIndex: 0,
       pageNum:1,
       pageSize:10,
       pageList:[],
+      totalList:[],
       keyword:'',
       show:false,
       showEmpty:false,
       isLoading:false,
+      supplierId:'',
     }
   },
   mounted() {
-    this.getList();
+    const urlParams = new URLSearchParams(window.location.search);
+    this.supplierId = urlParams.get('supplierId');
+    this.getTrainingList();
+    document.addEventListener('visibilitychange', async (  ) => {
+      let state = document.visibilityState
+      if (state == 'hidden') {  // 用户离开了
+      }
+      if (state == 'visible') {
+        this.getTrainingList();
+      }
+    });
   },
   methods:{
     onRefresh() {
-      this.getList()
+      this.getTrainingList()
       setTimeout(() => {
         this.$toast('刷新成功');
         this.isLoading = false;
       }, 1000);
     },
-    async getList(){
-      let res= await pageList({
-        pageNum:this.pageNum,
-        pageSize:this.pageSize,
-        docType:1,
-        keyword:this.keyword || ''
+    async changeTab(index) {
+      this.activeIndex = index
+      await this.getTrainingList()
+    },
+    async getTrainingList(){
+      let res= await getTrainingList({
+        type:2,
+        id: this.supplierId,
+        text:this.keyword || '',
       })
-      this.pageList=res.data;
-      if(res.data.length === 0){
+      this.totalList=[]
+      this.pageList=[]
+      this.totalList=res.data.list
+      let result=[]
+      if(this.activeIndex === 0){
+        result=this.totalList?.filter(q => q.title === '车型技术参数');
+      }else if(this.activeIndex === 1){
+        result=this.totalList?.filter(q => q.title === '中道服务规范');
+      }else if(this.activeIndex === 2){
+        result=this.totalList?.filter(q => q.title === '中道小课堂');
+      }
+      if(result){
+        this.pageList=result[0].materials
+      }
+      if(this.pageList?.length === 0){
         this.showEmpty  = true
       }else {
         this.showEmpty = false
@@ -96,7 +127,7 @@ export default {
     },
     initShow(){
       this.keyword= '',
-      this.getList()
+      this.getTrainingList()
     }
   }
 }
@@ -105,4 +136,14 @@ export default {
 @import "@/styles/common.scss";
 @import "@/styles/mixin.scss";
 @import "@/styles/docment.scss";
+.read{
+  padding: 2px 8px;
+  border-radius: 5px;
+  border: 1px solid red;
+  color: red;
+  font-size: 8px;
+}
+.alRead{
+  color: #cccccc !important;
+}
 </style>

src/views/index/driverAdd.vue

@@ -16,13 +16,26 @@
       <img class="startImg" src="@/assets/start.png" />
       <span>身份证正面</span>
     </div>
+<!--    <van-image @click="handlePreview"   @remove="handleRemove" style="width: 54px;height: 54px;" class="camerImg" v-if="identityCardFront" :src="identityCardFront" />-->
+<!--    <el-upload-->
+<!--        v-else-->
+<!--        :action="baseURL + '/order/uploadImage'"-->
+<!--        :headers='authorization'-->
+<!--        accept=".png,.jpg,.jpeg,.zip,.rar,.xlsx,.xsavels,.pdf,.PDF,.doc,.docx"-->
+<!--        :on-success="changeHandle"-->
+<!--        :before-upload="checkImgType"-->
+<!--        class="upload-demo"-->
+<!--        :show-file-list="false"-->
+<!--    >-->
+<!--      <van-icon  slot="default" name="plus" style="font-size: 54px" />-->
+<!--    </el-upload>-->
     <van-uploader
-      v-model="identityCardFrontList"
-      :after-read="identityCardFrontHandler"
-      :max-size="5 * 1024 * 1024"
-      max-count="1"
-      :preview-size="54"
-      accept="image "
+        v-model="identityCardFrontList"
+        :after-read="identityCardFrontHandler"
+        :max-count="1"
+        :preview-size="54"
+        :max-size="5 * 1024 * 1024"
+        accept="image/*"
     />
   </div>
   <div class="lineBot"></div>
@@ -139,11 +152,15 @@ import {saveDriver, uploadImage, ocrHandler} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
 import CellGroup  from "@/components/cellGroup.vue"
 import {formatDate1} from "@/utils/common"
+// import {ImagePreview} from "vant";
+
 export default {
   name: "driverAdd",
   mixins:[myMixins],
   data(){
     return{
+      // baseURL:'',
+      // licenseOcrInfo:'',
       id:'',
       driverName:"",
       driverPhone:"",
@@ -169,9 +186,22 @@ export default {
       idCardAuthority:'',
       idCardValidStartTime:'',
       idCardValidEndTime:'',
-    }
+      // authorization:{Authorization: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MjY4MDk4MTQsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiLkuIrmtbfmtYvor5XkvpvlupTllYYiLCJzdXBwbGllcklkIjozMzA0MSwic3VwcGxpZXJUeXBlIjoyLCJ1c2VybmFtZSI6InNvbmciLCJ1c2VyVHlwZSI6InJlc2N1ZUFwcCIsImRldmljZUlkIjoiMTkwZTM1ZjdlMTRhYzdjMDAwNyIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNzI2ODk2MjE0LCJpYXQiOjE3MjY4MDk4MTR9.5KTAMXZf8ll6HS4Z49YJQ1HiRvHr79Q1goDAGEtsBmY'},
+      // authorization:{Authorization:''},
+      }
   },
   mounted() {
+  /*  if (window.location.href.includes('www.sinoassist.com')) {
+      this.baseURL = 'https://api.sinoassist.com'
+    } else if (window.location.href.includes('ccreview.sino-assist.com')) {
+      this.baseURL = 'https://api.sinoassist.com'
+    } else {
+      this.baseURL = 'https://api1.sino-assist.com'
+      // this.baseURL = 'http://localhost:8080'
+
+    }
+    let token=localStorage.getItem('token')
+    this.authorization.Authorization=token;*/
     this.id = this.$route.params?.id;
     this.driverName = this.$route.params?.name;
     this.driverPhone = this.$route.params?.phone;
@@ -215,6 +245,41 @@ export default {
     isUse(e){
       this.states=e
     },
+    /* checkImgType(file) {
+      const FileExt = file.name.replace(/.+\./, "");
+      const isLt5M = file.size / 1024 / 1024 < 5;
+      const whiteList = ['png', 'jpeg', 'jpg'];
+      if (whiteList.indexOf(FileExt.toLowerCase()) === -1) {
+        this.$message.error("请上传正确的文件格式:" + whiteList.join('、'))
+        return false
+      }
+      if (!isLt5M) {
+        this.$message.error('上传图片大小不能超过 5MB!');
+        return false
+      }
+    },
+   handleRemove() {
+      this.identityCardFront = ''
+    },
+    handlePreview() {
+      ImagePreview({
+        images: this.identityCardFront,
+        startPosition: 1,
+        closeable: true,
+      });
+    },
+    async changeHandle(response) {
+      if (response.success === true) {
+        this.$toast('上传成功')
+        // this.form.identityCardFront = response.data;
+        // await this.ocrFrontHandler()
+        this.identityCardFront = response.data;
+        console.log("this.identityCardFront",this.identityCardFront)
+        await this.idCardOcrHandler();
+      } else {
+        this.$toast('上传失败')
+      }
+    },*/
     async identityCardFrontHandler(file) {    // 上传身份证正面照片
       const formData = new FormData();
       formData.append("file" , file.file);

src/views/index/supplySettlement.vue

@@ -42,7 +42,7 @@
       <div class="metersWrap">
         <div class="item"  >
           <div class="leftKiloMeters">小轮个数</div>
-          <div class="rightInput"><input type="number" v-model="form.tyreNumber"/>个</div>
+          <div class="rightInput"><input type="number" v-model="form.tyreNumber" @input="handleInput"/>个</div>
         </div>
         <div class="item">
           <div class="leftKiloMeters">等候费</div>
@@ -82,7 +82,7 @@ export default {
         bridgeAmountAb:'',
         bridgeAmountBc:'',
         bridgeAmountCa:'',
-        tyreNumber:'',
+        tyreNumber:0,
         waitAmount:'',
         dilemmaFee:'',
         customerAmount:'',
@@ -98,6 +98,15 @@ export default {
       await this.getDetail()
   },
   methods:{
+    handleInput(event) {
+      const newValue = parseInt(event.target.value, 10);
+      if (!isNaN(newValue) && newValue >= 0 && newValue <= 4) {
+        this.form.tyreNumber = newValue;
+      } else {
+        this.$toast('请输入0到4之间的数字')
+        this.form.tyreNumber = null; // 或者上一个有效值
+      }
+    },
     submit() {
       this.updatSettlement()
     },

src/views/index/workOrderDetail.vue

@@ -70,6 +70,22 @@
         </div>
       </div>
     </div>
+    <div class="serviceInfo common">
+      <div class="title">电瓶信息:</div>
+      <div class="line"></div>
+      <div class="infoContent">
+        <div class="item">
+          <span class="leftTitle fontColor">设备号:</span><span class="rightContent"></span>
+        </div>
+        <div class="item">
+          <span class="leftTitle fontColor">品牌:</span><span class="rightContent"></span>
+        </div>
+        <div class="item">
+          <span class="leftTitle fontColor">型号:</span><span class="rightContent"></span>
+        </div>
+      </div>
+    </div>
+
     <div class="map" v-show="showPopup"   id="container">
       <img @click="showPopup = false"  src="@/assets/delKey.png" class="mapImg">
     </div>

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>

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

@@ -6,10 +6,18 @@
               style="width: 100%"
               height="100%"
               v-loading="loading"
+              :cell-style="setTableCellStyle"
               class="custom-table">
-      <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 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>
@@ -17,14 +25,132 @@
 <script>
 export default {
   name: "noFit-table",
-  props: ['tableData','labelList','loading','isMobile'],
+  props: ['tableData', 'labelList', 'loading', 'isMobile','active'],
   data() {
     return {}
   },
   mounted() {
-    // console.log("tableData",this.tableData)
   },
-  methods: {}
+  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>
 

src/views/kpi/kpiIndex.vue

@@ -6,7 +6,7 @@
     </div>
     <div v-else class="webHeadWrap" :style="'justify-content:'+(isZd==1 ? 'space-between':'center')">
       <div class="empty" v-if="isZd==1"></div>
-      <div class="title">KPI.数据看板<span v-if="isZd!=1">--{{ current }}月</span></div>
+      <div class="title">KPI.数据看板<span v-if="isZd==1">--中道救援</span><span v-if="isZd!=1">--{{ current }}月</span></div>
       <!--  只有中道账号才显示搜索框  -->
       <div class="searchWrap" v-if="isZd==1">
         <span class="month">{{ current }}月</span>
@@ -15,6 +15,7 @@
             filterable
             remote
             reserve-keyword
+            clearable
             placeholder="请输入后选择"
             :remote-method="remoteMethod"
             @change="selectSupplierNameHanldle"
@@ -26,11 +27,13 @@
               :value="item.id">
           </el-option>
         </el-select>
-        <i class="el-icon-search" @click="searchHandle"></i>
+<!--        <i class="el-icon-search" @click="searchHandle"></i>-->
       </div>
     </div>
     <van-tabs v-model="active" sticky @click="onClick">
       <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>
     </van-tabs>
     <div v-loading="loadingData" :class="{'contentWrap':true,'webcontentWrap':!isMobile}" v-if="active===0">
       <div :class="{'reciceOrder':true,'webCom':!isMobile}">
@@ -42,11 +45,11 @@
           </div>
           <div class="center common" @click="clickJumpHandle(5)">
             <div class="num">{{ indexData && indexData.refuseOrderRate }}%</div>
-            <div class="itemTitle">拒单率 ></div>
+            <div class="itemTitle" style="cursor: pointer">拒单率 ></div>
           </div>
           <div class="right common" @click="clickJumpHandle(6)">
             <div class="num">{{ indexData && indexData.timeoutOrderRate }}%</div>
-            <div class="itemTitle">超时率 ></div>
+            <div class="itemTitle"  style="cursor: pointer">超时率 ></div>
           </div>
         </div>
       </div>
@@ -83,20 +86,62 @@
           <div class="line"></div>
           <div class="center common">
             <div class="num">{{ indexData && indexData.polymerizationSuccessArriving }}</div>
-            <div class="itemTitle">集合成功到达时效</div>
+            <div class="itemTitle">集合成功到达时效(分)</div>
           </div>
           <div class="line"></div>
           <div class="right common">
             <div class="num">{{ indexData && indexData.arriving }}</div>
-            <div class="itemTitle">到达时效</div>
+            <div class="itemTitle">到达时效(分)</div>
           </div>
         </div>
       </div>
       <div :class="{'reciceOrder':true,'webCom':!isMobile,'store':isMobile}">
-        <div class="title">综合打分</div>
-        <div class="storeWrap" v-if="indexData">
-          <circle-char  ref="Doughnut7" :data="indexData && indexData.score" :bg-color="'#00D273'" :is-store="true"></circle-char>
+        <div class="scoreTitle">
+          <span class="title">综合打分</span>
+          <i class="el-icon-question" @click.prevent="showScoreChart = !showScoreChart"></i>
         </div>
+        <div class="storeWrap" v-if="indexData">
+          <circle-char v-if="showScoreChart"  ref="Doughnut7" :data="indexData && indexData.score" :bg-color="'#00D273'" :is-store="true"></circle-char>
+          <div v-else class="detailScore">
+            <div class="left">
+              <div>
+                <span class="defen">接单得分:</span>
+              </div>
+              <div>
+                <span class="defen">接单时效得分:</span>
+              </div>
+              <div>
+                <span class="defen">到达时效得分:</span>
+              </div>
+              <div><span class="defen">聚合成功率得分:</span>
+              </div>
+              <div><span class="defen">APP使用率得分:</span>
+              </div>
+              <div><span class="defen">催促率得分:</span>
+              </div>
+              <div><span class="defen">投诉率得分:</span>
+              </div>
+            </div>
+            <div class="right">
+              <div>
+                <span>{{ indexData.orderScore }}</span>
+              </div>
+              <div>
+                <span>{{ indexData.orderAgeingScore }}</span>
+              </div>
+              <div>
+                <span>{{ indexData.arriveAgeingScore }}</span>
+              </div>
+              <div> <span>{{ indexData.polymerizationSuccessScore }}</span></div>
+              <div> <span>{{ indexData.appUseScore }}</span></div>
+              <div> <span>{{ indexData.urgeScore }}</span></div>
+              <div><span>{{ indexData.complainScore }}</span></div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div>
+
       </div>
       <div v-if="isMobile" style="padding: 20px"></div>
     </div>
@@ -111,7 +156,7 @@
           <div v-if="active==1" style="width: 100%">
             <div id="chartWrap" style="width: 100%;height:300px"></div>
           </div>
-          <div v-if="isMobile && activeIndex==3" class="selectWrap">
+          <div v-if="activeIndex==3" class="selectWrap">
             <el-select v-model="value" @change="changeHandle">
               <el-option
                   v-for="item in options"
@@ -143,12 +188,31 @@
         </template>
       </div>
       <div :class="{'webTab':!isMobile,}">
-        <noFit-table :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
-      </div>
+        <noFit-table v-if="isMobile" :active='active'  :is-mobile='isMobile' :table-data="etlDetailList" :label-list="etlLabelList"></noFit-table>
+        <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)">
-        <el-input placeholder="请输入师傅名称" v-model.trim="driverName" @change="getData" />
+        <el-select
+            v-model="driverName"
+            filterable
+            remote
+            clearable
+            reserve-keyword
+            placeholder="请输入后选择"
+            :remote-method="driverremoteMethod"
+            @change="getData"
+            :loading="driverselectLoading"
+            :style="isMobile ? 'width:100%' : 'width:50%'"
+        >
+          <el-option
+              v-for="item in driverselectOption"
+              :key="item.id"
+              :label="item.name"
+              :value="item.name">
+          </el-option>
+        </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' : ''"
@@ -157,10 +221,26 @@
         </div>
       </div>
       <div :class="{'comTab':true}">
-        <noFit-table :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
+        <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
       </div>
       <el-pagination
+          small
           v-if="active !== 2"
+          :page-sizes="[20, 50, 100]"
+          :current-page.sync="pageNum"
+          :page-size.sync="pageSize"
+          @current-change="getKpiData"
+          @size-change="getKpiData"
+          layout="prev, pager, next,sizes"
+          :total="total">
+      </el-pagination>
+    </div>
+    <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
           small
           :current-page.sync="pageNum"
           :page-size.sync="pageSize"
@@ -168,21 +248,16 @@
           @size-change="getKpiData"
           layout="prev, pager, next"
           :total="total">
-      </el-pagination>
-    </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[5,6,7,8,9].includes(active)">
-      <div :class="{'comTab':true,'detailTable':isMobile}">
-        <noFit-table :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"
-                     :loading="loading"></noFit-table>
-      </div>
+      </el-pagination>-->
       <el-pagination
           v-if="active !== 9"
           small
+          :page-sizes="[20, 50, 100]"
           :current-page.sync="pageNum"
           :page-size.sync="pageSize"
           @current-change="getKpiData"
           @size-change="getKpiData"
-          layout="prev, pager, next"
+          layout="prev, pager, next,sizes"
           :total="total">
       </el-pagination>
     </div>
@@ -197,7 +272,8 @@ import {
   getStatisticsKpiByMonth,
   getStatisticsKpi,
   getDriverStatisticsKpi,
-  getSupplierId
+  getSupplierId,
+  getDriverName
 } from "@/api/kpi.js"
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
@@ -224,6 +300,8 @@ export default {
       indexData: {},
       detailList: [],
       labelList: [],
+      etlDetailList: [],
+      etlLabelList: [],
       loading: false,
       loadingData: false,
       v1: [],
@@ -243,14 +321,18 @@ export default {
         {value: '2', label: '到达时效'},
       ],
       pageNum: 1,
-      pageSize: 10,
+      pageSize: 20,
       total: 0,
       swithVal: true,
-      supplierId:'',//1128
+      supplierId:'',
       selectLoading: false,
       selectOption: [],
       driverId:'',//68517
       driverName:'',
+      driverselectLoading: false,
+      driverselectOption: [],
+      leftArr:'<<<',
+      showScoreChart:true
     }
   },
   async mounted() {
@@ -262,6 +344,9 @@ export default {
     this.checkMobile();
     const urlParams = new URLSearchParams(window.location.search);
     this.isZd = urlParams?.get('isZd') || ''
+   /* if(!this.isMobile && this.isZd && this.isZd==1){
+      this.supplierId='1127'
+    }*/
   },
   async activated() {
   },
@@ -276,7 +361,7 @@ export default {
         this.$refs.Doughnut5.initCircle()
         this.$refs.Doughnut6.initCircle()
         this.$refs.Doughnut7.initCircle()
-      },500)
+      },1500)
     },
     async remoteMethod(query) {
       if (query !== '') {
@@ -294,11 +379,28 @@ export default {
         this.selectOption = [];
       }
     },
+    async driverremoteMethod(query){
+      if (query !== '') {
+        this.driverselectLoading = true;
+        try {
+          const result = await getDriverName(query);
+          this.driverselectOption = result.data || []
+        } catch (error) {
+          this.driverselectOption = [];
+        } finally {
+          this.driverselectLoading = false;
+        }
+      } else {
+        this.driverselectOption = [];
+      }
+    },
     async searchHandle() {//web端服务商搜索操作
       console.log("搜索按钮")
     },
     async changeHandle() {
-      await this.getData();
+      this.v1=[]
+      this.v2=[]
+      await this.twoTabHanldeData();
       await this.drawLine();
     },
     async switchHandle() {
@@ -318,6 +420,8 @@ export default {
         this.v5 = []
         this.v6 = []
         this.xAxisArr = []
+        this.etlDetailList=[]
+        this.etlLabelList=[]
         await this.getKpiData()
         this.loadingData = false
       } finally {
@@ -333,6 +437,7 @@ export default {
       this.activeIndex = 0;
       this.detailList = [];
       this.labelList = [];
+      this.driverName=''
       this.getData();
       if (this.active === 1) {
         setTimeout(() => {
@@ -401,9 +506,11 @@ export default {
         type: 'line',
         data: this.v1,
         smooth: true,
+        yAxisIndex: 0,
         label: {
           show: true, // 显示标签
           position: 'top', // 标签位置在柱形顶部
+          formatter: '{c}%'
         }
       },
         {
@@ -411,6 +518,7 @@ export default {
           type: "line",
           data: this.v3,
           smooth: true,
+          yAxisIndex: 0,
           label: {
             show: true,
             position: 'top',
@@ -422,6 +530,7 @@ export default {
           type: 'line',
           smooth: true,
           data: this.v2,
+          yAxisIndex: 0,
           label: {
             show: true,
             position: 'top',
@@ -748,14 +857,38 @@ export default {
           });
           this.indexData = res.data;
           this.supplierName=res.data?.supplierName
-          this.indexData.refuseOrderRate=this.indexData.refuseOrderRate*100?.toFixed(2)
-          this.indexData.timeoutOrderRate=this.indexData.timeoutOrderRate*100?.toFixed(2)
-          this.indexData.complainOrderRate=this.indexData.complainOrderRate*100?.toFixed(2)
-          this.indexData.customerSatisfaction=this.indexData.customerSatisfaction*100?.toFixed(2)
-          this.indexData.threeMinutesContactRate=this.indexData.threeMinutesContactRate*100?.toFixed(2)
-          this.indexData.urgeRate=this.indexData.urgeRate*100?.toFixed(2)
-          this.indexData.appRate=this.indexData.appRate*100?.toFixed(2)
-          this.indexData.polymerizationSuccessRate=this.indexData.polymerizationSuccessRate*100?.toFixed(2)
+          this.indexData.refuseOrderRate=this.indexData.refuseOrderRate*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,
@@ -764,21 +897,23 @@ export default {
             supplierId: this.supplierId,
           })
           this.detailList = res.data?.map(item => {
-            item.refuseOrderRate=item.refuseOrderRate*100?.toFixed(2)+'%'
-            item.timeoutOrderRate=item.timeoutOrderRate*100?.toFixed(2)+'%'
-            item.cancelRate=item.cancelRate*100?.toFixed(2)+'%'
-            item.urgeRate=item.urgeRate*100?.toFixed(2)+'%'
-            item.complainOrderRate=item.complainOrderRate*100?.toFixed(2)+'%'
-            item.customerEvaluateRate=item.customerEvaluateRate*100?.toFixed(2)+'%'
-            item.appRate=item.appRate*100?.toFixed(2)+'%'
-            item.threeMinutesContactRate=item.threeMinutesContactRate*100?.toFixed(2)+'%'
-            item.pinganPolymerizationSuccessRate=item.pinganPolymerizationSuccessRate*100?.toFixed(2)+'%'
-            item.zhonghuaPolymerizationSuccessRate=item.zhonghuaPolymerizationSuccessRate*100?.toFixed(2)+'%'
-            item.zdPolymerizationSuccessRate=item.zdPolymerizationSuccessRate*100?.toFixed(2)+'%'
-            item.polymerizationSuccessRate=item.polymerizationSuccessRate*100?.toFixed(2)+'%'
-            item.threeMinutesReceivingRate=item.threeMinutesReceivingRate*100?.toFixed(2)+'%'
-            item.fortyMinutesArrivalRate=item.fortyMinutesArrivalRate*100?.toFixed(2)+'%'
-            item.customerSatisfaction=item.customerSatisfaction*100?.toFixed(2)+'%'
+            item.refuseOrderRate=this.formatPercentage(item.refuseOrderRate) ;
+            item.timeoutOrderRate=this.formatPercentage(item.timeoutOrderRate) ;
+            item.cancelRate=this.formatPercentage(item.cancelRate) ;
+            item.urgeRate=this.formatPercentage(item.urgeRate) ;
+            item.complainOrderRate=this.formatPercentage(item.complainOrderRate) ;
+            item.customerEvaluateRate=this.formatPercentage(item.customerEvaluateRate) ;
+            item.appRate=this.formatPercentage(item.appRate) ;
+            item.threeMinutesContactRate=this.formatPercentage(item.threeMinutesContactRate) ;
+            item.pinganPolymerizationSuccessRate=this.formatPercentage(item.pinganPolymerizationSuccessRate) ;
+            item.zhonghuaPolymerizationSuccessRate=this.formatPercentage(item.zhonghuaPolymerizationSuccessRate) ;
+            item.zdPolymerizationSuccessRate=this.formatPercentage(item.zdPolymerizationSuccessRate) ;
+            item.polymerizationSuccessRate=this.formatPercentage(item.polymerizationSuccessRate) ;
+            item.threeMinutesReceivingRate=this.formatPercentage(item.threeMinutesReceivingRate) ;
+            item.fortyMinutesArrivalRate=this.formatPercentage(item.fortyMinutesArrivalRate) ;
+            item.customerSatisfaction=this.formatPercentage(item.customerSatisfaction) ;
+            item.trailFortyMinutesArrivalRate=this.formatPercentage(item.trailFortyMinutesArrivalRate) ;
+            item.minorFortyMinutesArrivalRate=this.formatPercentage(item.minorFortyMinutesArrivalRate) ;
             let formatVal = dayjs(item.statisticsDate).format('DD');
             let formatVal1 = dayjs(item.statisticsDate).format('M');
             return {...item, date: formatVal, month: (formatVal1 == this.current) ? '本月' : (formatVal1 + '月')};
@@ -794,6 +929,7 @@ export default {
             startTime: this.startTime ,
             endTime: this.endTime,
             statisticsType: this.active === 3 ? 1 : 2,
+            supplierId: this.supplierId,
             driverId: this.driverId,
             driverName:this.driverName,
             pageNum: this.pageNum,
@@ -802,26 +938,29 @@ export default {
           // this.detailList = res.data
           this.total = res.total
           this.detailList = res.data?.map(item => {
-            item.refuseOrderRate=item.refuseOrderRate*100?.toFixed(2)+'%'
-            item.timeoutOrderRate=item.timeoutOrderRate*100?.toFixed(2)+'%'
-            item.cancelRate=item.cancelRate*100?.toFixed(2)+'%'
-            item.complainOrderRate=item.complainOrderRate*100?.toFixed(2)+'%'
-            item.customerEvaluateRate=item.customerEvaluateRate*100?.toFixed(2)+'%'
-            item.appRate=item.appRate*100?.toFixed(2)+'%'
-            item.threeMinutesContactRate=item.threeMinutesContactRate*100?.toFixed(2)+'%'
-            item.pinganPolymerizationSuccessRate=item.pinganPolymerizationSuccessRate*100?.toFixed(2)+'%'
-            item.zhonghuaPolymerizationSuccessRate=item.zhonghuaPolymerizationSuccessRate*100?.toFixed(2)+'%'
-            item.zdPolymerizationSuccessRate=item.zdPolymerizationSuccessRate*100?.toFixed(2)+'%'
-            item.polymerizationSuccessRate=item.polymerizationSuccessRate*100?.toFixed(2)+'%'
-            item.threeMinutesReceivingRate=item.threeMinutesReceivingRate*100?.toFixed(2)+'%'
-            item.fortyMinutesArrivalRate=item.fortyMinutesArrivalRate*100?.toFixed(2)+'%'
-            item.trailFortyMinutesArrivalRate=item.trailFortyMinutesArrivalRate*100?.toFixed(2)+'%'
-            item.minorFortyMinutesArrivalRate=item.minorFortyMinutesArrivalRate*100?.toFixed(2)+'%'
-            item.customerSatisfaction=item.customerSatisfaction*100?.toFixed(2)+'%'
+            item.refuseOrderRate=this.formatPercentage(item.refuseOrderRate) ;
+            item.timeoutOrderRate=this.formatPercentage(item.timeoutOrderRate) ;
+            item.cancelRate=this.formatPercentage(item.cancelRate) ;
+            // item.urgeRate=this.formatPercentage(item.urgeRate) ;
+            item.complainOrderRate=this.formatPercentage(item.complainOrderRate) ;
+            item.customerEvaluateRate=this.formatPercentage(item.customerEvaluateRate) ;
+            item.appRate=this.formatPercentage(item.appRate) ;
+            item.threeMinutesContactRate=this.formatPercentage(item.threeMinutesContactRate) ;
+            item.pinganPolymerizationSuccessRate=this.formatPercentage(item.pinganPolymerizationSuccessRate) ;
+            item.zhonghuaPolymerizationSuccessRate=this.formatPercentage(item.zhonghuaPolymerizationSuccessRate) ;
+            item.zdPolymerizationSuccessRate=this.formatPercentage(item.zdPolymerizationSuccessRate) ;
+            item.polymerizationSuccessRate=this.formatPercentage(item.polymerizationSuccessRate) ;
+            item.threeMinutesReceivingRate=this.formatPercentage(item.threeMinutesReceivingRate) ;
+            item.fortyMinutesArrivalRate=this.formatPercentage(item.fortyMinutesArrivalRate) ;
+            item.customerSatisfaction=this.formatPercentage(item.customerSatisfaction) ;
             let formatVal = dayjs(item.statisticsDate).format('DD');
             return {...item, date: formatVal};
           });
           this.loading = false;
+          if(this.active===4 && !this.driverName){
+            this.detailList=[]
+            this.total=0
+          }
           await this.twoTabHanldeData();
         } else if ([5, 6, 7, 8, 9].includes(this.active)) {
           this.detailList = []
@@ -831,11 +970,12 @@ export default {
             endTime: this.endTime,
             searchType: this.setType(this.active),
             pageNum: this.pageNum,
-            pageSize: this.pageSize
+            pageSize: this.pageSize,
+            supplierId:this.supplierId
           });
           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
@@ -866,8 +1006,8 @@ export default {
               {label: '服务内容', prop: 'serviceName'},
               {label: '接单车号', prop: 'plateNumber'},
               {label: '接单师傅', prop: 'driverName'},
-              {label: '手机号', prop: 'driverPhone'},
-              {label: '客户投诉内容', prop: 'reason'},
+              {label: '投诉时间', prop: 'complainCreateTime'},
+              {label: '投诉类型', prop: 'complainTypeString'},
             ]
           } else if (this.active === 8) {//不使用App案件明细
             // console.log("不使用App案件明细")
@@ -875,11 +1015,19 @@ export default {
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
               {label: '接单师傅手机号', prop: 'driverPhone'},
+              {label: '工单创建时间', prop: 'orderCreateTime'},
+              {label: '事发地', prop: 'vehiclePointAddress'},
             ]
           } else if (this.active === 9) {//车辆在线情况
             this.labelList = [
               {label: '日期', prop: 'date'},
-              {label: '在线车辆数量', prop: 'vehicleCount'},
+              {label: '0点在线车辆数量', prop: 'zeroClockVehicleCount'},
+              {label: '8点在线车辆数量', prop: 'eightClockVehicleCount'},
+              {label: '12点在线车辆数量', prop: 'twelveClockVehicleCount'},
+              {label: '16点在线车辆数量', prop: 'sixteenClockVehicleCount'},
+              {label: '20点在线车辆数量', prop: 'twentyClockVehicleCount'},
+              {label: '22点在线车辆数量', prop: 'twentyTwoClockVehicleCount'},
+
             ]
           }
         }
@@ -887,6 +1035,14 @@ export default {
         this.loading = false
       }
     },
+    formatPercentage(value) {
+      let result = value * 100;
+      if (Number.isInteger(result)) {
+        return result.toString() + '%';
+      } else {
+        return result.toFixed(2) + '%';
+      }
+    },
     checkMobile() {
       const userAgent = navigator.userAgent || navigator.vendor || window.opera;
       this.isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent);
@@ -945,13 +1101,31 @@ export default {
     },
     // 二级tab切可不调接口，需再次处理数据,1,2,3,4
     twoTabHanldeData() {
+      this.etlDetailList=[]
+      this.etlLabelList=[]
       if (this.active === 1) {
+        const columnObj = {} //创建标题数组中第一个对象
+        columnObj.label = 'KPI' //第一个标题名称
+        columnObj.prop = 'month' //第一个标题名称对应的字段
+        this.etlLabelList.push(columnObj)
         if (this.activeIndex === 0) {//接单指标
-          this.detailList?.map(item => {
+          this.etlDetailList=[{ 'month': '派遣量' },{ 'month': '承接量' },{ 'month': '完成量' },
+            { 'month': '拒单量' },{ 'month': '拒单率(%)' },{ 'month': '超时接单量' },{ 'month': '超时率(%)' },{ 'month': '客户取消率(%)' }]
+          let props = 'prop' //自定义字段名称
+          this.detailList?.map((item,index) => {
             this.v1.push(item.dispatchOrderCount)
-            this.v2.push(item.refuseOrderRate)
-            this.v3.push(item.timeoutOrderRate)
-            this.v4.push(item.cancelrate)
+            this.v2.push(item.refuseOrderRate.replace('%', ''))
+            this.v3.push(item.timeoutOrderRate.replace('%', ''))
+            this.v4.push(item.cancelRate.replace('%', ''))
+            const columnObj = {}
+            columnObj.label = item.month // 每一列的标题的名称
+            columnObj.prop = props + index //自定义每一列标题字段名称
+            this.etlLabelList.push(columnObj)
+            let mappings = [ 'dispatchOrderCount', 'receiveOrderCount', 'finishOrderCount','refuseOrderCount',
+              'refuseOrderRate', 'timeoutOrderCount', 'timeoutOrderRate','cancelRate' ];
+            for (let i = 0; i < mappings.length; i++) {
+              this.$set(this.etlDetailList[i], columnObj.prop, item[mappings[i]]);
+            }
           })
           this.labelList = [
             {label: '月', prop: 'month'},
@@ -959,82 +1133,117 @@ export default {
             {label: '承接量', prop: 'receiveOrderCount'},
             {label: '完成量', prop: 'finishOrderCount'},
             {label: '拒单量', prop: 'refuseOrderCount'},
-            {label: '拒单率（%）', prop: 'refuseOrderRate'},
+            {label: '拒单率(%)', prop: 'refuseOrderRate'},
             {label: '超时接单量', prop: 'timeoutOrderCount'},
-            {label: '超时率（%）', prop: 'timeoutOrderRate'},
-            {label: '取消率（%）', prop: 'cancelrate'},
+            {label: '超时率(%)', prop: 'timeoutOrderRate'},
+            {label: '取消率(%)', prop: 'cancelRate'},
           ]
         } else if (this.activeIndex === 1) {
-          this.detailList?.map(item => {
-            this.v1.push(item.customerEvaluateRate)
-            this.v2.push(item.customerSatisfaction)
-            this.v3.push(item.complainOrderRate)
+          this.etlDetailList=[{ 'month': '投诉量' },{ 'month': '投诉率(%)' },{ 'month': '客户满意度(%)' }, { 'month': '客户评价率(%)' }]
+          let props = 'prop' //自定义字段名称
+          this.detailList?.map((item,index) => {
+            this.v1.push(item.customerEvaluateRate.replace('%', ''))
+            this.v2.push(item.customerSatisfaction.replace('%', ''))
+            this.v3.push(item.complainOrderRate.replace('%', ''))
+            const columnObj = {}
+            columnObj.label = item.month // 每一列的标题的名称
+            columnObj.prop = props + index //自定义每一列标题字段名称
+            this.etlLabelList.push(columnObj)
+            let mappings = [ 'complainOrderCount', 'complainOrderRate', 'customerSatisfaction','customerEvaluateRate' ];
+            for (let i = 0; i < mappings.length; i++) {
+              this.$set(this.etlDetailList[i], columnObj.prop, item[mappings[i]]);
+            }
           })
           this.labelList = [
             {label: '月', prop: 'month'},
             {label: '投诉量', prop: 'complainOrderCount'},
-            {label: '投诉率（%）', prop: 'complainOrderRate'},
-            {label: '客户满意度（%）', prop: 'customerSatisfaction'},
-            {label: '客户评价率（%）', prop: 'customerEvaluateRate'},
+            {label: '投诉率(%)', prop: 'complainOrderRate'},
+            {label: '客户满意度(%)', prop: 'customerSatisfaction'},
+            {label: '客户评价率(%)', prop: 'customerEvaluateRate'},
           ]
         } else if (this.activeIndex === 2) {
-          this.detailList?.map(item => {
-            this.v1.push(item.appRate)
-            this.v2.push(item.threeMinutesContactRate)
-            this.v3.push(item.pinganPolymerizationSuccessRate)
-            this.v4.push(item.zhonghuaPolymerizationSuccessRate)
-            this.v5.push(item.zdPolymerizationSuccessRate)
-            this.v6.push(item.polymerizationSuccessRate)
+          this.etlDetailList=[{ 'month': '使用率(%)' },{ 'month': '3′联系客户率(%)' },{ 'month': '平安聚合成功率(%)' }, { 'month': '中华聚合成功率(%)' }
+            ,{ 'month': '中道聚合成功率（%' }, { 'month': '总聚合成功率(%)' }]
+          let props = 'prop' //自定义字段名称
+          this.detailList?.map((item,index) => {
+            this.v1.push(item.appRate.replace('%', ''))
+            this.v2.push(item.threeMinutesContactRate.replace('%', ''))
+            this.v3.push(item.pinganPolymerizationSuccessRate.replace('%', ''))
+            this.v4.push(item.zhonghuaPolymerizationSuccessRate.replace('%', ''))
+            this.v5.push(item.zdPolymerizationSuccessRate.replace('%', ''))
+            this.v6.push(item.polymerizationSuccessRate.replace('%', ''))
+            const columnObj = {}
+            columnObj.label = item.month // 每一列的标题的名称
+            columnObj.prop = props + index //自定义每一列标题字段名称
+            this.etlLabelList.push(columnObj)
+            let mappings = [ 'appRate', 'threeMinutesContactRate', 'pinganPolymerizationSuccessRate','zhonghuaPolymerizationSuccessRate','zdPolymerizationSuccessRate','polymerizationSuccessRate' ];
+            for (let i = 0; i < mappings.length; i++) {
+              this.$set(this.etlDetailList[i], columnObj.prop, item[mappings[i]]);
+            }
           })
           this.labelList = [
             {label: '月', prop: 'month'},
-            {label: '使用率（%）', prop: 'appRate'},
-            {label: '3′联系客户率（%）', prop: 'threeMinutesContactRate'},
-            {label: '平安聚合成功率（%）', prop: 'pinganPolymerizationSuccessRate'},
-            {label: '中华聚合成功率（%）', prop: 'zhonghuaPolymerizationSuccessRate'},
-            {label: '中道聚合成功率（%）', prop: 'zdPolymerizationSuccessRate'},
-            {label: '总聚合成功率（%）', prop: 'polymerizationSuccessRate'},
+            {label: '使用率(%)', prop: 'appRate'},
+            {label: '3′联系客户率(%)', prop: 'threeMinutesContactRate'},
+            {label: '平安聚合成功率(%)', prop: 'pinganPolymerizationSuccessRate'},
+            {label: '中华聚合成功率(%)', prop: 'zhonghuaPolymerizationSuccessRate'},
+            {label: '中道聚合成功率(%)', prop: 'zdPolymerizationSuccessRate'},
+            {label: '总聚合成功率(%)', prop: 'polymerizationSuccessRate'},
           ]
         } else if (this.activeIndex === 3) {
+          this.etlDetailList=[{ 'month': '接单时效(分)' },{ 'month': '3′接单率(%)' },{ 'month': '到达时效(分)' }, { 'month': '40′到达率(%)' },{'month':'聚合成功到达时效(分)'}]
+          let props = 'prop' //自定义字段名称
           if (this.isMobile) {
             if (this.value == 1) {
               this.detailList?.map(item => {
                 this.v1.push(item.receiving)
-                this.v2.push(item.threeMinutesReceivingRate)
+                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)
+                this.v3.push(item.fortyMinutesArrivalRate.replace('%', ''))
               })
+              console.log("this.v1",this.v1,this.v2,this.v3)
             }
+            this.detailList?.map((item,index) => {
+              const columnObj = {}
+              columnObj.label = item.month // 每一列的标题的名称
+              columnObj.prop = props + index //自定义每一列标题字段名称
+              this.etlLabelList.push(columnObj)
+              let mappings = [ 'receiving', 'threeMinutesReceivingRate', 'arriving','fortyMinutesArrivalRate','polymerizationSuccessArriving'];
+              for (let i = 0; i < mappings.length; i++) {
+                this.$set(this.etlDetailList[i], columnObj.prop, item[mappings[i]]);
+              }
+            })
           } else {
             this.detailList?.map(item => {
               this.v1.push(item.receiving)
-              this.v2.push(item.threeMinutesReceivingRate)
+              this.v2.push(item.threeMinutesReceivingRate.replace('%', ''))
             })
             if (this.swithVal) {
               this.detailList?.map(item => {
                 this.v3.push(item.trailArriving)
-                this.v4.push(item.trailPolymerizationSuccessArriving)
-                this.v5.push(item.trailFortyMinutesArrivalRate)
+                this.v4.push(item.trailPolymerizationSuccessArsriving)
+                this.v5.push(item.trailFortyMinutesArrivalRate  ? item.trailFortyMinutesArrivalRate.replace('%', '') : item.trailFortyMinutesArrivalRate)
               })
             } else {
               this.detailList?.map(item => {
                 this.v3.push(item.minorArriving)
                 this.v4.push(item.minorPolymerizationSuccessArriving)
-                this.v5.push(item.minorFortyMinutesArrivalRate)
+                this.v5.push(item.minorFortyMinutesArrivalRate  ? item.minorFortyMinutesArrivalRate.replace('%', '') : item.minorFortyMinutesArrivalRate)
               })
             }
           }
           this.labelList = [
             {label: '月', prop: 'month'},
             {label: '接单时效(分)', prop: 'receiving'},
-            {label: '3′接单率（%）', prop: 'threeMinutesReceivingRate'},
+            {label: '3′接单率(%)', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
-            {label: '40′到达率（%）', prop: 'fortyMinutesArrivalRate'},
-            {label: '聚合成功到达时效', prop: 'polymerizationSuccessArriving'},
+            {label: '40′到达率(%)', prop: 'fortyMinutesArrivalRate'},
+            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       } else if (this.active === 2) {
@@ -1045,42 +1254,42 @@ export default {
             {label: '承接案件量', prop: 'receiveOrderCount'},
             {label: '完成量', prop: 'finishOrderCount'},
             {label: '拒单量', prop: 'refuseOrderCount'},
-            {label: '拒单率（%）', prop: 'refuseOrderRate'},
+            {label: '拒单率(%)', prop: 'refuseOrderRate'},
             {label: '超时接单量', prop: 'timeoutOrderCount'},
-            {label: '超时率（%）', prop: 'timeoutOrderRate'},
-            {label: '客户取消率（%）', prop: 'cancelrate'},
+            {label: '超时率(%)', prop: 'timeoutOrderRate'},
+            {label: '客户取消率(%)', prop: 'cancelRate'},
           ]
         } else if (this.activeIndex === 1) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '投诉量', prop: 'complainOrderCount'},
-            {label: '投诉率（%）', prop: 'complainOrderRate'},
-            {label: '客户评价率（%）', prop: 'customerEvaluateRate'},
-            {label: '催促率（%）', prop: 'urgeRate'},
+            {label: '投诉率(%)', prop: 'complainOrderRate'},
+            {label: '客户评价率(%)', prop: 'customerEvaluateRate'},
+            {label: '催促率(%)', prop: 'urgeRate'},
           ]
         } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '日', prop: 'date'},
-            {label: '使用率（%）', prop: 'appRate'},
-            {label: '3′联系客户率（%）', prop: 'threeMinutesContactRate'},
-            {label: '平安聚合成功率（%）', prop: 'pinganPolymerizationSuccessRate'},
-            {label: '中华聚合成功率（%）', prop: 'zhonghuaPolymerizationSuccessRate'},
-            {label: '中道聚合成功率（%）', prop: 'zdPolymerizationSuccessRate'},
-            {label: '总聚合成功率（%）', prop: 'polymerizationSuccessRate'},
+            {label: '使用率(%)', prop: 'appRate'},
+            {label: '3′联系客户率(%)', prop: 'threeMinutesContactRate'},
+            {label: '平安聚合成功率(%)', prop: 'pinganPolymerizationSuccessRate'},
+            {label: '中华聚合成功率(%)', prop: 'zhonghuaPolymerizationSuccessRate'},
+            {label: '中道聚合成功率(%)', prop: 'zdPolymerizationSuccessRate'},
+            {label: '总聚合成功率(%)', prop: 'polymerizationSuccessRate'},
           ]
         } else if (this.activeIndex === 3) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '接单时效(分)', prop: 'receiving'},
-            {label: '3′接单率（%）', prop: 'threeMinutesReceivingRate'},
+            {label: '3′接单率(%)', prop: 'threeMinutesReceivingRate'},
             {label: '小修到达时效(分)', prop: 'minorArriving'},
             {label: '拖车到达时效(分)', prop: 'trailArriving'},
             {label: '困境到达时效(分)', prop: 'dilemmaArriving'},
             {label: '到达时效(分)', prop: 'arriving'},
-            {label: '40′到达率（%）', prop: 'fortyMinutesArrivalRate'},
+            {label: '40′到达率(%)', prop: 'fortyMinutesArrivalRate'},
             {label: '小修聚合成功到达时效(分)', prop: 'minorPolymerizationSuccessArriving'},
             {label: '拖车聚合成功到达时效(分)', prop: 'trailPolymerizationSuccessArriving'},
-            {label: '聚合成功到达时效', prop: 'polymerizationSuccessArriving'},
+            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       } else if (this.active === 3) {
@@ -1089,83 +1298,87 @@ export default {
             {label: '师傅姓名', prop: 'driverName'},
             {label: '承接案件量', prop: 'receiveOrderCount'},
             {label: '拒单量', prop: 'refuseOrderCount'},
-            {label: '拒单率（%）', prop: 'refuseOrderRate'},
+            {label: '拒单率(%)', prop: 'refuseOrderRate'},
             {label: '超时接单量', prop: 'timeoutOrderCount'},
-            {label: '超时率（%）', prop: 'timeoutOrderRate'},
+            {label: '超时率(%)', prop: 'timeoutOrderRate'},
           ]
         } else if (this.activeIndex === 1) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '承接案件量', prop: 'receiveOrderCount'},
             {label: '投诉量', prop: 'complainOrderCount'},
-            {label: '投诉率（%）', prop: 'complainOrderRate'},
-            {label: '客户满意度（%）', prop: 'customerSatisfaction'},
-            {label: '客户评价率（%）', prop: 'customerEvaluateRate'},
-            {label: '催促率（%）', prop: 'urgeRate'},
+            {label: '投诉率(%)', prop: 'complainOrderRate'},
+            {label: '客户满意度(%)', prop: 'customerSatisfaction'},
+            {label: '客户评价率(%)', prop: 'customerEvaluateRate'},
+            {label: '催促率(%)', prop: 'urgeRate'},
           ]
         } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '承接案件量', prop: 'receiveOrderCount'},
-            {label: 'App使用率（%）', prop: 'appRate'},
-            {label: '3′联系客户率（%）', prop: 'threeMinutesContactRate'},
-            {label: '平安聚合成功率（%）', prop: 'pinganPolymerizationSuccessRate'},
-            {label: '中华聚合成功率（%）', prop: 'zhonghuaPolymerizationSuccessRate'},
-            {label: '中道聚合成功率（%）', prop: 'zdPolymerizationSuccessRate'},
-            {label: '总聚合成功率（%）', prop: 'polymerizationSuccessRate'},
-            {label: '日均在线时长', prop: 'onlineDuration'},
+            {label: 'App使用率(%)', prop: 'appRate'},
+            {label: '3′联系客户率(%)', prop: 'threeMinutesContactRate'},
+            {label: '平安聚合成功率(%)', prop: 'pinganPolymerizationSuccessRate'},
+            {label: '中华聚合成功率(%)', prop: 'zhonghuaPolymerizationSuccessRate'},
+            {label: '中道聚合成功率(%)', prop: 'zdPolymerizationSuccessRate'},
+            {label: '总聚合成功率(%)', prop: 'polymerizationSuccessRate'},
+            {label: '日均在线时长(h)', prop: 'onlineDuration'},
           ]
         } else if (this.activeIndex === 3) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '接单时效(分)', prop: 'receiving'},
-            {label: '3′接单率（%）', prop: 'threeMinutesReceivingRate'},
+            {label: '3′接单率(%)', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
-            {label: '40′到达率（%）', prop: 'fortyMinutesArrivalRate'},
-            {label: '聚合成功到达时效', prop: 'polymerizationSuccessArriving'},
+            {label: '40′到达率(%)', prop: 'fortyMinutesArrivalRate'},
+            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       } else if (this.active === 4) {
         if (this.activeIndex === 0) {//接单指标
           this.labelList = [
             {label: '日', prop: 'date'},
+            {label: '师傅姓名', prop: 'driverName'},
             {label: '派遣案件量', prop: 'dispatchOrderCount'},
             {label: '承接案件量', prop: 'receiveOrderCount'},
             {label: '完成量', prop: 'finishOrderCount'},
             {label: '拒单量', prop: 'refuseOrderCount'},
-            {label: '拒单率（%）', prop: 'refuseOrderRate'},
+            {label: '拒单率(%)', prop: 'refuseOrderRate'},
             {label: '超时接单量', prop: 'timeoutOrderCount'},
-            {label: '超时率（%）', prop: 'timeoutOrderRate'},
-            {label: '客户取消率（%）', prop: 'cancelrate'},
+            {label: '超时率(%)', prop: 'timeoutOrderRate'},
+            {label: '客户取消率(%)', prop: 'cancelRate'},
           ]
         } else if (this.activeIndex === 1) {
           this.labelList = [
             {label: '日', prop: 'date'},
+            {label: '师傅姓名', prop: 'driverName'},
             {label: '投诉量', prop: 'complainOrderCount'},
-            {label: '投诉率（%）', prop: 'complainOrderRate'},
-            {label: '客户满意度（%）', prop: 'customerSatisfaction'},
-            {label: '客户评价率（%）', prop: 'customerEvaluateRate'},
-            {label: '催促率（%）', prop: 'urgeRate'},
+            {label: '投诉率(%)', prop: 'complainOrderRate'},
+            {label: '客户满意度(%)', prop: 'customerSatisfaction'},
+            {label: '客户评价率(%)', prop: 'customerEvaluateRate'},
+            {label: '催促率(%)', prop: 'urgeRate'},
           ]
         } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '日', prop: 'date'},
-            {label: '使用率（%）', prop: 'appRate'},
-            {label: '3′联系客户率（%）', prop: 'threeMinutesContactRate'},
-            {label: '平安聚合成功率（%）', prop: 'pinganPolymerizationSuccessRate'},
-            {label: '中华聚合成功率（%）', prop: 'zhonghuaPolymerizationSuccessRate'},
-            {label: '中道聚合成功率（%）', prop: 'zdPolymerizationSuccessRate'},
-            {label: '总聚合成功率（%）', prop: 'polymerizationSuccessRate'},
-            {label: '日均在线时长', prop: 'onlineDuration'},
+            {label: '师傅姓名', prop: 'driverName'},
+            {label: '使用率(%)', prop: 'appRate'},
+            {label: '3′联系客户率(%)', prop: 'threeMinutesContactRate'},
+            {label: '平安聚合成功率(%)', prop: 'pinganPolymerizationSuccessRate'},
+            {label: '中华聚合成功率(%)', prop: 'zhonghuaPolymerizationSuccessRate'},
+            {label: '中道聚合成功率(%)', prop: 'zdPolymerizationSuccessRate'},
+            {label: '总聚合成功率(%)', prop: 'polymerizationSuccessRate'},
+            {label: '日均在线时长(h)', prop: 'onlineDuration'},
           ]
         } else if (this.activeIndex === 3) {
           this.labelList = [
             {label: '日', prop: 'date'},
+            {label: '师傅姓名', prop: 'driverName'},
             {label: '接单时效(分)', prop: 'receiving'},
-            {label: '3′接单率（%）', prop: 'threeMinutesReceivingRate'},
+            {label: '3′接单率(%)', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
-            {label: '40′到达率（%）', prop: 'fortyMinutesArrivalRate'},
-            {label: '聚合成功到达时效', prop: 'polymerizationSuccessArriving'},
+            {label: '40′到达率(%)', prop: 'fortyMinutesArrivalRate'},
+            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       }
@@ -1276,6 +1489,9 @@ export default {
     ::v-deep .el-input__inner {
       border-radius: 0px 20px 20px 0px;
     }
+    ::v-deep .el-input__suffix {
+      top: 4px; /* 给清除按钮预留空间 */
+    }
   }
 }
 
@@ -1311,7 +1527,10 @@ export default {
   border-right: 1px solid #ccc;
   border-bottom: 1px solid #ccc;;
 }
-
+::v-deep .el-pagination .el-select .el-input{
+  width: 80px;
+  margin:0
+}
 .contentWrap {
   @include wh(100%, calc(100% - 120px));
   overflow-y: auto;
@@ -1321,10 +1540,36 @@ export default {
     @include whBg(375px, 146px, #FFFFFF);
     @include sizing4Padding(19px, 25px, 38px, 19px);
     margin-bottom: 10px;
-
+    .scoreTitle{
+      @include flexBetCen;
+      i{
+        cursor: pointer;
+        font-size: 14px;
+      }
+    }
     .storeWrap {
       width: 100%;
       text-align: center;
+      .detailScore{
+        display: flex;
+        justify-content:center;
+      }
+
+     /* .defen{
+        display: inline-block;
+        //width: 92px;
+        //text-align: right;
+      }*/
+      .left{
+        text-align: right;
+        padding-right: 5px;
+      }
+      .right{
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+        text-align: left;
+      }
     }
 
     .title {
@@ -1382,13 +1627,25 @@ export default {
 .webcontentWrap {
   @include wh(100%, calc(100% - 86px));
 }
-
+.tipArrow{
+  position: absolute;
+  top: 10px;
+  color: #FFFFFF;
+  font-size: 12px;
+}
+.left{
+  left: 0;
+}
+.right{
+  right: 0px;
+}
 .tabWrap {
   @include wh(100%, 22px);
   @include flexColAround;
   margin: 10px 0;
 
   div {
+    cursor: pointer;
     padding: 2px 8px;
     border-radius: 7px;
     font-size: 12px;
@@ -1417,12 +1674,10 @@ export default {
     border-color: #F1B289 transparent transparent transparent;
   }
 }
-
 .webTabWrap {
   width: 40% !important;
-
   .active:after {
-    margin-top: 5px;
+    margin-top: 4px;
   }
 }
 
@@ -1463,6 +1718,10 @@ export default {
   ::v-deep .el-input__inner{
     height: 30px;
   }
+  ::v-deep .el-input__suffix {
+    top: 4px; /* 给清除按钮预留空间 */
+  }
+
 }
 .comTab {
   width: 100%;

src/views/newcomerTraining/driverTrainingList.vue

@@ -0,0 +1,308 @@
+<template>
+  <div class="wrap" :style="{ 'overflow-y': showPoup ? 'hidden' : 'auto' }">
+    <div class="navBar">
+      <van-nav-bar title="师傅培训"  :border="false" :fixed="true" :safe-area-inset-top="true">
+        <template slot="left" v-if="isFinished">
+         <van-icon  name="checked" color="#37ec37" size="20"/>
+        </template>
+      </van-nav-bar>
+    </div>
+    <div class="contentWrap" v-show="!showEmpty">
+      <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
+        <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'培训文档')">
+          <div class="info flexBetween common">
+            <div class="title">{{ item.name }}</div>
+<!--            <div class="time">{{ item.pushTime }}</div>-->
+          </div>
+          <div class="imgWrap"><img :src="item.themePicture"></div>
+          <div class="num common">{{ item.synopsis }}</div>
+          <div  class="info flexBetween common">
+            <div class="time">{{ item.pushTime		 }}</div>
+            <template v-if="item.alreadyRead === 1">
+              <div class="status"  style="color: #cccccc">已处理</div>
+            </template>
+            <template v-else>
+              <div class="status" >未处理</div>
+            </template>
+          </div>
+        </div>
+      </van-pull-refresh>
+    </div>
+    <div class="empty" v-show="showEmpty">
+      <img src="@/assets/empty.png" />
+    </div>
+    <div  class="poupCommon" v-if="showPoup">
+      <div class="container showPoupContainer">
+        <div class="con">
+          <div class="title">培训提醒</div>
+          <div class="content">欢迎使用中道司机APP。请您先完成培训，阅读文章，并问答相应问题。完成后即可正常使用APP。祝您使用愉快!</div>
+          <div class="line"></div>
+          <div class="btnWrap">
+            <div class="nextBtn" @click="showPoup = false">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div  class="poupCommon" v-if="isFinished">
+      <div class="container finishContainer">
+        <div class="con">
+          <div class="title">提示</div>
+          <div class="content">恭喜您，您已经全部完成培训！现在您可以正常使用我们的app，请前往体验。</div>
+          <div class="line"></div>
+          <div class="btnWrap">
+            <div class="nextBtn" @click="goApp">前往</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+import {driverTrainList} from  "@/api/mine"
+export default {
+  name: "driverTrainingList",
+  computed: {
+  },
+  mixins:[myMixins],
+  data(){
+    return{
+      pageList:[],
+      show:false,
+      showEmpty:false,
+      isLoading:false,
+      showPoup:true,//进入弹框
+      isFinished:false,
+      driverId:'',
+    }
+  },
+  mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.driverId = urlParams.get('driverId');
+    this.getList();
+    document.addEventListener('visibilitychange', async (  ) => {
+      let state = document.visibilityState
+      if (state == 'hidden') {  // 用户离开了
+      }
+      if (state == 'visible') {
+        this.getList();
+      }
+    });
+  },
+  methods:{
+    onRefresh() {
+      this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+
+    async getList(){
+      let res= await driverTrainList({
+        driverId:this.driverId,//79639
+      })
+      this.pageList=res.data?.list;
+      if(res.data.assessState == 0){
+        this.isFinished=false
+      }else {
+        this.isFinished=true //是否完成
+      }
+      if(this.pageList?.length === 0){
+        this.showEmpty  = true
+      }else {
+        this.showEmpty = false
+      }
+    },
+    goApp(){
+      let data = {"action":"goBack","params":""}
+      var u = navigator.userAgent;
+      var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+      if(isiOS){
+        window.webkit.messageHandlers.nativeObject.postMessage(data);
+      }else {
+        window.android.sendMessage("goBack");
+      }
+    },
+  }
+}
+</script>
+<style scoped lang="scss">
+@import "@/styles/common.scss";
+@import "@/styles/mixin.scss";
+@import "@/styles/docment.scss";
+@import "@/styles/driverDocment.scss";
+.contentWrap{
+  height: calc(100% - 50px) !important;
+}
+.status{
+  color: red;
+  font-size: 14px;
+  margin-right: 8px;
+  text-align: right
+}
+.wrap{
+  position: relative;
+  overflow-y: hidden;
+}
+.poupCommon{
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0,0,0,.7);
+    position: absolute;
+    top: 0;
+    left: 0;
+    .showPoupContainer{
+      height: 310px;
+      background-size: 320px 310px;
+      .content{
+        margin-bottom: 20px;
+      }
+      .btnWrap{
+        margin-top: 6px;
+      }
+    }
+    .finishContainer{
+      height: 260px;
+      background-size: 320px 260px;
+      .con{
+        top: 80px !important;
+      }
+    }
+    .container{
+      width: 320px;
+      background-image: url("@/assets/trainBg.png");
+      background-repeat: no-repeat;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      margin: auto;
+      .con{
+        position: absolute;
+        top: 100px;
+        left: 20px;
+      }
+
+    }
+    .title{
+      font-weight: bold;
+      font-size: 19px;
+      color: #3364B7;
+      line-height: 26px;
+      width: 70%;
+      margin-left: 35px;
+      text-align: center;
+    }
+    .content{
+      width: 70%;
+      height: 92px;
+      font-size: 14px;
+      color: #4C5361;
+      line-height: 23px;
+      text-align: justify;
+      margin-top: 8px;
+      margin-left: 35px;
+    }
+    .line{
+      width: 285px;
+      height: 1px;
+      border-bottom: 1px solid #F1F2F5;
+    }
+    .btnWrap{
+      width: 92%;
+      font-weight: bold;
+      font-size: 13px;
+      display: flex;
+      justify-content: space-around;
+      height: 40px;
+      line-height: 40px;
+      .closeBtn{
+        color: #999B9F;
+      }
+      .line{
+        width: 1px;
+        height: 48px;
+        border-right: 1px solid #F1F2F5;
+      }
+      .nextBtn{
+        color: #3364B7;
+      }
+    }
+}
+//.poupWrap{
+//  width: 100%;
+//  height: 100%;
+//  background-color: rgba(0,0,0,.7);
+//  position: absolute;
+//  top: 0;
+//  left: 0;
+//  .container{
+//    width: 320px;
+//    height: 310px;
+//    background-image: url("@/assets/trainBg.png");
+//    background-size: 320px 310px;
+//    background-repeat: no-repeat;
+//    position: absolute;
+//    top: 0;
+//    bottom: 0;
+//    left: 0;
+//    right: 0;
+//    margin: auto;
+//    .con{
+//      position: absolute;
+//      top: 100px;
+//      left: 20px;
+//    }
+//
+//  }
+//  .title{
+//    font-weight: bold;
+//    font-size: 19px;
+//    color: #3364B7;
+//    line-height: 26px;
+//    width: 70%;
+//    margin-left: 35px;
+//    text-align: center;
+//  }
+//  .content{
+//    width: 70%;
+//    height: 92px;
+//    font-size: 14px;
+//    color: #4C5361;
+//    line-height: 23px;
+//    text-align: justify;
+//    margin-top: 8px;
+//    margin-bottom: 20px;
+//    margin-left: 35px;
+//  }
+//  .line{
+//    width: 285px;
+//    height: 1px;
+//    border-bottom: 1px solid #F1F2F5;
+//  }
+//  .btnWrap{
+//    width: 92%;
+//    font-weight: bold;
+//    font-size: 13px;
+//    display: flex;
+//    justify-content: space-around;
+//    margin-top: 6px;
+//    height: 40px;
+//    line-height: 40px;
+//    .closeBtn{
+//      color: #999B9F;
+//    }
+//    .line{
+//      width: 1px;
+//      height: 48px;
+//      border-right: 1px solid #F1F2F5;
+//    }
+//    .nextBtn{
+//      color: #3364B7;
+//    }
+//  }
+//}
+</style>

src/views/newcomerTraining/newTrainingList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="wrap" :style="{ 'overflow-y': showPoup ? 'hidden' : 'auto' }">
     <div class="navBar">
-      <van-nav-bar title="新人培训"  :border="false" :fixed="true" :safe-area-inset-top="true">
+      <van-nav-bar title="培训"  :border="false" :fixed="true" :safe-area-inset-top="true">
         <template slot="left" v-if="isFinished">
          <van-icon  name="checked" color="#37ec37" size="20"/>
         </template>
@@ -9,19 +9,23 @@
     </div>
     <div class="contentWrap" v-show="!showEmpty">
       <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
-        <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item)">
+        <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'培训文档')">
           <div class="info flexBetween common">
-            <div class="title">{{ item.pushUser }}</div>
-            <div class="time">{{ item.pushTime }}</div>
+            <div class="title">{{ item.name }}</div>
+<!--            <div class="time">{{ item.updateTime }}</div>-->
           </div>
           <div class="imgWrap"><img :src="item.themePicture"></div>
           <div class="num common">{{ item.synopsis }}</div>
-          <template v-if="item.listShowButton == null">
+          <div  class="info flexBetween common" >
+            <div class="time">{{ item.pushTime		 }}</div>
+            <span style="color: red;font-size: 14px;margin-right: 8px" :class="item.alreadyRead===1 ? 'alRead' : ''">{{ item.alreadyRead===1 ? '已处理' :  '未处理' }}</span>
+          </div>
+<!--          <template v-if="item.alreadyRead === 1">
             <div class="status"  style="color: #cccccc">已处理</div>
           </template>
           <template v-else>
             <div class="status" >未处理</div>
-          </template>
+          </template>-->
         </div>
       </van-pull-refresh>
     </div>
@@ -38,7 +42,6 @@
             <div class="nextBtn" @click="showPoup = false">确定</div>
           </div>
         </div>
-
       </div>
     </div>
     <div  class="poupCommon" v-if="isFinished">
@@ -51,17 +54,14 @@
             <div class="nextBtn" @click="goApp">前往</div>
           </div>
         </div>
-
       </div>
     </div>
   </div>
 </template>
 
 <script>
-// import { Dialog  } from 'vant';
 import {myMixins} from "@/utils/myMixins"
 import {pageList} from  "@/api/mine"
-
 export default {
   name: "newTrainingList",
   computed: {
@@ -78,16 +78,26 @@ export default {
       isLoading:false,
       showPoup:true,//进入弹框
       isFinished:false,
-      // showPoup:false,//进入弹框
-      // isFinished:true,
     }
   },
   mounted() {
     // this.onRefresh();
     this.getList();
 
+    document.addEventListener('visibilitychange', async (  ) => {
+      let state = document.visibilityState
+      if (state == 'hidden') {  // 用户离开了
+        // console.log('用户离开了')
+      }
+      if (state == 'visible') {
+        // console.log('用户回来了')
+        this.getList();
+        //调用接口,获取订单状态
+      }
+    });
   },
   created() {
+    console.log("createdcreatedcreated")
     // this.getList();
     // 每次回答完问题之后返回需重新加结果
 
@@ -111,16 +121,14 @@ export default {
         docType:1,
         trainingType:4,
       })
-      this.pageList=res.data;
-      let aaa=this.pageList.every(item=>item.listShowButton != 1)
-      if(aaa){
-        this.showPoup=false
-        this.isFinished=true
-        // await this.allProcessed()
+      this.pageList=res.data?.list || [];
+      if(res.data.assessState == 0){
+        this.isFinished=false
+      }else {
+        this.isFinished=true //是否完成
       }
-      if(res.data.length === 0){
+      if(this.pageList?.length == 0){
         this.showEmpty  = true
-
       }else {
         this.showEmpty = false
       }
@@ -139,28 +147,6 @@ export default {
         window.android.sendMessage("goBack");
       }
     },
-    /*allProcessed(){
-      Dialog.confirm({
-        title: '提示',
-        message: '恭喜您，您已经全部完成培训！现在您可以正常使用我们的app，请前往体验。',
-        confirmButtonText: '前往',
-        cancelButtonText: '稍后'
-      })
-          .then(() => {
-            let data = {"action":"goBack","params":""}
-            var u = navigator.userAgent;
-            var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-            if(isiOS){
-              window.webkit.messageHandlers.nativeObject.postMessage(data);
-            }else {
-              window.android.sendMessage("goBack");
-            }
-          })
-          .catch(() => {
-            // on cancel
-          });
-      console.log("全部处理")
-    },*/
   }
 }
 </script>
@@ -168,6 +154,10 @@ export default {
 @import "@/styles/common.scss";
 @import "@/styles/mixin.scss";
 @import "@/styles/docment.scss";
+.contentWrap{
+  height: calc(100% - 50px) !important;
+}
+
 .status{
   color: red;
   font-size: 14px;
@@ -264,77 +254,8 @@ export default {
       }
     }
 }
-//.poupWrap{
-//  width: 100%;
-//  height: 100%;
-//  background-color: rgba(0,0,0,.7);
-//  position: absolute;
-//  top: 0;
-//  left: 0;
-//  .container{
-//    width: 320px;
-//    height: 310px;
-//    background-image: url("@/assets/trainBg.png");
-//    background-size: 320px 310px;
-//    background-repeat: no-repeat;
-//    position: absolute;
-//    top: 0;
-//    bottom: 0;
-//    left: 0;
-//    right: 0;
-//    margin: auto;
-//    .con{
-//      position: absolute;
-//      top: 100px;
-//      left: 20px;
-//    }
-//
-//  }
-//  .title{
-//    font-weight: bold;
-//    font-size: 19px;
-//    color: #3364B7;
-//    line-height: 26px;
-//    width: 70%;
-//    margin-left: 35px;
-//    text-align: center;
-//  }
-//  .content{
-//    width: 70%;
-//    height: 92px;
-//    font-size: 14px;
-//    color: #4C5361;
-//    line-height: 23px;
-//    text-align: justify;
-//    margin-top: 8px;
-//    margin-bottom: 20px;
-//    margin-left: 35px;
-//  }
-//  .line{
-//    width: 285px;
-//    height: 1px;
-//    border-bottom: 1px solid #F1F2F5;
-//  }
-//  .btnWrap{
-//    width: 92%;
-//    font-weight: bold;
-//    font-size: 13px;
-//    display: flex;
-//    justify-content: space-around;
-//    margin-top: 6px;
-//    height: 40px;
-//    line-height: 40px;
-//    .closeBtn{
-//      color: #999B9F;
-//    }
-//    .line{
-//      width: 1px;
-//      height: 48px;
-//      border-right: 1px solid #F1F2F5;
-//    }
-//    .nextBtn{
-//      color: #3364B7;
-//    }
-//  }
-//}
+.alRead{
+  color: #cccccc !important;
+}
+
 </style>

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>