Merge branch 'dev' into dev_zyh

src/components/DateRange/src/DateRange.vue

@@ -46,6 +46,7 @@ const AddType = () => {
 const deleteType = (i: any) => {
   AddDateType.value.splice(i, 1)
   DateType.value = ''
+  clearDateCreation()
 }
 const props = defineProps({
   isShipment: Boolean
@@ -222,11 +223,13 @@ const clearrest = () => {
 const clearDateStart = () => {
   DateStart.value = []
   delete daterangeObj['ETD']
+  delete daterangeObj2['ETD']
 }
 // 清除EDA
 const clearDateEnd = () => {
   DateEnd.value = []
   delete daterangeObj['ETA']
+  delete daterangeObj2['ETA']
 }
 // 清除Creation Time
 const clearDateCreation = () => {
@@ -234,6 +237,7 @@ const clearDateCreation = () => {
   AddDateType.value = []
   DateType.value = ''
   delete daterangeObj['Creation Time']
+  delete daterangeObj2['Creation Time']
 }
 // 清除 daterangeObj
 const clearDaterangeObj = () => {

src/components/DateRange/src/components/CalendarDate.vue

@@ -73,7 +73,6 @@ const handlePanelChange = (value: any, mode: any) => {
     <a-range-picker
       separator="To"
       :showToday="false"
-      :allowClear="false"
       :style="{ width: props.CalendarWidth }"
       :open="open"
       :disabled="Disabled"

src/styles/Antdui.scss

@@ -69,4 +69,7 @@
   }
  .ant-picker-dropdown .ant-picker-date-panel .ant-picker-content th {
   color: var(--color-neutral-3);
+ }
+.ant-picker .ant-picker-clear {
+  inset-inline-end: 14px;
  }

src/views/Booking/src/BookingView.vue

@@ -403,7 +403,16 @@ const SearchInput = () => {
         @close="handleClose(tag)"
         color="#EFEFF0"
       >
-        {{ tag }}
+        <el-tooltip
+          class="box-item"
+          effect="dark"
+          :content="tag"
+          placement="top"
+          v-if="tag.length > 39"
+        >
+          {{ tag.length > 39 ? tag.substr(0, 39) + '...' : tag }}
+        </el-tooltip>
+        <div v-else>{{ tag }}</div>
       </el-tag>
       <div class="text_button" @click="clearfilters">Clear Filters</div>
     </div>

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

@@ -139,7 +139,6 @@ const searchTableData = (data: any) => {
         bookingTable.value.data = res.data.searchData || []
         pageInfo.value.total = Number(res.data.rc)
         tempSearch.value = res.data.tmp_search
-
         // 拥有所有字段的表格
         setTimeout(() => {
           allTable.value.columns = handleColumns(res.data.allColums, 'all')

src/views/Dashboard/src/DashboardView.vue

@@ -119,7 +119,8 @@ const DateChange = (value: any) => {
 const ETDobj = reactive({
   ETD_Title: '',
   ETDList: [],
-  ETD_Radius: []
+  ETD_Radius: [],
+  download_name: ''
 })
 const GetETDEcharts = () => {
   $api
@@ -132,6 +133,7 @@ const GetETDEcharts = () => {
         ETDobj.ETD_Title = `{a|${res.data.ETD_Title}}`
         ETDobj.ETDList = res.data.ETDList
         ETDobj.ETD_Radius = res.data.ETD_Radius
+        ETDobj.download_name = res.data.download_name
       }
     })
 }
@@ -139,7 +141,8 @@ const GetETDEcharts = () => {
 const KPIobj = reactive({
   ETD_Title: '',
   ETDList: [],
-  ETD_Radius: []
+  ETD_Radius: [],
+  download_name: ''
 })
 const GetKPIEcharts = () => {
   $api
@@ -151,6 +154,7 @@ const GetKPIEcharts = () => {
         KPIobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2})}`
         KPIobj.ETDList = res.data.ETDList
         KPIobj.ETD_Radius = res.data.ETD_Radius
+        KPIobj.download_name = res.data.download_name
       }
     })
 }
@@ -158,7 +162,8 @@ const GetKPIEcharts = () => {
 const Arrivalobj = reactive({
   ETD_Title: '',
   ETDList: [],
-  ETD_Radius: []
+  ETD_Radius: [],
+  download_name: ''
 })
 const GetKPIArrivalEcharts = () => {
   $api
@@ -170,6 +175,7 @@ const GetKPIArrivalEcharts = () => {
         Arrivalobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2})}`
         Arrivalobj.ETDList = res.data.ETDList
         Arrivalobj.ETD_Radius = res.data.ETD_Radius
+        Arrivalobj.download_name = res.data.download_name
       }
     })
 }
@@ -177,7 +183,8 @@ const GetKPIArrivalEcharts = () => {
 const Pendingobj = reactive({
   ETD_Title: '',
   ETDList: [],
-  ETD_Radius: []
+  ETD_Radius: [],
+  download_name: ''
 })
 const GetPendingEcharts = () => {
   $api
@@ -189,6 +196,7 @@ const GetPendingEcharts = () => {
         Pendingobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2})}`
         Pendingobj.ETDList = res.data.ETDList
         Pendingobj.ETD_Radius = res.data.ETD_Radius
+        Pendingobj.download_name = res.data.download_name
       }
     })
 }
@@ -196,7 +204,8 @@ const GetPendingEcharts = () => {
 const PendingArrivalobj = reactive({
   ETD_Title: '',
   ETDList: [],
-  ETD_Radius: []
+  ETD_Radius: [],
+  download_name: ''
 })
 const GetPendingArrivalEcharts = () => {
   $api
@@ -208,6 +217,7 @@ const GetPendingArrivalEcharts = () => {
         PendingArrivalobj.ETD_Title = `{a|${res.data.title1}}{b|${res.data.title2})}`
         PendingArrivalobj.ETDList = res.data.ETDList
         PendingArrivalobj.ETD_Radius = res.data.ETD_Radius
+        PendingArrivalobj.download_name = res.data.download_name
       }
     })
 }
@@ -217,7 +227,8 @@ const containerObj = reactive({
   barList: [],
   barSeries: [],
   Max: 0,
-  interval: 0
+  interval: 0,
+  download_name: ''
 })
 const containerType = ref([])
 const GetContainerCountEcharts = (val: any) => {
@@ -235,6 +246,7 @@ const GetContainerCountEcharts = (val: any) => {
         containerObj.barSeries = res.data.ContainerCounSeries
         containerObj.Max = res.data.Max
         containerObj.interval = res.data.interval
+        containerObj.download_name = res.data.download_name
         for (let i = 0; i < res.data.ContainerCounSeries.length; i++) {
           containerType.value.push(res.data.ContainerCounSeries[i].name)
         }
@@ -248,7 +260,8 @@ const EmissionObj = reactive({
   barList: [],
   barSeries: [],
   Max: 0,
-  interval: 0
+  interval: 0,
+  download_name: ''
 })
 const GetCo2EmissionEcharts = () => {
   $api.GetCo2EmissionEcharts({}).then((res: any) => {
@@ -258,6 +271,7 @@ const GetCo2EmissionEcharts = () => {
       EmissionObj.barSeries = res.data.ContainerCounSeries
       EmissionObj.Max = res.data.Max
       EmissionObj.interval = res.data.interval
+      EmissionObj.download_name = res.data.download_name
     }
   })
 }
@@ -267,7 +281,8 @@ const DestinationObj = reactive({
   barList: [],
   barSeries: [],
   Max: 0,
-  interval: 0
+  interval: 0,
+  download_name: ''
 })
 const GetCo2DestinationEcharts = () => {
   $api.GetCo2DestinationEcharts({}).then((res: any) => {
@@ -277,6 +292,7 @@ const GetCo2DestinationEcharts = () => {
       DestinationObj.barSeries = res.data.ContainerCounSeries
       DestinationObj.Max = res.data.Max
       DestinationObj.interval = res.data.interval
+      DestinationObj.download_name = res.data.download_name
     }
   })
 }

src/views/Dashboard/src/components/BarChart.vue

@@ -18,6 +18,7 @@ watch(
     initOption.legend.data = Name.value
     initOption.yAxis.max = Max.value
     initOption.yAxis.interval = interval.value
+    initOption.toolbox.feature.saveAsImage.name = downloadName.value
     initChart()
   },
   {
@@ -54,6 +55,10 @@ const Name = computed(() => {
     return []
   }
 })
+const downloadName = computed(() => {
+  return bar_data.value?.download_name
+})
+
 // 数额
 const initOption = reactive({
   //标题
@@ -179,7 +184,7 @@ const initOption = reactive({
     show: true, // 显示工具箱
     feature: {
       restore: { show: true },
-      saveAsImage: { show: true }
+      saveAsImage: { show: true, name: downloadName.value }
     },
     showTitle: false
   }

src/views/Dashboard/src/components/PieChart.vue

@@ -5,18 +5,19 @@ import { onMounted, ref, reactive, watch, computed } from 'vue'
 const props = defineProps({
   PieData: Object
 })
+const pie_data = ref(props.PieData)
 watch(
   () => props.PieData,
   (current) => {
     pie_data.value = current
     initOption.title.text = pie_title.value
+    initOption.toolbox.feature.saveAsImage.name = downloadName.value
     initChart()
   },
   {
     deep: true
   }
 )
-const pie_data = ref(props.PieData)
 const pie_ref = ref()
 
 // legend
@@ -37,6 +38,9 @@ const pie_radius = computed(() => {
 const pie_series = computed(() => {
   return pie_data.value?.ETDList
 })
+const downloadName = computed(() => {
+  return pie_data.value?.download_name
+})
 
 const initOption: any = reactive({
   //标题
@@ -94,7 +98,7 @@ const initOption: any = reactive({
     show: true, // 显示工具箱
     feature: {
       restore: { show: true },
-      saveAsImage: { show: true }
+      saveAsImage: { show: true, name: downloadName.value }
     },
     showTitle: false
   },

src/views/Layout/src/components/Menu/MenuView.vue

@@ -110,6 +110,12 @@ const isVisible = ref(false)
 const emits = defineEmits(['changeVisible'])
 // 路由跳转函数
 const changeRouter = (path: any) => {
+  if (sessionStorage.getItem('searchTableQeury') == '{}') {
+    sessionStorage.removeItem('searchTableQeury')
+  }
+  if (sessionStorage.getItem('searchTableQeuryTracking') == '{}') {
+    sessionStorage.removeItem('searchTableQeuryTracking')
+  }
   isVisible.value = false
   emits('changeVisible', isVisible.value)
   isVisible.value = false