|
|
@@ -6,6 +6,7 @@ import dayjs from 'dayjs'
|
|
|
import { useRouter } from 'vue-router'
|
|
|
import { ref, onMounted } from 'vue'
|
|
|
import { transportationMode } from '@/components/TransportationMode'
|
|
|
+import { useLoadingState } from '@/stores/modules/loadingState'
|
|
|
|
|
|
const router = useRouter()
|
|
|
const props = defineProps({
|
|
|
@@ -145,6 +146,7 @@ const getSharedTableData = () => {
|
|
|
const trackingData = JSON.parse(localStorage.getItem('searchData'))?.trackingData
|
|
|
if (trackingData) {
|
|
|
pageInfo.value.pageSize = Number(trackingData.ps)
|
|
|
+ sessionStorage.setItem('trackingTablePageInfo', JSON.stringify(pageInfo.value))
|
|
|
assignTableData(trackingData)
|
|
|
selectedNumber.value = 0
|
|
|
selectedTableData.value = []
|
|
|
@@ -472,6 +474,9 @@ const handleVGM = (row) => {
|
|
|
query: { a: row.__serial_no, _schemas: row._schemas }
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
+const loadingState = useLoadingState()
|
|
|
+
|
|
|
defineExpose({
|
|
|
searchTableData,
|
|
|
getSharedTableData,
|
|
|
@@ -503,7 +508,7 @@ defineExpose({
|
|
|
|
|
|
<vxe-grid
|
|
|
ref="tableRef"
|
|
|
- v-vloading="tableLoadingColumn || tableLoadingTable"
|
|
|
+ v-vloading="tableLoadingColumn || tableLoadingTable || loadingState.trackingTableLoading"
|
|
|
:height="props.height"
|
|
|
:style="{ border: 'none' }"
|
|
|
v-bind="trackingTable"
|