Procházet zdrojové kódy

feat: 调整首页点击传值

Jack Zhou před 1 měsícem
rodič
revize
c1662fc396

+ 9 - 38
src/views/Dashboard/src/DashboardView.new.vue

@@ -476,36 +476,6 @@ const seller_chart_top10_origin = ref()
 const seller_chart_top10_destination = ref()
 const seller_chart_CO2_origin = ref()
 const seller_chart_CO2_destination = ref()
-const startyear = ref()
-const startmonth = ref()
-const startday = ref()
-const endyear = ref()
-const endmonth = ref()
-const endday = ref()
-//处理跳转数据
-const handleTurnData = (startdate: any, enddata: any, name: any) => {
-  if (name == 'Container') {
-    if (startdate != '') {
-      startmonth.value = startdate.split('/')[0]
-      startyear.value = startdate.split('/')[1]
-    }
-    if (enddata != '') {
-      endmonth.value = enddata.split('/')[0]
-      endyear.value = enddata.split('/')[1]
-    }
-  } else {
-    if (startdate != '') {
-      startmonth.value = startdate.split('/')[0]
-      startyear.value = startdate.split('/')[2]
-      startday.value = startdate.split('/')[1]
-    }
-    if (enddata != '') {
-      endmonth.value = enddata.split('/')[0]
-      endyear.value = enddata.split('/')[2]
-      endday.value = enddata.split('/')[1]
-    }
-  }
-}
 
 // 1. 定义配置映射表
 interface ClickConfig {
@@ -708,7 +678,8 @@ const ClickParams = (val: any) => {
       dashboardObj.KPIDefaulteData.date_start,
       dashboardObj.KPIDefaulteData.date_end
     ])
-    setTransportMode(dashboardObj.KPIDefaulteData.transport_mode)
+    console.log(dashboardObj.KPIDefaulteData.transportation, 'all Data', dashboardObj)
+    setTransportMode(dashboardObj.KPIDefaulteData.transportation)
     // KPI Departure点击跳转
     filtersStore.updateFilter({
       title: 'KPI Departure',
@@ -728,7 +699,7 @@ const ClickParams = (val: any) => {
       dashboardObj.KPIDefaulteData.date_start,
       dashboardObj.KPIDefaulteData.date_end
     ])
-    setTransportMode(dashboardObj.KPIDefaulteData.transport_mode)
+    setTransportMode(dashboardObj.KPIDefaulteData.transportation)
     // KPI Arrival点击跳转
     filtersStore.updateFilter({
       title: 'KPI Arrival',
@@ -744,7 +715,7 @@ const ClickParams = (val: any) => {
       isHide: true
     })
   } else if (val === 'Pending0') {
-    setTransportMode(dashboardObj.PendingDefaultData.transport_mode)
+    setTransportMode(dashboardObj.PendingDefaultData.transportation)
     // PendingDeparture点击跳转
     filtersStore.updateFilter({
       title: 'Pending Departure',
@@ -760,7 +731,7 @@ const ClickParams = (val: any) => {
       isHide: true
     })
   } else if (val === 'Pending1') {
-    setTransportMode(dashboardObj.PendingDefaultData.transport_mode)
+    setTransportMode(dashboardObj.PendingDefaultData.transportation)
     //  PendingArrival点击跳转
     filtersStore.updateFilter({
       title: 'Pending Arrival',
@@ -809,7 +780,7 @@ const ClickParams = (val: any) => {
       dashboardObj.Top10faultData.date_start,
       dashboardObj.Top10faultData.date_end
     ])
-    setTransportMode(dashboardObj.Top10faultData.transport_mode)
+    setTransportMode(dashboardObj.Top10faultData.transportation)
     filtersStore.updateFilter({
       title: 'Top 10 Origin',
       key: '_reportRef',
@@ -841,7 +812,7 @@ const ClickParams = (val: any) => {
       dashboardObj.Top10faultData.date_start,
       dashboardObj.Top10faultData.date_end
     ])
-    setTransportMode(dashboardObj.Top10faultData.transport_mode)
+    setTransportMode(dashboardObj.Top10faultData.transportation)
     // Top10 destination点击跳转
     filtersStore.updateFilter({
       title: 'Top 10 Destination',
@@ -876,7 +847,7 @@ const ClickParams = (val: any) => {
       dashboardObj.OriginCo2Top10faultData.date_start,
       dashboardObj.OriginCo2Top10faultData.date_end
     ])
-    setTransportMode(dashboardObj.OriginCo2Top10faultData.transport_mode)
+    setTransportMode(dashboardObj.OriginCo2Top10faultData.transportation)
     filtersStore.updateFilter({
       title: 'CO2e Emission by Origin (Top 10)',
       key: '_reportRef',
@@ -910,7 +881,7 @@ const ClickParams = (val: any) => {
       dashboardObj.DestinationCo2Top10faultData.date_start,
       dashboardObj.DestinationCo2Top10faultData.date_end
     ])
-    setTransportMode(dashboardObj.DestinationCo2Top10faultData.transport_mode)
+    setTransportMode(dashboardObj.DestinationCo2Top10faultData.transportation)
     filtersStore.updateFilter({
       title: 'CO2e Emission by Destination (Top 10)',
       key: '_reportRef',

+ 1 - 0
src/views/Tracking/src/TrackingView.new.vue

@@ -285,6 +285,7 @@ onBeforeRouteLeave((route: any) => {
         </div>
       </div>
       <MoreFilters
+        @handleSearch="getTrackingData()"
         :incotermsList="incotermsList"
         :serviceList="serviceList"
         @clearMoreFiltersTags="clearMoreFiltersTags"