Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/api/module/common.ts

@@ -216,112 +216,6 @@ export const SaveLayout = (params: any, config: any) => {
     config
   )
 }
-/**
- * ETD to ETA(DAYS)点击跳转
- */
-export const ClickEtdToEta = (params: any, config: any) => {
-  return HttpAxios.post(
-    `${baseUrl}`,
-    {
-      action: 'ocean_order',
-      operate: 'search',
-      _reportType: 'r1',
-      ...params
-    },
-    config
-  )
-}
-/**
- * PendingArrival点击跳转
- */
-export const ClickPendingArrival = (params: any, config: any) => {
-  return HttpAxios.post(
-    `${baseUrl}`,
-    {
-      action: 'ocean_order',
-      operate: 'search',
-      _reportType: 'r3',
-      ...params
-    },
-    config
-  )
-}
-/**
- * PendingDeparture点击跳转
- */
-export const ClickPendingDeparture = (params: any, config: any) => {
-  return HttpAxios.post(
-    `${baseUrl}`,
-    {
-      action: 'ocean_order',
-      operate: 'search',
-      _reportType: 'r4',
-      ...params
-    },
-    config
-  )
-}
-/**
- * KPIDeparture点击跳转
- */
-export const ClickKPIDeparture = (params: any, config: any) => {
-  return HttpAxios.post(
-    `${baseUrl}`,
-    {
-      action: 'ocean_order',
-      operate: 'search',
-      _reportType: 'atd_r4',
-      ...params
-    },
-    config
-  )
-}
-/**
- * KPIArrival点击跳转
- */
-export const ClickKPIArrival = (params: any, config: any) => {
-  return HttpAxios.post(
-    `${baseUrl}`,
-    {
-      action: 'ocean_order',
-      operate: 'search',
-      _reportType: 'ata_r3',
-      ...params
-    },
-    config
-  )
-}
-/**
- * Top10点击跳转
- */
-export const ClickTop10 = (params: any, config: any) => {
-  return HttpAxios.post(
-    `${baseUrl}`,
-    {
-      action: 'ocean_order',
-      operate: 'search',
-      _reportType: 'top',
-      ...params
-    },
-    config
-  )
-}
-/**
- * CO2点击跳转
- */
-export const ClickCO2 = (params: any, config: any) => {
-  return HttpAxios.post(
-    `${baseUrl}`,
-    {
-      action: 'ocean_order',
-      operate: 'search',
-      _reportType: 'co2e',
-      ...params
-    },
-    config
-  )
-}
-
 /**
  * 评分提交
  */

src/components/DateRange/src/components/QuickCalendarDate.vue

