Merge branch 'dev' into dev_g

src/views/Dashboard/src/components/RecentStatus.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'
-import { formatTimezoneByUTCorGMT } from '@/utils/tools'
+import { formatTimezoneByUTCorGMT, formatTimezone } from '@/utils/tools'
 
 const router = useRouter()
 interface RecentItem {
@@ -124,7 +124,7 @@ const SubscribeShipments = (val: any) => {
             </span>
             {{ item.startStation }}
           </div>
-          <div class="startStation_time">ETD: {{ item.ETD }}</div>
+          <div class="startStation_time">ETD: {{ formatTimezone(item.ETD) }}</div>
         </div>
         <div class="StationIcon">
           <div>
@@ -145,7 +145,7 @@ const SubscribeShipments = (val: any) => {
             </span>
             {{ item.endStation }}
           </div>
-          <div class="startStation_time">ETA: {{ item.ETA }}</div>
+          <div class="startStation_time">ETA: {{ formatTimezone(item.ETA) }}</div>
         </div>
       </div>
       <!-- 右 -->

src/views/Login/src/loginView.vue

@@ -243,7 +243,6 @@ const handleLoginAfterVerify = () => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        localStorage.setItem('user_type', res.data.user_info.user_type)
         if (isRememerPwd.value) {
           saveCredentials()
         } else {

src/views/SystemSettings/src/components/PersonalProfile.vue

@@ -204,7 +204,7 @@ const saveConfig = (model: string) => {
         </div>
       </div>
       <div class="date-format" v-if="segmented === 'dateTime'">
-        <div class="title">Date & Time</div>
+        <div class="title">Date Format</div>
         <div class="content">
           <el-radio-group v-model="dateFormat" label="string" @change="handleDateFormat">
             <el-row>