Merge branch 'master_zyh' into test_zyh

src/views/Booking/src/components/BookingDetail/src/components/BasicInformation.vue

@@ -436,7 +436,9 @@ defineExpose({
                   {{ allData.marksAndDescription[1].content }}
                 </div>
                 <template #reference>
-                  <el-button class="description-see-all el-button--text">See All</el-button>
+                  <el-button class="description-see-all el-button--text">
+                    <span>See All</span>
+                  </el-button>
                 </template>
               </el-popover>
             </div>
@@ -600,7 +602,12 @@ defineExpose({
       right: 0;
       padding-right: 90px;
       padding-left: 17px;
-      background: linear-gradient(to right, transparent, rgb(255, 255, 250) 17px, white 40px);
+      background: linear-gradient(
+        to right,
+        transparent,
+        var(--color-mode) 17px,
+        var(--color-mode) 40px
+      );
     }
   }
 }
@@ -642,7 +649,11 @@ defineExpose({
     .description-see-all {
       position: absolute;
       top: 40px;
-      right: 26px;
+      right: 32px;
+      span {
+        font-size: 12px;
+        color: var(--color-theme);
+      }
     }
   }
 

src/views/Tracking/src/TrackingView.vue

@@ -164,7 +164,7 @@ const TransportSearch = (val: any) => {
 // defaultTransport
 const defaultTransport = (val: any, value: any) => {
   filterData.transportData = []
-  if (val.data.length !=0) {
+  if (val.data.length != 0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }
@@ -188,6 +188,7 @@ const defaultDate = (val: any, value: any, data: any) => {
       filterData.daterangeData.push(str)
     }
   }
+
   if (sessionStorage.getItem('searchTableQeuryTracking') == null) {
     if (
       sessionStorage.getItem('clickParams') === null ||
@@ -201,13 +202,6 @@ const defaultDate = (val: any, value: any, data: any) => {
         searchTableQeuryTracking.etd_start = value[key].data[0]
         searchTableQeuryTracking.etd_end = value[key].data[1]
       }
-      const trackingData = JSON.parse(localStorage.getItem('searchData'))
-      if (trackingData) {
-        // 根据顶部搜索框的搜索结果赋值
-        initDataByHeaderSearch()
-      } else {
-        Gettrackingdata()
-      }
     }
     // else {
     //   for (const key in value) {
@@ -220,8 +214,17 @@ const defaultDate = (val: any, value: any, data: any) => {
     if (searchTableQeuryTracking._textSearch) {
       TrackingSearch.value = searchTableQeuryTracking._textSearch
     }
+  }
+
+  const rawData = localStorage.getItem('searchData')
+  const trackingData = rawData ? JSON.parse(rawData) : null
+  if (trackingData) {
+    // 根据顶部搜索框的搜索结果赋值
+    initDataByHeaderSearch()
+  } else {
     Gettrackingdata()
   }
+
   renderTagsData()
 }
 //DateRangeSearch

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

@@ -425,7 +425,9 @@ defineExpose({
                   {{ allData.marksAndDescription[1].content }}
                 </div>
                 <template #reference>
-                  <el-button class="description-see-all el-button--text">See All</el-button>
+                  <el-button class="description-see-all el-button--text">
+                    <span>See All</span>
+                  </el-button>
                 </template>
               </el-popover>
             </div>
@@ -589,7 +591,12 @@ defineExpose({
       right: 0;
       padding-right: 90px;
       padding-left: 17px;
-      background: linear-gradient(to right, transparent, rgb(255, 255, 250) 17px, white 40px);
+      background: linear-gradient(
+        to right,
+        transparent,
+        var(--color-mode) 17px,
+        var(--color-mode) 40px
+      );
     }
   }
 }
@@ -631,7 +638,11 @@ defineExpose({
     .description-see-all {
       position: absolute;
       top: 40px;
-      right: 26px;
+      right: 32px;
+      span {
+        font-size: 12px;
+        color: var(--color-theme);
+      }
     }
   }
 

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

@@ -58,10 +58,7 @@ const handleColumns = (columns: any) => {
     }
     return curColumn
   })
-  return [
-    { type: 'expand', width: 40, slots: { default: 'expand', content: 'expand_content' } },
-    ...newColumns
-  ]
+  return [{ type: 'expand', width: 40, slots: { content: 'expand_content' } }, ...newColumns]
 }
 watch(
   () => props.data,
@@ -75,7 +72,7 @@ watch(
         // tableRef.value && autoWidth(tableData.value, tableRef.value)
         tableRef.value?.reloadData(containers.container_data)
         if (
-          tableData.value.data?.length > 0 ||
+          tableData.value.data?.length > 0 &&
           tableData.value.data[0].containerStatusData.length > 0
         ) {
           tableRef.value?.toggleRowExpand(tableData.value.data[0])
@@ -172,9 +169,6 @@ useRowClickStyle(tableRef)
 }
 </style>
 <style lang="scss">
-.vxe-body--row-expanded-cell {
-  // height: 100%;
-}
 .container-table-status {
   max-height: 300px;
   padding: 40px 20px;
@@ -228,7 +222,7 @@ useRowClickStyle(tableRef)
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-        max-width: 320px;
+        max-width: 360px;
         padding: 10px 10px;
         .title {
           font-size: 14px;
@@ -240,11 +234,11 @@ useRowClickStyle(tableRef)
         }
       }
       .center-code {
-        width: 320px;
+        min-width: 320px;
         line-height: 57px;
       }
       .right-city {
-        width: 320px;
+        min-width: 320px;
         line-height: 57px;
       }
       .value-color {