Merge branch 'master_zyh' of United_Software/k_online_ui into master

src/components/FliterTags/src/FilterTags.vue

@@ -150,7 +150,7 @@ const checkedBox = (i: any, name: any, checked: any) => {
   background-color: var(--color-tag-cancelled-bg);
   color: var(--color-tag-cancelled);
 }
-.v-tag__departure {
+.v-tag__departed {
   font-weight: 400;
   background-color: var(--color-tag-departure-bg);
   color: var(--color-tag-departure);
@@ -179,4 +179,4 @@ const checkedBox = (i: any, name: any, checked: any) => {
   background-color: var(--color-tag-all-bg);
   color: var(--color-tag-all);
 }
-</style>
+</style>

src/components/VTag/src/VTag.vue

@@ -24,10 +24,10 @@ const mappingTable = new Map([
   ['Created', 'created'],
   ['Booked', 'booked'],
   ['Cargo Received', 'cargo-received'],
-  ['Departure', 'departure'],
+  // ['Departure', 'departure'],
   ['Arrived', 'arrived'],
   ['Completed', 'completed'],
-  ['Departed', 'Departed'],
+  ['Departed', 'departed'],
   ['Pending Approval', 'pending-approval']
 ])
 defineProps<internalProps>()
@@ -100,7 +100,7 @@ defineProps<internalProps>()
       background-color: var(--color-tag-cargo-received);
     }
   }
-  &.v-tag__departure {
+  &.v-tag__departed {
     background-color: var(--color-tag-departure-bg);
     color: var(--color-tag-departure);
     .dot {
@@ -121,13 +121,13 @@ defineProps<internalProps>()
       background-color: var(--color-tag-completed);
     }
   }
-  &.v-tag__Departed {
-    background-color: var(--color-tag-Departed-bg);
-    color: var(--color-tag-Departed);
-    .dot {
-      background-color: var(--color-tag-Departed);
-    }
-  }
+  // &.v-tag__Departed {
+  //   background-color: var(--color-tag-Departed-bg);
+  //   color: var(--color-tag-Departed);
+  //   .dot {
+  //     background-color: var(--color-tag-Departed);
+  //   }
+  // }
   &.v-tag__pending-approval {
     background-color: var(--color-tag-unfinished-approval-bg);
     color: var(--color-tag-unfinished-approval);

src/views/Dashboard/src/components/TopMap.vue

@@ -22,7 +22,7 @@ const init = () => {
   }
   map = L.map('map', { attributionControl: false }).setView([51.505, -0.09], 3)
 
-  L.tileLayer('https://map.kerryapex.com/osm_tiles/{z}/{x}/{y}.png', {
+  L.tileLayer('https://map.k-apex.kln.com/osm_tiles/{z}/{x}/{y}.png', {
     attribution:
       '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
   }).addTo(map)

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

@@ -60,7 +60,7 @@ const initMap = () => {
   map = L.map('tracking-map', { scrollWheelZoom: false }).setView([51.505, -0.09], 3)
 
   // 添加 TileLayer
-  L.tileLayer('https://map.kerryapex.com/osm_tiles/{z}/{x}/{y}.png', {
+  L.tileLayer('https://map.k-apex.kln.com/osm_tiles/{z}/{x}/{y}.png', {
     attribution:
       '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
   }).addTo(map)