Merge branch 'dev_zyh' of United_Software/k_online_ui into dev

package.json

@@ -27,7 +27,6 @@
     "echarts": "^5.5.1",
     "element-plus": "^2.8.1",
     "exceljs": "^4.4.0",
-    "js-md5": "^0.8.3",
     "leaflet": "^1.9.4",
     "lodash": "^4.17.21",
     "mitt": "^3.0.1",

src/router/index.ts

@@ -100,7 +100,10 @@ router.beforeEach(async (to, from, next) => {
   if (to.path === '/login') {
     const userStore = useUserStore()
     await userStore.logout()
+    sessionStorage.removeItem('trackingTablePageInfo')
+    sessionStorage.removeItem('bookingTablePageInfo')
   }
+
   // 未登录白名单
   const whiteList = ['/login', '/public-tracking', '/public-tracking/detail', '/reset-password']
   // 判断是否登录

src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { transportationMode } from '@/components/TransportationMode'
 import { type VxeGridInstance, type VxeGridProps } from 'vxe-table'
 import DownloadDialog from './components/DownloadDialog.vue'
 import { autoWidth } from '@/utils/table'
 import { useRowClickStyle } from '@/hooks/rowClickStyle'
 import dayjs from 'dayjs'
-import { ref, watch, onMounted } from 'vue'
+import { ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
+import { transportationMode } from '@/components/TransportationMode'
 
 const router = useRouter()
 const props = defineProps({
@@ -92,7 +92,18 @@ const getTableColumns = async () => {
   })
 }
 
-const pageInfo = ref({ pageNo: 1, pageSize: 100, total: 0 })
+const pageInfo = ref({ pageNo: 1, pageSize: 50, total: 0 })
+// 从sessionStorage中获取页长以及当前页码
+const assignPageInfo = () => {
+  const oldPageInfo = sessionStorage.getItem('bookingTablePageInfo')
+  if (oldPageInfo) {
+    const data = JSON.parse(oldPageInfo)
+    pageInfo.value.pageNo = data.pageNo
+    pageInfo.value.pageSize = data.pageSize
+  }
+}
+assignPageInfo()
+
 const curTableData = ref([])
 const tempSearch = ref()
 const filterdataobj = ref()
@@ -114,6 +125,8 @@ const assignTableData = (data: any) => {
 }
 // 获取表格数据
 const getTableData = () => {
+  // 保存页长以及当前页码
+  sessionStorage.setItem('bookingTablePageInfo', JSON.stringify(pageInfo.value))
   tableLoadingTable.value = true
   $api
     .getBookingTableData({
@@ -477,7 +490,7 @@ defineExpose({
         <el-pagination
           v-model:current-page="pageInfo.pageNo"
           v-model:page-size="pageInfo.pageSize"
-          :page-sizes="[100, 200, 300, 400]"
+          :page-sizes="[50, 100, 200, 300, 400]"
           :pager-count="3"
           background
           layout="sizes, prev, pager, next"

src/views/Layout/src/components/Header/HeaderView.vue

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { Search } from '@element-plus/icons-vue'
 import DownloadKLNPortal from './components/DownloadKLNPortal.vue'
 import ChangePasswordDialog from './components/ChangePasswordDialog.vue'
 import LogoutDialog from './components/LogoutDialog.vue'
@@ -118,8 +117,11 @@ const handleLogin = () => {
         size="large"
         @keyup.enter="handleSearch"
         placeholder="Search a reference number to see shipment details"
-        :prefix-icon="Search"
-      />
+      >
+        <template #prefix>
+          <span style="margin-top: -1px" class="font_family icon-icon_search_b"></span>
+        </template>
+      </el-input>
       <!-- <span class="font_family icon-icon_notice_b" style="font-size: 18px"></span>
       <span class="font_family icon-icon_language_b" style="font-size: 16px"></span> -->
 

src/views/Layout/src/components/Menu/MenuView.vue

@@ -126,6 +126,8 @@ const changeRouter = (path: any) => {
     sessionStorage.removeItem('reportList')
     sessionStorage.removeItem('tagsList')
   }
+  sessionStorage.removeItem('trackingTablePageInfo')
+  sessionStorage.removeItem('bookingTablePageInfo')
   isVisible.value = false
   emits('changeVisible', isVisible.value)
   isVisible.value = false

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -4,7 +4,7 @@ import { autoWidth } from '@/utils/table'
 import { useRowClickStyle } from '@/hooks/rowClickStyle'
 import dayjs from 'dayjs'
 import { useRouter } from 'vue-router'
-import { ref, watch, onMounted } from 'vue'
+import { ref, onMounted } from 'vue'
 import { transportationMode } from '@/components/TransportationMode'
 
 const router = useRouter()
@@ -95,7 +95,17 @@ const getTableColumns = async () => {
   })
 }
 
-const pageInfo = ref({ pageNo: 1, pageSize: 100, total: 0 })
+const pageInfo = ref({ pageNo: 1, pageSize: 50, total: 0 })
+// 从sessionStorage中获取页长以及当前页码
+const assignPageInfo = () => {
+  const oldPageInfo = sessionStorage.getItem('trackingTablePageInfo')
+  if (oldPageInfo) {
+    const data = JSON.parse(oldPageInfo)
+    pageInfo.value.pageNo = data.pageNo
+    pageInfo.value.pageSize = data.pageSize
+  }
+}
+assignPageInfo()
 const TagsList = ref()
 const tempSearch = ref('')
 
@@ -146,8 +156,10 @@ const getSharedTableData = () => {
   return false
 }
 
-// 获取表格数据
+// 切换分页时重新获取表格数据
 const getTableData = async (isPageChange?: boolean) => {
+  // 保存页长以及当前页码
+  sessionStorage.setItem('trackingTablePageInfo', JSON.stringify(pageInfo.value))
   tableLoadingTable.value = true
   const rc = isPageChange ? pageInfo.value.total : -1
   if (
@@ -548,7 +560,7 @@ defineExpose({
         <el-pagination
           v-model:current-page="pageInfo.pageNo"
           v-model:page-size="pageInfo.pageSize"
-          :page-sizes="[100, 200, 300, 400]"
+          :page-sizes="[50, 100, 200, 300, 400]"
           :pagerCount="3"
           background
           layout="sizes, prev, pager, next"