@@ -116,6 +116,7 @@ const placeholder = computed(() => {
       :allowClear="false"
       :style="{ width: props.CalendarWidth }"
       :open="open"
+      style="height: 40px"
       :presets="rangePresets"
       :disabled="props.isDisabled"
       @change="changeRangeData"

src/views/Dashboard/src/DashboardView.vue

@@ -509,35 +509,24 @@ const ClickParams = (val: any) => {
       dashboardObj.ETDDefaultData.date_end,
       'Container'
     )
-    $api
-      .ClickEtdToEta({
-        _reportRef: pie_chart_ETD.value[0].paramsdata.name,
-        _reportRefe_date: currentDate.getMonth() + 1 + '/' + currentDate.getFullYear(),
-        _reportRefb_date: tenmonth + '/' + tenyear,
-        ...dashboardObj.ETDDefaultData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportRef = pie_chart_ETD.value[0].paramsdata.name
-          reportList._reportRefe_date = currentDate.getMonth() + 1 + '/' + currentDate.getFullYear()
-          reportList._reportType = 'r1'
-          reportList._reportRefb_date = tenmonth + '/' + tenyear
-          handlereportlist(
-            dashboardObj.ETDDefaultData.transportation,
-            dashboardObj.ETDDefaultData.date_type,
-            'Container'
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'ETD to ETA (Days)'
-          obj.name = pie_chart_ETD.value[0].paramsdata.name
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportRef = pie_chart_ETD.value[0].paramsdata.name
+    reportList._reportRefe_date = currentDate.getMonth() + 1 + '/' + currentDate.getFullYear()
+    reportList._reportType = 'r1'
+    reportList._reportRefb_date = tenmonth + '/' + tenyear
+    handlereportlist(
+      dashboardObj.ETDDefaultData.transportation,
+      dashboardObj.ETDDefaultData.date_type,
+      'Container'
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'ETD to ETA (Days)'
+    obj.name = pie_chart_ETD.value[0].paramsdata.name
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
   //  PendingArrival点击跳转
   else if (val == 'Pending1') {
@@ -546,31 +535,22 @@ const ClickParams = (val: any) => {
       dashboardObj.PendingDefaultData.date_end,
       ''
     )
-    $api
-      .ClickPendingArrival({
-        _reportRef: pie_chart_pending_arrival.value[0].paramsdata.name,
-        ...dashboardObj.PendingDefaultData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportRef = pie_chart_pending_arrival.value[0].paramsdata.name
-          reportList._reportType = 'r3'
-          handlereportlist(
-            dashboardObj.PendingDefaultData.transportation,
-            dashboardObj.PendingDefaultData.date_type,
-            ''
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'Pending Arrival'
-          obj.name = pie_chart_pending_arrival.value[0].paramsdata.name
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportRef = pie_chart_pending_arrival.value[0].paramsdata.name
+    reportList._reportType = 'r3'
+    handlereportlist(
+      dashboardObj.PendingDefaultData.transportation,
+      dashboardObj.PendingDefaultData.date_type,
+      ''
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'Pending Arrival'
+    obj.name = pie_chart_pending_arrival.value[0].paramsdata.name
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
   // PendingDeparture点击跳转
   else if (val == 'Pending0') {
@@ -579,31 +559,22 @@ const ClickParams = (val: any) => {
       dashboardObj.PendingDefaultData.date_end,
       ''
     )
-    $api
-      .ClickPendingDeparture({
-        _reportRef: pie_chart_pending_departure.value[0].paramsdata.name,
-        ...dashboardObj.PendingDefaultData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportType = 'r4'
-          reportList._reportRef = pie_chart_pending_departure.value[0].paramsdata.name
-          handlereportlist(
-            dashboardObj.PendingDefaultData.transportation,
-            dashboardObj.PendingDefaultData.date_type,
-            ''
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'Pending Departure'
-          obj.name = pie_chart_pending_departure.value[0].paramsdata.name
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportType = 'r4'
+    reportList._reportRef = pie_chart_pending_departure.value[0].paramsdata.name
+    handlereportlist(
+      dashboardObj.PendingDefaultData.transportation,
+      dashboardObj.PendingDefaultData.date_type,
+      ''
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'Pending Departure'
+    obj.name = pie_chart_pending_departure.value[0].paramsdata.name
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
   // KPIDeparture点击跳转
   else if (val == 'KPI0') {
@@ -612,31 +583,22 @@ const ClickParams = (val: any) => {
       dashboardObj.KPIDefaulteData.date_end,
       ''
     )
-    $api
-      .ClickKPIDeparture({
-        _reportRef: pie_chart_kpi_departure.value[0].paramsdata.name,
-        ...dashboardObj.KPIDefaulteData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportRef = pie_chart_kpi_departure.value[0].paramsdata.name
-          reportList._reportType = 'atd_r4'
-          handlereportlist(
-            dashboardObj.KPIDefaulteData.transportation,
-            dashboardObj.KPIDefaulteData.date_type,
-            ''
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'KPI Departure'
-          obj.name = pie_chart_kpi_departure.value[0].paramsdata.name
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportRef = pie_chart_kpi_departure.value[0].paramsdata.name
+    reportList._reportType = 'atd_r4'
+    handlereportlist(
+      dashboardObj.KPIDefaulteData.transportation,
+      dashboardObj.KPIDefaulteData.date_type,
+      ''
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'KPI Departure'
+    obj.name = pie_chart_kpi_departure.value[0].paramsdata.name
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
   // KPIArrival点击跳转
   else if (val == 'KPI1') {
@@ -645,99 +607,68 @@ const ClickParams = (val: any) => {
       dashboardObj.KPIDefaulteData.date_end,
       ''
     )
-    $api
-      .ClickKPIArrival({
-        _reportRef: pie_chart_kpi_arrival.value[0].paramsdata.name,
-        ...dashboardObj.KPIDefaulteData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportRef = pie_chart_kpi_arrival.value[0].paramsdata.name
-          reportList._reportType = 'ata_r3'
-          handlereportlist(
-            dashboardObj.KPIDefaulteData.transportation,
-            dashboardObj.KPIDefaulteData.date_type,
-            ''
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'KPI Arrival'
-          obj.name = pie_chart_kpi_arrival.value[0].paramsdata.name
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportRef = pie_chart_kpi_arrival.value[0].paramsdata.name
+    reportList._reportType = 'ata_r3'
+    handlereportlist(
+      dashboardObj.KPIDefaulteData.transportation,
+      dashboardObj.KPIDefaulteData.date_type,
+      ''
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'KPI Arrival'
+    obj.name = pie_chart_kpi_arrival.value[0].paramsdata.name
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
   // Top10 origin点击跳转
   else if (val == 'Top 10 Origin') {
     handleTurnData(dashboardObj.Top10faultData.date_start, dashboardObj.Top10faultData.date_end, '')
-    $api
-      .ClickTop10({
-        _reportRef: seller_chart_top10_origin.value[0].paramsdata,
-        _reportStationType: toporiginType.value,
-        _city_name: seller_chart_top10_origin.value[0].paramscityname,
-        ...dashboardObj.Top10faultData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportRef = seller_chart_top10_origin.value[0].paramsdata
-          reportList._reportType = 'top'
-          reportList._reportStationType = toporiginType.value
-          reportList._city_name = seller_chart_top10_origin.value[0].paramscityname
-          handlereportlist(
-            dashboardObj.Top10faultData.transportation,
-            dashboardObj.Top10faultData.date_type,
-            ''
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'Top 10 Origin'
-          obj.name = seller_chart_top10_origin.value[0].paramsdata
-          obj.data = seller_chart_top10_origin.value[0].paramscityname
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportRef = seller_chart_top10_origin.value[0].paramsdata
+    reportList._reportType = 'top'
+    reportList._reportStationType = toporiginType.value
+    reportList._city_name = seller_chart_top10_origin.value[0].paramscityname
+    handlereportlist(
+      dashboardObj.Top10faultData.transportation,
+      dashboardObj.Top10faultData.date_type,
+      ''
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'Top 10 Origin'
+    obj.name = seller_chart_top10_origin.value[0].paramsdata
+    obj.data = seller_chart_top10_origin.value[0].paramscityname
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
   // Top10 destination点击跳转
   else if (val == 'Top 10 Destination') {
     handleTurnData(dashboardObj.Top10faultData.date_start, dashboardObj.Top10faultData.date_end, '')
-    $api
-      .ClickTop10({
-        _reportRef: seller_chart_top10_destination.value[0].paramsdata,
-        _reportStationType: topdestinationinType.value,
-        _city_name: seller_chart_top10_destination.value[0].paramscityname,
-        ...dashboardObj.Top10faultData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportRef = seller_chart_top10_destination.value[0].paramsdata
-          reportList._reportStationType = topdestinationinType.value
-          reportList._reportType = 'top'
-          reportList._city_name = seller_chart_top10_destination.value[0].paramscityname
-          handlereportlist(
-            dashboardObj.Top10faultData.transportation,
-            dashboardObj.Top10faultData.date_type,
-            ''
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'Top 10 Destination'
-          obj.name = seller_chart_top10_destination.value[0].paramsdata
-          obj.data = seller_chart_top10_destination.value[0].paramscityname
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportRef = seller_chart_top10_destination.value[0].paramsdata
+    reportList._reportStationType = topdestinationinType.value
+    reportList._reportType = 'top'
+    reportList._city_name = seller_chart_top10_destination.value[0].paramscityname
+    handlereportlist(
+      dashboardObj.Top10faultData.transportation,
+      dashboardObj.Top10faultData.date_type,
+      ''
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'Top 10 Destination'
+    obj.name = seller_chart_top10_destination.value[0].paramsdata
+    obj.data = seller_chart_top10_destination.value[0].paramscityname
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
   // CO2e Emission by Origin (Top 10)点击跳转
   else if (val == 'CO2e Emission by Origin (Top 10)') {
@@ -746,35 +677,24 @@ const ClickParams = (val: any) => {
       dashboardObj.OriginCo2Top10faultData.date_end,
       ''
     )
-    $api
-      .ClickCO2({
-        _reportRef: seller_chart_CO2_origin.value[0].paramsdata.name,
-        _reportDataType: seller_chart_CO2_origin.value[0].paramsdata.type,
-        _reportStationType: 'origin',
-        ...dashboardObj.OriginCo2Top10faultData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportRef = seller_chart_CO2_origin.value[0].paramsdata.name
-          reportList._reportDataType = seller_chart_CO2_origin.value[0].paramsdata.type
-          reportList._reportStationType = 'origin'
-          reportList._reportType = 'co2e'
-          handlereportlist(
-            dashboardObj.OriginCo2Top10faultData.transportation,
-            dashboardObj.OriginCo2Top10faultData.date_type,
-            ''
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'CO2e Emission by Origin (Top 10)'
-          obj.name = seller_chart_CO2_origin.value[0].paramsdata.name
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportRef = seller_chart_CO2_origin.value[0].paramsdata.name
+    reportList._reportDataType = seller_chart_CO2_origin.value[0].paramsdata.type
+    reportList._reportStationType = 'origin'
+    reportList._reportType = 'co2e'
+    handlereportlist(
+      dashboardObj.OriginCo2Top10faultData.transportation,
+      dashboardObj.OriginCo2Top10faultData.date_type,
+      ''
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'CO2e Emission by Origin (Top 10)'
+    obj.name = seller_chart_CO2_origin.value[0].paramsdata.name
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
   // CO2e Emission by Origin (Top 10)点击跳转
   else if (val == 'CO2e Emission by Destination (Top 10)') {
@@ -783,35 +703,24 @@ const ClickParams = (val: any) => {
       dashboardObj.DestinationCo2Top10faultData.date_end,
       ''
     )
-    $api
-      .ClickCO2({
-        _reportRef: seller_chart_CO2_destination.value[0].paramsdata.name,
-        _reportDataType: seller_chart_CO2_destination.value[0].paramsdata.type,
-        _reportStationType: 'agent',
-        ...dashboardObj.DestinationCo2Top10faultData
-      })
-      .then((res: any) => {
-        if (res.code == 200) {
-          reportList._reportRef = seller_chart_CO2_destination.value[0].paramsdata.name
-          reportList._reportDataType = seller_chart_CO2_destination.value[0].paramsdata.type
-          reportList._reportType = 'co2e'
-          reportList._reportStationType = 'agent'
-          handlereportlist(
-            dashboardObj.DestinationCo2Top10faultData.transportation,
-            dashboardObj.DestinationCo2Top10faultData.date_type,
-            ''
-          )
-          sessionStorage.setItem('clickParams', JSON.stringify(res.data))
-          sessionStorage.setItem('reportList', JSON.stringify(reportList))
-          let obj: any = {}
-          obj.title = 'CO2e Emission by Destination (Top 10)'
-          obj.name = seller_chart_CO2_destination.value[0].paramsdata.name
-          sessionStorage.setItem('tagsList', JSON.stringify(obj))
-          router.push({
-            path: '/tracking'
-          })
-        }
-      })
+    reportList._reportRef = seller_chart_CO2_destination.value[0].paramsdata.name
+    reportList._reportDataType = seller_chart_CO2_destination.value[0].paramsdata.type
+    reportList._reportType = 'co2e'
+    reportList._reportStationType = 'agent'
+    handlereportlist(
+      dashboardObj.DestinationCo2Top10faultData.transportation,
+      dashboardObj.DestinationCo2Top10faultData.date_type,
+      ''
+    )
+    sessionStorage.setItem('clickParams', 'clickParams')
+    sessionStorage.setItem('reportList', JSON.stringify(reportList))
+    let obj: any = {}
+    obj.title = 'CO2e Emission by Destination (Top 10)'
+    obj.name = seller_chart_CO2_destination.value[0].paramsdata.name
+    sessionStorage.setItem('tagsList', JSON.stringify(obj))
+    router.push({
+      path: '/tracking'
+    })
   }
 }
 </script>
@@ -1073,15 +982,13 @@ const ClickParams = (val: any) => {
           >
             <VBox_Dashboard @changeCancel="changeCancel(item.id)">
               <template #header>
-                <div class="Title_flex" style="justify-content: space-between">
-                  <div class="Title_flex">
-                    {{ item.title }}
-                    <DashFilters
-                      :defaultData="ContainerefaultData"
-                      @FilterSearch="GetContainerCountEcharts"
-                      :isContainer="true"
-                    ></DashFilters>
-                  </div>
+                <div class="Title_flex">
+                  {{ item.title }}
+                  <DashFilters
+                    :defaultData="ContainerefaultData"
+                    @FilterSearch="GetContainerCountEcharts"
+                    :isContainer="true"
+                  ></DashFilters>
                 </div>
               </template>
               <template #content>
@@ -1380,7 +1287,7 @@ const ClickParams = (val: any) => {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  width: 95%;
+  margin-right: 30px;
 }
 .iconfont_icon_tip {
   margin-left: 8px;

src/views/Dashboard/src/components/DashFiters.vue

@@ -206,7 +206,7 @@ const DateRangeSearch = () => {
         <div class="filter_filter" style="margin-left: 8px">
           <div v-if="props.isContainer">
             <el-date-picker
-              style="width: 120px"
+              style="width: 120px; height: 40px"
               v-model="startDate"
               format="MMM-YYYY"
               type="month"
@@ -216,7 +216,7 @@ const DateRangeSearch = () => {
               placement="bottom"
             />
             <el-date-picker
-              style="width: 120px; margin-left: 8px"
+              style="width: 120px; margin-left: 8px; height: 40px"
               v-model="EndDate"
               format="MMM-YYYY"
               type="month"
@@ -244,6 +244,10 @@ const DateRangeSearch = () => {
   </div>
 </template>
 <style lang="scss" scoped>
+.DashFilters {
+  display: flex;
+  align-items: center;
+}
 :deep(.el-checkbox-button__inner) {
   color: var(--tag-info-text-color);
   font-size: var(--font-size-3);
@@ -336,4 +340,9 @@ const DateRangeSearch = () => {
   font-size: 12px;
   color: var(--color-neutral-5);
 }
+:deep(.el-radio-button, .el-radio-button__inner) {
+  height: 40px;
+  display: flex;
+  align-items: center;
+}
 </style>

src/views/Tracking/src/TrackingView.vue

@@ -28,6 +28,50 @@ const tagsData: any = ref([])
 const handleClose = (tag: any) => {
   emitter.emit('clearTag', tag)
   tagsData.value.splice(tagsData.value.indexOf(tag), 1)
+  if (
+    sessionStorage.getItem('reportList') != null ||
+    sessionStorage.getItem('reportList') != '{}'
+  ) {
+    const reportlist = JSON.parse(sessionStorage.getItem('reportList') as string) || {}
+    let data = JSON.parse(sessionStorage.getItem('tagsList') as string) || {}
+    if (tag.includes('Transport')) {
+      delete reportlist.transport_mode
+    } else if (tag.includes('Day') || tag.includes('CO2e')) {
+      delete reportlist._reportRef
+      delete reportlist._reportType
+      delete reportlist._reportRefe_date
+      delete reportlist._reportRefb_date
+      delete reportlist._reportStationType
+      delete reportlist._reportDataType
+      delete reportlist._reportStationType
+      filterData.dashboardData = []
+      data = {}
+    } else if (tag.includes('ETD')) {
+      filterData.daterangeData.forEach((item: any, index: any) => {
+        if (item.includes('ETD')) {
+          filterData.daterangeData.splice(index, 1)
+        }
+      })
+      delete reportlist.etd_start
+      delete reportlist.etd_end
+    } else if (tag.includes('ETA')) {
+      filterData.daterangeData.forEach((item: any, index: any) => {
+        if (item.includes('ETA')) {
+          filterData.daterangeData.splice(index, 1)
+        }
+      })
+      delete reportlist.eta_start
+      delete reportlist.eta_end
+    } else if (tag.includes('Origin')) {
+      delete reportlist.shipper_city
+      delete reportlist._city_name
+      filterData.dashboardData = []
+    } else if (tag.includes('Destination')) {
+      delete reportlist.consignee_city
+    }
+    sessionStorage.setItem('reportList', JSON.stringify(reportlist))
+    sessionStorage.setItem('tagsList', JSON.stringify(data))
+  }
   if (tag.includes('Transport')) {
     delete searchTableQeuryTracking.transport_mode
   } else if (tag.includes('Day') || tag.includes('CO2e')) {
@@ -360,6 +404,17 @@ const clearfilters = () => {
   emitter.emit('clearTag', 'Voyage')
   searchTableQeuryTracking = {}
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
+  if (
+    sessionStorage.getItem('reportList') != null ||
+    sessionStorage.getItem('reportList') != '{}'
+  ) {
+    let reportlist = JSON.parse(sessionStorage.getItem('reportList') as string) || {}
+    let data = JSON.parse(sessionStorage.getItem('tagsList') as string) || {}
+    reportlist = {}
+    data = {}
+    sessionStorage.setItem('reportList', JSON.stringify(reportlist))
+    sessionStorage.setItem('tagsList', JSON.stringify(data))
+  }
   Gettrackingdata()
 }
 const renderTagsData = () => {
@@ -518,8 +573,10 @@ onMounted(() => {
       searchTableQeuryTracking[key] = reportlist[key]
     }
     if (reportlist._city_name == '' || reportlist._city_name == undefined) {
-      let str = `${data.title}:${data.name}`
-      filterData.dashboardData.push(str)
+      if (Object.keys(data).length != 0) {
+        let str = `${data.title}:${data.name}`
+        filterData.dashboardData.push(str)
+      }
     }
     sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
     Gettrackingdata()