feat: 合并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/ContainerStatus/src/ContainerStatus.vue

@@ -85,9 +85,8 @@ watch(
   position: relative;
   width: 100%;
   height: 100%;
-  overflow: auto;
   .container {
-    height: 394px;
+    height: 358px;
     padding-bottom: 8px;
     overflow: auto;
   }
@@ -95,7 +94,7 @@ watch(
     display: flex;
     flex-direction: column;
     align-items: center;
-    height: 394px;
+    height: 358px;
     padding-top: 140px;
 
     .empty-text {

src/utils/axios.ts

@@ -60,7 +60,7 @@ class HttpAxios {
         sessionStorage.clear()
         router.push('/login')
         const userStore = useUserStore()
-        userStore.logout(false)
+        userStore.logout()
         ElMessage.warning({
           message: 'Please log in to use this feature.',
           grouping: true

src/views/Booking/src/BookingView.vue

@@ -397,9 +397,10 @@ const SearchInput = () => {
     <div class="heaer_top">
       <div class="search">
         <el-input
-          placeholder="Enter Booking/HBL/PO/Container/Carrier Booking No. "
+          placeholder="Enter Booking/HBL/PO/Carrier Booking No. "
           v-model="BookingSearch"
           class="log_input"
+          @keyup.enter="SearchInput"
         >
           <template #prefix>
             <span class="iconfont_icon">

src/views/Tracking/src/TrackingView.vue

@@ -646,6 +646,7 @@ const SearchInput = () => {
           placeholder="Enter Booking/HBL/PO/Container/Carrier Booking No. "
           v-model="TrackingSearch"
           class="log_input"
+          @keyup.enter="SearchInput"
         >
           <template #prefix>
             <span class="iconfont_icon">

src/views/Tracking/src/components/TrackingDetail/src/TrackingDetail.vue

@@ -204,7 +204,7 @@ const { isOverflow: isDestinationOverflow } = useOverflow(destinationRef, allDat
       </div>
     </div>
     <div class="transport-map">
-      <MapView :serial_no="allData?.serial_no" :uncode="allData?.uncode"></MapView>
+      <MapView style="flex: 1" :serial_no="allData?.serial_no" :uncode="allData?.uncode"></MapView>
       <TransportStep class="transport-step" :data="allData"></TransportStep>
     </div>
     <div class="info-content">
@@ -425,15 +425,10 @@ const { isOverflow: isDestinationOverflow } = useOverflow(destinationRef, allDat
     }
   }
   .transport-map {
-    position: relative;
+    display: flex;
+    gap: 8px;
     margin-bottom: 8px;
-    .transport-step {
-      position: absolute;
-      top: 8px;
-      right: 16px;
-      z-index: 1000;
-      overflow: hidden;
-    }
+    padding: 0 24px;
   }
 }
 

src/views/Tracking/src/components/TrackingDetail/src/components/MapView.vue

@@ -2,7 +2,7 @@
   <div
     id="tracking-map"
     ref="mapContainer"
-    style="width: 100%; height: 520px"
+    style="width: 100%; height: 448px"
     class="tracking-map"
     :class="{ 'dark-mode': themeStore.theme === 'dark' }"
   ></div>
@@ -277,7 +277,6 @@ let visibleMarkers = new Set()
 
 // 添加标记后更新中心和缩放级别
 const addMarkersToMap = () => {
-  // debugger
   if (!map) return // 确保地图已经初始化
 
   markerPositions.value.forEach((position) => {
@@ -307,7 +306,7 @@ const addMarkersToMap = () => {
   if (viewData.value.length > 0) {
     // 根据标记的位置设置中心点以及缩放级别
     const bounds = L.latLngBounds(viewData.value)
-    map!.fitBounds(bounds, { paddingTopLeft: [20, 70], paddingBottomRight: [400, 0] })
+    map!.fitBounds(bounds, { paddingTopLeft: [20, 70], paddingBottomRight: [0, 0] })
     setTimeout(() => {
       if (isFirstRender) {
         initialCenter = map!.getCenter()
@@ -349,7 +348,6 @@ const addShipMarker = (x: number) => {
     // 获取线段的最后一个点和倒数第二个点
     const lastPoint = solidLine[solidLine.length - 1]
     const secondLastPoint = solidLine[solidLine.length - 2]
-    console.log(lastPoint, secondLastPoint, 'lastPoint, secondLastPoint')
     // 计算线段末端的角度（以弧度为单位）
     const angle =
       (Math.atan2(
@@ -486,7 +484,7 @@ const getMarker = () => {
             }
             markerPositions.value.push({
               lat: item.lat,
-              lng: (Number(item.lng) + 360) % 360,
+              lng: item.lng,
               city: item.infor,
               label: item.label,
               icon: iconColorList[item.label].icon,
@@ -495,7 +493,7 @@ const getMarker = () => {
           })
         viewData.value = (data?.rangePoint.length > 0 ? data?.rangePoint : data?.point)?.map(
           (item) => {
-            return [Number(item.lat), (Number(item.lon || item.lng) + 360) % 360]
+            return [Number(item.lat), item.lon || item.lng]
           }
         )
         // 请求成功后添加标记，并动态添加重置按钮
@@ -539,6 +537,7 @@ onUnmounted(() => {
 <style lang="scss">
 @import 'leaflet/dist/leaflet.css';
 .tracking-map {
+  border-radius: 12px;
   .leaflet-popup-content-wrapper {
     border-radius: 6px;
   }

src/views/Tracking/src/components/TrackingDetail/src/components/TransportStep.vue

@@ -114,11 +114,11 @@ const handleTabClick = (name: string) => {
 <style lang="scss" scoped>
 .transport-step {
   width: 400px;
-  height: 484px;
   background-color: var(--color-header-bg);
-  border-radius: 12px;
+  height: 448px;
+  border-radius: 3px;
   border: 1px solid var(--color-border);
-  box-shadow: -2px 2px 12px 0px var(--color-shipment-status-shadow);
+  // box-shadow: -2px 2px 12px 0px var(--color-shipment-status-shadow);
   .header {
     display: flex;
     height: 48px;