Merge branch 'dev' into dev_zyh

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/MoreFilters/src/MoreFilters.vue

@@ -352,7 +352,6 @@ const changeAutoSelectvessel = (val: any) => {
   changeAutoSelect(InputForm.value, val, 'InputForm', 'transportation', 'vessel')
 }
 const changeAutoSelectvoyage = (val: any) => {
-  console.log(val)
   // changeAutoSelect(InputForm.value, val, 'InputForm', 'transportation', 'voyage')
   MoreFiltersObj.voyage = val
   MoreFiltersObj2.voyage = val
@@ -452,7 +451,6 @@ const changeAutoSelectPlacesAddType = (index: any, val: any) => {
 }
 const isError = ref(false)
 const changeAutoSelectVal = (val: any, value: any, boolaen: any) => {
-  console.log(boolaen, value)
   if (boolaen || value == true) {
     isError.value = true
   } else {

src/components/SelectTableSelect/src/SelectTableSelect.vue

@@ -82,7 +82,7 @@ const changeAutoSelect = (val: any, value: any) => {
   }
   AutoSelectObj[val] = value.join()
   emit('changeAutoSelect', AutoSelectObj, errorBoolean.value)
-}
+} 
 const typeSelectFocus = (index: any, e: any) => {
   typeSelectIndex.value = index
 }

src/styles/Antdui.scss

@@ -1,31 +1,31 @@
-:where(.css-dev-only-do-not-override-19iuou).ant-picker-range {
+.ant-picker-range {
   height: 40px;
   border: 1px solid var(--color-border-1);
 }
-:where(.css-dev-only-do-not-override-19iuou).ant-picker:hover, :where(.css-dev-only-do-not-override-19iuou).ant-picker-focused {
+.ant-picker:hover, .ant-picker-focused {
   border-color: var(--color-theme);
   box-shadow: none;
 }
 .ant-picker-active-bar {
   display: none;
 }
-:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown-range {
-  z-index: 9999;
+.ant-picker-dropdown-range {
+  z-index: 9999 ;
 }
-:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-today .ant-picker-cell-inner::before {
+.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-today .ant-picker-cell-inner::before {
   border: none;
 }
-:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-selected .ant-picker-cell-inner, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start .ant-picker-cell-inner, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end .ant-picker-cell-inner {
+.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-selected .ant-picker-cell-inner, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start .ant-picker-cell-inner, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end .ant-picker-cell-inner {
   background-color: var(--color-theme);
   color: #FFFFFF;
 }
-:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range::before {
+.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range::before {
   background-color: var(--color-orange-6);
 }
-:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single)::before, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single)::before {
+.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single)::before, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single)::before {
   background-color: var(--color-orange-6);
 }
-:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range {
+.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range {
   color: var(--color-theme);
 }
 .ant-picker-cell:hover:not(.ant-picker-cell-in-view).ant-picker-cell-inner,
@@ -36,34 +36,34 @@
       background-color: var(--color-orange-6) !important;
       color: var(--color-theme);
   }
-  :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-date-panel .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-start .ant-picker-cell-inner::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-date-panel .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end .ant-picker-cell-inner::after {
+  .ant-picker-dropdown .ant-picker-date-panel .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-start .ant-picker-cell-inner::after, .ant-picker-dropdown .ant-picker-date-panel .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end .ant-picker-cell-inner::after {
     background-color: var(--color-orange-6);
   }
-  :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover::before, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start.ant-picker-cell-range-hover::before, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end.ant-picker-cell-range-hover::before, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single).ant-picker-cell-range-hover-start::before, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single).ant-picker-cell-range-hover-end::before, .ant-picker-panel>:not(.ant-picker-date-panel) :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-start::before, .ant-picker-panel>:not(.ant-picker-date-panel) :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end::before {
+  .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover::before, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start.ant-picker-cell-range-hover::before, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end.ant-picker-cell-range-hover::before, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single).ant-picker-cell-range-hover-start::before, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single).ant-picker-cell-range-hover-end::before, .ant-picker-panel>:not(.ant-picker-date-panel) .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-start::before, .ant-picker-panel>:not(.ant-picker-date-panel) .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end::before {
     background-color: var(--color-orange-6);
   }
-  :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:not(.ant-picker-cell-in-range):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end)::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end:not(.ant-picker-cell-in-range):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end)::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start.ant-picker-cell-range-start-single::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start.ant-picker-cell-range-start.ant-picker-cell-range-end.ant-picker-cell-range-end-near-hover::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end.ant-picker-cell-range-start.ant-picker-cell-range-end.ant-picker-cell-range-start-near-hover::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end.ant-picker-cell-range-end-single::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover:not(.ant-picker-cell-in-range)::after {
+  .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:not(.ant-picker-cell-in-range):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end)::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end:not(.ant-picker-cell-in-range):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end)::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start.ant-picker-cell-range-start-single::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start.ant-picker-cell-range-start.ant-picker-cell-range-end.ant-picker-cell-range-end-near-hover::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end.ant-picker-cell-range-start.ant-picker-cell-range-end.ant-picker-cell-range-start-near-hover::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end.ant-picker-cell-range-end-single::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover:not(.ant-picker-cell-in-range)::after {
     border-top: none;
     border-bottom: none;
   }
