Browse Source

feat: 修改系统中十二小时制为二十四小时制

zhouyuhao 6 tháng trước cách đây
mục cha
commit
3daf625712

+ 2 - 2
src/components/NotificationMessageCard/src/components/EventCard.vue

@@ -158,7 +158,7 @@ const jumpTracking = (data: EventCardPropsData) => {
         <span v-else class="font_family icon-icon_time_b"></span>
         <span style="margin-right: 2px" v-if="data.info.timeLabel">{{ data.info.timeLabel }}:</span>
         <span style="margin-right: 3px">{{
-          dayjs(data.info.time).format('MMM DD, YYYY hh:mm')
+          dayjs(data.info.time).format('MMM DD, YYYY HH:mm')
         }}</span>
         <span>{{ getTimezone(data.info.timezone, data.info.time) }}</span>
       </div>
@@ -169,7 +169,7 @@ const jumpTracking = (data: EventCardPropsData) => {
       <div class="time" :class="{ grey: data.type === 'delay' || data.type === 'change' }">
         <span class="font_family icon-icon_time_b"></span>
         <span style="margin-right: 3px" v-if="data.timeLabel">{{ data.timeLabel }}:</span>
-        <span style="margin-right: 3px">{{ dayjs(data.time).format('MMM DD, YYYY hh:mm') }}</span>
+        <span style="margin-right: 3px">{{ dayjs(data.time).format('MMM DD, YYYY HH:mm') }}</span>
         <span>{{ getTimezone(data.timezone, data.time) }}</span>
       </div>
       <div class="previous" v-if="data.previous">

+ 1 - 1
src/utils/tools.ts

@@ -47,7 +47,7 @@ export const getTimezone = (timezone: string, time?: string): string => {
 export const formatTimezoneByUTCorGMT = (time: string, timezone: string) => {
   if (!time) return '--'
   let formattedTime = ''
-  formattedTime = moment(time).format(`${formatString.value} hh:mm`)
+  formattedTime = moment(time).format(`${formatString.value} HH:mm`)
   let gmtOffset = ''
   if (timezone != null) {
     const timeZoneOffset = moment.tz(time, timezone).format('Z')

+ 1 - 1
src/views/Tracking/src/components/TrackingTable/src/components/VGMView.vue

@@ -536,7 +536,7 @@ const handleDefaultSetting = (data: any) => {
                 style="width: 190px"
                 placeholder="Pick a Date"
                 :format="datePickerFormat"
-                value-format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 :date-format="userStore.dateFormat"
                 time-format="HH:mm:ss"
               />