feat:merge dev

src/components/CustomizeColumns/src/CustomizeColumns.vue

@@ -380,7 +380,6 @@ defineExpose({
               <VueDraggable
                 v-model="groupItem.children"
                 class="column-list"
-                :sort="false"
                 ghost-class="ghost-column"
                 :forceFallback="true"
                 fallbackClass="fallback-class"

src/components/MoreFilters/src/components/SelectValue.vue

@@ -136,7 +136,7 @@ const clickSeeAll = () => {
         </div>
         <div v-else class="select_title_2">{{ Serval }}</div>
         <span class="iconfont_icon">
-          <svg class="iconfont" aria-hidden="true">
+          <svg class="iconfont icon_dark" aria-hidden="true">
             <use xlink:href="#icon-icon_dropdown_b"></use>
           </svg>
         </span>
@@ -198,14 +198,14 @@ const clickSeeAll = () => {
 .select {
   cursor: pointer;
   width: 368px;
-  height: 40px;
+  height: 32px;
   display: flex;
   align-items: center;
   justify-content: space-between;
   background-color: white;
-  border: 1px solid var(--color-border);
+  border: 1px solid var(--color-select-border);
   border-radius: var(--border-radius-6);
-  background-color: var(--tips-bg-color);
+  background-color: transparent;
 }
 .select:hover {
   border: 1px solid var(--color-theme);

src/styles/theme.scss

@@ -86,7 +86,10 @@
   --color-dialog-header-bg: #f6f8fa;
   --color-dialog-body-bg: #ffffff;
   --color-drawer-body-bg: #fff;
+
+  // 按钮
   // default
+  --color-btn-default-bg-hover: #fff1e6;
   --color-btn-default-bg-color: #fff;
   // dark
   --color-btn-default-dark-bg: #2b2f36;
@@ -360,4 +363,4 @@
   --vxe-ui-table-header-background-color: #30353c;
   --color-table-click-row-bg: #8b582f;
   --vxe-ui-input-border-color: #656f7d;
-}
+}

src/views/Booking/src/BookingView.vue

@@ -397,7 +397,7 @@ 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"

src/views/Dashboard/src/DashboardView.vue

@@ -1272,9 +1272,6 @@ const ClickParams = (val: any) => {
 .iconfont_tips {
   fill: var(--color-neutral-2);
 }
-.iconfont_tips {
-  fill: var(--color-neutral-2);
-}
 .tips_text {
   width: 278.43px;
   text-align: center;

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

@@ -101,7 +101,6 @@ let allMarkers = []
 
 // 添加标记后更新中心和缩放级别
 const addMarkersToMap = () => {
-  // debugger
   if (!map) return // 确保地图已经初始化
 
   markerPositions.value.forEach((position) => {
@@ -126,14 +125,14 @@ const addMarkersToMap = () => {
     allMarkers[`${position.lat},${position.lng}`] = marker
   })
 
-<<<<<<< HEAD
-  updateVisibleMarkers()
-
   if (viewData.value.length > 0) {
->>>>>>> dev
+    // 根据标记的位置设置中心点以及缩放级别
+    const bounds = L.latLngBounds(viewData.value)
+    map!.fitBounds(bounds, { paddingTopLeft: [20, 70], paddingBottomRight: [0, 0] })
     setTimeout(() => {
       if (isFirstRender) {
         initialCenter = map!.getCenter()
+        initialZoomLevel = map!.getZoom()
         isFirstRender = false
       }
       addResetZoomButton(initialCenter!, initialZoomLevel!)
@@ -154,8 +153,8 @@ const getMarker = () => {
       if (res.code === 200) {
         allMapData.value = res.data
         const { data } = res
-        data?.point &&
-          data?.point.forEach((item) => {
+        data &&
+          data.forEach((item) => {
             const iconColorList = {
               Destination: { color: '#24ca5a', icon: destinationIcon },
               Origin: { color: '#ED6D00', icon: originIcon },
@@ -174,17 +173,6 @@ const getMarker = () => {
           return [Number(item.lat), Number(item.lng)]
         }) // 请求成功后添加标记，并动态添加重置按钮
         addMarkersToMap()
-        if (data?.dottedLine) {
-          draw_marker(handleData(data.dottedLine), handleData(data.solidLine))
-          map.on('moveend', function () {
-            draw_marker(handleData(data.dottedLine), handleData(data.solidLine))
-            updateVisibleMarkers()
-          })
-          map.on('zoomend', function () {
-            draw_marker(handleData(data.dottedLine), handleData(data.solidLine))
-            updateVisibleMarkers()
-          })
-        }
       }
     })
 }
@@ -283,8 +271,11 @@ onUnmounted(() => {
       }
       &:first-child {
         span {
+          display: inline-block;
+          width: 24px;
           height: 28px;
           border-bottom: 1px solid #3f434a;
+        }
       }
     }
   }
@@ -304,51 +295,6 @@ onUnmounted(() => {
       }
     }
   }
-  .reset-zoom-control {
-    border: none;
-    background-color: #3c414a;
-  }
-  a.leaflet-bar-part {
-    background-color: #3c414a;
-    border-radius: 4px;
-    box-shadow: none;
-    overflow: hidden;
-    div {
-      border-color: var(--color-neutral-1) !important;
-      div {
-        background-color: var(--color-neutral-1) !important;
-      }
-    }
-  }
-}
-
-/* 示例：将所有地图图片的颜色反转 */
-.dark-mode img:not(.leaflet-marker-icon) {
-  filter: invert(1) hue-rotate(170deg);
-}
-// 防止暗黑模式下地图超出容器
-.tracking-map {
-  overflow: hidden;
-}
-// 修改暗黑模式下的背景色
-.leaflet-container.dark-mode,
-.leaflet-map-pane.dark-mode,
-.leaflet-tile-container.dark-mode {
-  background-color: #2b2f36;
-}
-// 处理版权信息在切换模式后样式错误bug
-.leaflet-right .leaflet-control-attribution {
-  background: rgba(255, 255, 255, 0.8);
-  margin: 0 4px 4px 0;
-  color: #2b2f36;
-  span {
-    font-size: 12px;
-    color: #2b2f36;
-  }
-  a {
-    color: #0078a8;
-    font-size: 12px;
-  }
 }
 
 /* 示例：将所有地图图片的颜色反转 */
@@ -457,4 +403,4 @@ onUnmounted(() => {
     }
   }
 }
-</style>
+</style>

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

@@ -74,3 +74,4 @@ const handleTabClick = (name: string) => {
     border-bottom: none;
   }
 }
+</style>