-  tr>:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover:first-child::after, tr>:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end:first-child::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-start.ant-picker-cell-range-hover-edge-start.ant-picker-cell-range-hover-edge-start-near-range::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-edge-start:not(.ant-picker-cell-range-hover-edge-start-near-range)::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start::after {
+  tr>.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover:first-child::after, tr>.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end:first-child::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-start.ant-picker-cell-range-hover-edge-start.ant-picker-cell-range-hover-edge-start-near-range::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-edge-start:not(.ant-picker-cell-range-hover-edge-start-near-range)::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start::after {
     border-inline-start: none;
   }
-  tr>:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover:last-child::after, tr>:where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-end.ant-picker-cell-range-hover-edge-end.ant-picker-cell-range-hover-edge-end-near-range::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-edge-end:not(.ant-picker-cell-range-hover-edge-end-near-range)::after, :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end::after {
+  tr>.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover:last-child::after, tr>.ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-end.ant-picker-cell-range-hover-edge-end.ant-picker-cell-range-hover-edge-end-near-range::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-edge-end:not(.ant-picker-cell-range-hover-edge-end-near-range)::after, .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-hover-end::after {
     border-inline-end: none;
   }
-  :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-header-view button:hover {
+  .ant-picker-dropdown .ant-picker-header-view button:hover {
     color: var(--color-theme);
   }
-  :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-panel-container .ant-picker-panels .ant-picker-panel {
+  .ant-picker-dropdown .ant-picker-panel-container .ant-picker-panels .ant-picker-panel {
     border-left: 1px solid var(--color-border);
   }
   .ant-picker-footer {
     border-top: 1px solid var(--color-border);
   }
-  :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-panel {
+  .ant-picker-dropdown .ant-picker-panel {
     border: none;
   }
-  :where(.css-dev-only-do-not-override-19iuou).ant-picker-dropdown .ant-picker-panel-container .ant-picker-presets ul li:hover {
+  .ant-picker-dropdown .ant-picker-panel-container .ant-picker-presets ul li:hover {
     background: var(--color-orange-6);
   }

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

@@ -85,8 +85,6 @@ const getTableColumns = async (isInit: boolean) => {
 }
 
 const pageInfo = ref({ pageNo: 1, pageSize: 100, total: 0 })
-const TransportListItem = ref()
-const TagsList = ref()
 
 // 获取表格数据
 let filterdataobj: any = {}
@@ -138,7 +136,10 @@ const searchTableData = (data: any) => {
         if (res.data.searchData.length == 1) {
           router.push({
             path: '/booking/detail',
-            query: { a: res.data.searchData.__serial_no, _schemas: res.data.searchData.__schemas }
+            query: {
+              a: res.data.searchData[0].__serial_no,
+              _schemas: res.data.searchData[0]._schemas
+            }
           })
         } else {
           bookingTable.value.data = res.data.searchData || []

src/views/Dashboard/src/DashboardView.vue

@@ -359,7 +359,6 @@ const ClickParams = (val: any) => {
   const reportList: any = {}
   // ETD to ETA(DAYS)点击跳转
   if (val == 'ETD to ETA (Days)') {
-    console.log(pie_chart_ETD.value)
     $api
       .ClickEtdToEta({
         _reportRef: pie_chart_ETD.value[0].paramsdata.name,
@@ -427,7 +426,6 @@ const ClickParams = (val: any) => {
   }
   // KPIDeparture点击跳转
   else if (val == 'KPI0') {
-    console.log(pie_chart_kpi_departure.value)
     $api
       .ClickKPIDeparture({
         _reportRef: pie_chart_kpi_departure.value[0].paramsdata.name
@@ -472,7 +470,6 @@ const ClickParams = (val: any) => {
   else if (val == 'Top 10 Origin') {
     let array: any = []
     array.push(seller_chart_top10_origin.value[0].paramsdata)
-    console.log(array)
     $api
       .ClickTop10({
         _reportRef: array,
@@ -498,7 +495,6 @@ const ClickParams = (val: any) => {
   else if (val == 'Top 10 Destination') {
     let array: any = []
     array.push(seller_chart_top10_destination.value[0].paramsdata)
-    console.log(array)
     $api
       .ClickTop10({
         _reportRef: array,

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

@@ -75,7 +75,6 @@ const GetTop10ODEcharts = () => {
   $api.GetTop10ODEcharts({}).then((res: any) => {
     if (res.code === 200) {
       MapDataList.value = res.data.toporiginMap
-      console.log(MapDataList.value)
     }
   })
 }

src/views/OperationLog/src/components/BookingTable/src/BookingTable.vue

@@ -91,7 +91,6 @@ const getTableData = async (isInit: boolean, isPageChange?: boolean) => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        console.log(res.data)
         bookingTable.value.data = res.data.searchData
         pageInfo.value.total = Number(res.data.rc)
       }
@@ -101,7 +100,6 @@ const getTableData = async (isInit: boolean, isPageChange?: boolean) => {
   })
 }
 const SearchOperationLog = (val: any) => {
-  console.log(val)
   searchdata = val
   tableLoading.value = true
   $api
@@ -113,7 +111,6 @@ const SearchOperationLog = (val: any) => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        console.log(res.data)
         bookingTable.value.data = res.data.searchData
         pageInfo.value.total = Number(res.data.rc)
         tableLoading.value = false

src/views/Tracking/src/TrackingView.vue

@@ -123,7 +123,6 @@ const DateRangeSearch = (val: any, value: any) => {
 }
 //MoreFiltersSearch
 const MoreFiltersSearch = (val: any, value: any) => {
-  console.log(value)
   filterData.morefiltersData = []
   for (const key in val) {
     let str = `${key}:${val[key]}`
@@ -257,7 +256,6 @@ const Gettrackingdata = () => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        console.log(res.data)
         TransportListItem.value = res.data.TransportList
         TagsList.value = res.data.tagsList
       }

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

@@ -234,7 +234,7 @@ const searchTableData = (data: any) => {
             path: '/tracking/detail',
             query: {
               a: res.data.searchData[0].__serial_no,
-              _schemas: res.data.searchData[0].__schemas
+              _schemas: res.data.searchData[0]._schemas
             }
           })
         } else {