Merge branch 'dev' into dev_zyh

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) {

src/views/Dashboard/src/components/RevenueChart.vue

@@ -293,7 +293,7 @@ const initOption = reactive({
         title: 'update',
         icon: 'image://' + updateIcon,
         onclick: function () {
-          let filename = 'Revenue Spent Details ' + barName.value[0] + '-' + barName.value[1]
+          let filename = 'Revenue Spent Details ' + barName.value[0] + '-' + barName.value[barName.value.length - 1]
           exportData({ filename: filename })
         }
       }

src/views/Login/src/components/ChangePasswordCard.vue

@@ -233,7 +233,7 @@ onUnmounted(() => {
       </div>
       <template #footer>
         <div class="license">
-          <span>Copyright © <span class="company">2024 KLN.</span> All rights reserved.</span>
+          <span>© KERRY LOGISTICS NETWORK LIMITED. ALL RIGHTS RESERVED.</span>
         </div>
       </template>
     </el-card>
@@ -257,7 +257,7 @@ onUnmounted(() => {
 }
 
 .login-card {
-  width: 400px;
+  width: 410px;
   border-radius: 12px;
   .title {
     display: flex;

src/views/Login/src/loginView.vue

@@ -393,7 +393,7 @@ const firstLoginTipsRef = ref()
       </div>
       <template #footer>
         <div class="license">
-          <span>Copyright © <span class="company">2024 KLN.</span> All rights reserved.</span>
+          <span>© KERRY LOGISTICS NETWORK LIMITED. ALL RIGHTS RESERVED.</span>
         </div>
       </template>
     </el-card>
@@ -448,7 +448,7 @@ const firstLoginTipsRef = ref()
       </div>
       <template #footer>
         <div class="license">
-          <span>Copyright © <span class="company">2024 KLN.</span> All rights reserved.</span>
+          <span>© KERRY LOGISTICS NETWORK LIMITED. ALL RIGHTS RESERVED.</span>
         </div>
       </template>
     </el-card>
@@ -486,7 +486,7 @@ const firstLoginTipsRef = ref()
 }
 
 .login-card {
-  width: 400px;
+  width: 410px;
 
   .card-title {
     display: flex;