Merge branch 'dev' into dev_zyh

src/components/MoreFilters/src/MoreFilters.vue

@@ -22,18 +22,10 @@ onMounted(() => {
         InputForm.value.palces.Origin.push(reportlist._city_name)
         MoreFiltersObj.Origin = reportlist._city_name
         MoreFiltersObj2.Origin = InputForm.value.palces.Origin
-        setTimeout(() => {
-          sessionStorage.removeItem('reportList')
-          sessionStorage.removeItem('tagsList')
-        }, 1000)
       } else {
         InputForm.value.palces.Destination.push(reportlist._city_name)
         MoreFiltersObj.Destination = reportlist._city_name
         MoreFiltersObj2.Destination = InputForm.value.palces.Origin
-        setTimeout(() => {
-          sessionStorage.removeItem('reportList')
-          sessionStorage.removeItem('tagsList')
-        }, 1000)
       }
     }
   }
@@ -201,7 +193,6 @@ const defaultMorefilters = () => {
       if (sessionStorage.getItem('searchTableQeuryTracking') != null) {
         MoreFiltersSearchQeuryTracking.value =
           JSON.parse(sessionStorage.getItem('searchTableQeuryTracking') as string) || {}
-        console.log(MoreFiltersSearchQeuryTracking.value)
         if (MoreFiltersSearchQeuryTracking.value.shipper) {
           defaultAll(
             InputForm.value.parties,
@@ -211,7 +202,6 @@ const defaultMorefilters = () => {
           )
           changeAll(InputForm.value.parties, count.value, PartiesBadge)
           count.value = []
-          console.log(PartiesBadge.value)
         }
         if (MoreFiltersSearchQeuryTracking.value.consignee) {
           defaultAll(
@@ -403,12 +393,10 @@ const defaultMorefilters = () => {
         JSON.parse(sessionStorage.getItem('searchTableQeury') as string) || {}
       // changeAll(InputForm.value.General, countG.value, GeneralBadge)
       // countG.value = []
-      console.log(MoreFiltersSearchQeury.value)
       if (MoreFiltersSearchQeury.value.shipper) {
         defaultAll(InputForm.value.parties, 'Shippername', 'shipper', MoreFiltersSearchQeury.value)
         changeAll(InputForm.value.parties, count.value, PartiesBadge)
         count.value = []
-        console.log(PartiesBadge.value)
       }
       if (MoreFiltersSearchQeury.value.consignee) {
         defaultAll(

src/views/Tracking/src/TrackingView.vue

@@ -446,63 +446,75 @@ onMounted(() => {
     sessionStorage.getItem('clickParams') != '{}'
   ) {
     if (sessionStorage.getItem('searchTableQeuryTracking') != null) {
-      sessionStorage.removeItem('searchTableQeuryTracking')
+      searchTableQeuryTracking = {}
     }
     const data = JSON.parse(sessionStorage.getItem('tagsList') as string) || {}
     const reportlist = JSON.parse(sessionStorage.getItem('reportList') as string) || {}
+    // const trasnport = JSON.parse(sessionStorage.getItem('clickParams') as string) || {}
+    // TransportListItem.value = trasnport.TransportList
+    // TagsList.value = trasnport.tagsList
     for (const key in reportlist) {
       searchTableQeuryTracking[key] = reportlist[key]
     }
-    if (reportlist._city_name == '') {
+    if (reportlist._city_name == '' || reportlist._city_name == undefined) {
       let str = `${data.title}:${data.name}`
       filterData.dashboardData.push(str)
-    } else {
-      if (reportlist._reportStationType == 'shippr_uncode' && data.title.includes('Origin')) {
-        let str = `Origin: ${data.data}`
-        filterData.morefiltersData.push(str)
-      } else if (
-        reportlist._reportStationType == 'consignee_uncode' &&
-        data.title.includes('Destination')
-      ) {
-        let str = `Destination: ${data.data}`
-        filterData.morefiltersData.push(str)
-      } else {
-        let str = `${data.title}:${data.name}`
-        filterData.dashboardData.push(str)
-      }
     }
+    // else {
+    //   if (reportlist._reportStationType == 'shippr_uncode' && data.title.includes('Origin')) {
+    //     let str = `Origin: ${data.data}`
+    //     filterData.morefiltersData.push(str)
+    //     console.log(2, filterData.morefiltersData)
+    //   } else if (
+    //     reportlist._reportStationType == 'consignee_uncode' &&
+    //     data.title.includes('Destination')
+    //   ) {
+    //     let str = `Destination: ${data.data}`
+    //     filterData.morefiltersData.push(str)
+    //   } else {
+    //     let str = `${data.title}:${data.name}`
+    //     filterData.dashboardData.push(str)
+    //   }
+    // }
     sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
-  } else {
-    if (sessionStorage.getItem('searchTableQeuryTracking') != null) {
-      const testTracking =
-        JSON.parse(sessionStorage.getItem('searchTableQeuryTracking') as string) || {}
-      if (testTracking._reportRef) {
-        const data = JSON.parse(sessionStorage.getItem('tagsList') as string) || {}
-        const reportlist = JSON.parse(sessionStorage.getItem('reportList') as string) || {}
-        for (const key in reportlist) {
-          searchTableQeuryTracking[key] = [key]
-        }
-        if (reportlist._city_name == '') {
-          let str = `${data.title}:${data.name}`
-          filterData.dashboardData.push(str)
-        } else {
-          if (reportlist._reportStationType == 'shippr_uncode' && data.title.includes('Origin')) {
-            let str = `Origin: ${data.data}`
-            filterData.morefiltersData.push(str)
-          } else if (
-            reportlist._reportStationType == 'consignee_uncode' &&
-            data.title.includes('Destination')
-          ) {
-            let str = `Destination: ${data.data}`
-            filterData.morefiltersData.push(str)
-          } else {
-            let str = `${data.title}:${data.name}`
-            filterData.dashboardData.push(str)
-          }
-        }
-      }
-    }
+    Gettrackingdata()
   }
+  // else {
+  //   if (sessionStorage.getItem('searchTableQeuryTracking') != null) {
+  //     const testTracking =
+  //       JSON.parse(sessionStorage.getItem('searchTableQeuryTracking') as string) || {}
+  //     if (testTracking._reportRef) {
+  //       const data = JSON.parse(sessionStorage.getItem('tagsList') as string) || {}
+  //       const reportlist = JSON.parse(sessionStorage.getItem('reportList') as string) || {}
+  //       console.log(searchTableQeuryTracking)
+  //       for (const key in reportlist) {
+  //         searchTableQeuryTracking[key] = reportlist[key]
+  //       }
+  //       if (reportlist._city_name == '') {
+  //         let str = `${data.title}:${data.name}`
+  //         filterData.dashboardData.push(str)
+  //         console.log(5, filterData.dashboardData)
+  //       } else {
+  //         if (reportlist._reportStationType == 'shippr_uncode' && data.title.includes('Origin')) {
+  //           let str = `Origin: ${data.data}`
+  //           filterData.morefiltersData.push(str)
+  //           console.log(6, filterData.dashboardData)
+  //         } else if (
+  //           reportlist._reportStationType == 'consignee_uncode' &&
+  //           data.title.includes('Destination')
+  //         ) {
+  //           let str = `Destination: ${data.data}`
+  //           filterData.morefiltersData.push(str)
+  //           console.log(7, filterData.dashboardData)
+  //         } else {
+  //           let str = `${data.title}:${data.name}`
+  //           filterData.dashboardData.push(str)
+  //           console.log(8, filterData.dashboardData)
+  //         }
+  //       }
+  //     }
+  //   }
+  // }
   renderTagsData()
 })
 const changeTag = (val: any) => {