From a24905255994b6953557cf2b3b10110b8db47f63 Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Thu, 29 Aug 2024 23:23:37 +0800
Subject: [PATCH] 11111

---
 components/smallCommon/Pie2.vue |  1 +
 pages/cleanTravel/home.vue      | 37 +++++++++++++--------------------
 pages/cleanTravel/trend.vue     | 36 ++++++++++++++++++++------------
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/components/smallCommon/Pie2.vue b/components/smallCommon/Pie2.vue
index 9bda92b..3f16fd9 100644
--- a/components/smallCommon/Pie2.vue
+++ b/components/smallCommon/Pie2.vue
@@ -17,6 +17,7 @@ export default {
         title: {
           show: false
         },
+        tooltip: {},
         legend: {
           top: 'bottom',
           textStyle: {
diff --git a/pages/cleanTravel/home.vue b/pages/cleanTravel/home.vue
index 28d61fb..cca39c8 100644
--- a/pages/cleanTravel/home.vue
+++ b/pages/cleanTravel/home.vue
@@ -219,34 +219,25 @@ export default {
           title: '车牌号'
         },
         {
-          dataIndex: 'transportType',
-          key: 'transportType',
-          title: '类型',
-          customRender(transportType) {
-            if (transportType === 1) return '进厂'
-            return '出厂'
-          }
-        },
-        {
-          dataIndex: 'address',
-          key: 'address',
-          title: '进出厂位置'
-        },
-        {
-          dataIndex: 'registered',
-          key: 'registered',
-          title: '出/入厂位置'
-        },
-        {
-          dataIndex: 'goods',
-          key: 'goods',
-          title: '物料类型'
+          dataIndex: 'transportTypeString',
+          key: 'transportTypeString',
+          title: '进出厂方向'
         },
         {
           dataIndex: 'effluent',
           key: 'effluent',
-          title: '排放标准'
+          title: '排放等级'
         },
+        {
+          dataIndex: 'carColorString',
+          key: 'carColorString',
+          title: '车牌颜色'
+        },
+        {
+          dataIndex: 'carType',
+          key: 'carType',
+          title: '车牌类型'
+        }
       ]
     }
   },
diff --git a/pages/cleanTravel/trend.vue b/pages/cleanTravel/trend.vue
index c0a47e2..713f0f6 100644
--- a/pages/cleanTravel/trend.vue
+++ b/pages/cleanTravel/trend.vue
@@ -85,7 +85,7 @@ export default {
         {
           dataIndex: 'time',
           key: 'time',
-          title: '日期'
+          title: '通过时间'
         },
         {
           dataIndex: 'carNumber',
@@ -95,28 +95,38 @@ export default {
         {
           dataIndex: 'carType',
           key: 'carType',
-          title: '车型'
+          title: '车牌类型'
         },
         {
-          dataIndex: 'effluent',
-          key: 'effluent',
-          title: '燃油车'
+          dataIndex: 'carType',
+          key: 'carType',
+          title: '排放类型'
+        },
+        {
+          dataIndex: 'weight',
+          key: 'weight',
+          title: '运输量'
+        },
+        {
+          dataIndex: 'carColor',
+          key: 'carColor',
+          title: '车牌颜色'
         }
       ],
       apiConf: {
         listApi: {api: '/api/Transport/gettransport', method: 'get', renderKey: 'item.cleans', after (data) {
             self.cheliangData = [
-              { name: '国五', value: data.item.v5Percent },
-              { name: '国六', value: data.item.v6Percent },
-              { name: '电动', value: data.item.electricPrecent },
-              { name: '其他', value: data.item.otherPrecent },
+              { name: '国五', value: data.item.v5Numer },
+              { name: '国六', value: data.item.v6Number },
+              { name: '电动', value: data.item.electricNumber },
+              { name: '其他', value: data.item.otherNumber },
             ]
 
             self.yunshuliangData = [
-              { name: '国五', value: data.item.v5WeightPercent },
-              { name: '国六', value: data.item.v6WeightPercent },
-              { name: '电动', value: data.item.electricWeightPrecent },
-              { name: '其他', value: data.item.otherWeightPrecent },
+              { name: '国五', value: data.item.v5WeightNumber },
+              { name: '国六', value: data.item.v6WeightNumber },
+              { name: '电动', value: data.item.electricWeightNumber },
+              { name: '其他', value: data.item.otherWeightNumber },
             ]
           }},
       }