Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/views/Tracking/src/TrackingView.vue

@@ -156,6 +156,13 @@ const defaultDate = (val: any, value: any, data: any) => {
         searchTableQeuryTracking.etd_start = value[key].data[0]
         searchTableQeuryTracking.etd_end = value[key].data[1]
       }
+      const trackingData = JSON.parse(localStorage.getItem('searchData'))
+      if (trackingData) {
+        // 根据顶部搜索框的搜索结果赋值
+        initDataByHeaderSearch()
+      } else {
+        Gettrackingdata()
+      }
     }
     // else {
     //   for (const key in value) {
@@ -168,12 +175,6 @@ const defaultDate = (val: any, value: any, data: any) => {
     if (searchTableQeuryTracking._textSearch) {
       TrackingSearch.value = searchTableQeuryTracking._textSearch
     }
-  }
-  const trackingData = JSON.parse(localStorage.getItem('searchData'))
-  if (trackingData) {
-    // 根据顶部搜索框的搜索结果赋值
-    initDataByHeaderSearch()
-  } else {
     Gettrackingdata()
   }
   renderTagsData()