Merge branch 'release_zyh' of United_Software/k_online_ui into dev

src/views/Dashboard/src/components/DashFiters.vue

@@ -83,10 +83,10 @@ const getdefaultdata = () => {
       dashboardObj.date_end = defaultfiltersData.value?.date_end
       dashboardObj.date_end_two = defaultfiltersData.value?.date_end_two
     } else {
-      dashboardObj.date_start = formatTimezone(DashDate.value[0])
-      dashboardObj.date_start_two = formatTimezone(DashDate.value[0])
-      dashboardObj.date_end = formatTimezone(DashDate.value[1])
-      dashboardObj.date_end_two = formatTimezone(DashDate.value[1])
+      dashboardObj.date_start = dayjs(DashDate.value[0]).format('MM/DD/YYYY')
+      dashboardObj.date_start_two = dayjs(DashDate.value[0]).format('YYYY-MM-DD')
+      dashboardObj.date_end = dayjs(DashDate.value[1]).format('MM/DD/YYYY')
+      dashboardObj.date_end_two = dayjs(DashDate.value[1]).format('YYYY-MM-DD')
     }
   }
   dashboardObj.transportation = checkboxGroup1.value
@@ -113,9 +113,9 @@ const changeCheckboxGroup2 = (val: any) => {
 const emit = defineEmits(['FilterSearch'])
 const DateChange = (value: any) => {
   dashboardObj.date_start = value[0]
-  dashboardObj.date_start_two = formatTimezone(value[0])
+  dashboardObj.date_start_two = dayjs(value[0]).format('YYYY-MM-DD')
   dashboardObj.date_end = value[1]
-  dashboardObj.date_end_two = formatTimezone(value[1])
+  dashboardObj.date_end_two = dayjs(value[1]).format('YYYY-MM-DD')
 }
 const StartChange = (val: any) => {
   if (!props.isETDToETA) {