Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/auto-imports.d.ts

@@ -3,7 +3,6 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
-// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -69,6 +68,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

src/components/FliterTags/src/FilterTags.vue

@@ -30,7 +30,7 @@ onMounted(() => {
       // })
       // TagsList.value[0].checked = true
       NewTagsList.value = ['All']
-      emits('changeTag', NewTagsList.value)
+      emits('changeTag', NewTagsList.value, false)
     }
   })
 })
@@ -74,7 +74,7 @@ const checkedBox = (i: any, name: any, checked: any) => {
   } else {
     NewTagsList.value = checkedCount
   }
-  emits('changeTag', NewTagsList.value)
+  emits('changeTag', NewTagsList.value, true)
 }
 </script>
 

src/views/Tracking/src/TrackingView.vue

@@ -408,6 +408,7 @@ const clearfilters = () => {
   emitter.emit('clearTag', 'Vessel')
   emitter.emit('clearTag', 'Voyage')
   searchTableQeuryTracking = {}
+  searchTableQeuryTracking.filterTag = ['All']
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
   if (
     sessionStorage.getItem('reportList') != null ||
@@ -615,14 +616,16 @@ onMounted(() => {
   }
   renderTagsData()
 })
-const changeTag = (val: any) => {
+const changeTag = (val: any, boolean: any) => {
   filterData.filtersTagData = []
   searchTableQeuryTracking.filterTag = val
   let str = 'Shipment status: ' + val
   filterData.filtersTagData.push(str)
   filterTag.value = val
   sessionStorage.setItem('searchTableQeuryTracking', JSON.stringify(searchTableQeuryTracking))
-  Gettrackingdata()
+  if (boolean) {
+    Gettrackingdata()
+  }
   renderTagsData()
 }
 // 点击search按钮