From d6cc6ce1f427dea0191071753e7d473d79db036d Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 12 Oct 2022 22:58:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E7=AC=AC=E4=BA=8C=E6=AC=A1=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=97=B6=E6=97=B6=E9=97=B4=E5=8F=98=E6=88=901970?=
 =?UTF-8?q?=E5=B9=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/TimeRange/DateTimeRange.vue           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue
index afefa6de..b0b70ca8 100644
--- a/src/components/common/TimeRange/DateTimeRange.vue
+++ b/src/components/common/TimeRange/DateTimeRange.vue
@@ -3,9 +3,9 @@
     <div @click="showDropdown" class="date-range-text">
       <div class="calendar-popover-text"><i class="cn-icon cn-icon-Data"></i></div>
       <div class="calendar-popover-text" style="display: flex" v-if="isCustom">
-        <div class="calendar-popover-text">{{ dateFormatByAppearance(startTime) }}</div>
+        <div class="calendar-popover-text">{{ dateFormatByAppearance(getMillisecond(startTime)) }}</div>
         <div class="calendar-popover-text"> -</div>
-        <div class="calendar-popover-text">{{ dateFormatByAppearance(endTime) }}</div>
+        <div class="calendar-popover-text">{{ dateFormatByAppearance(getMillisecond(endTime)) }}</div>
       </div>
       <div class="calendar-popover-text" v-else>
         {{ showDetail }}
@@ -33,11 +33,11 @@
             />
             <div class="content-title">From</div>
             <div @click="myDatePickerShow" tabindex="1" class="content-input">
-              {{ dateFormatByAppearance(myStartTime) }}
+              {{ dateFormatByAppearance(getMillisecond(myStartTime)) }}
             </div>
             <div class="content-title">To</div>
             <div @click="myDatePickerShow" tabindex="2" class="content-input">
-              {{ dateFormatByAppearance(myEndTime) }}
+              {{ dateFormatByAppearance(getMillisecond(myEndTime)) }}
             </div>
             <div>
               <el-button @click="timeRange" type="primary" size="mini">Apply time range</el-button>
@@ -81,6 +81,7 @@
 import { ref, computed } from 'vue'
 import MyDatePicker from '../MyDatePicker'
 import { storageKey } from '@/utils/constants'
+import { getMillisecond } from '@/utils/date-util'
 
 export default {
   name: 'DateTimeRange',
@@ -193,7 +194,7 @@ export default {
       if (dropdownFlag.value) {
         myStartTime.value = props.startTime
         myEndTime.value = props.endTime
-        timeArr.value = [myStartTime.value, myEndTime.value]
+        timeArr.value = [getMillisecond(myStartTime.value), getMillisecond(myEndTime.value)]
       }
     }
     const changeDropdown = () => {
@@ -209,8 +210,8 @@ export default {
       myDatePicker.value.pickerVisible = true
     }
     const timeArrChange = (val) => {
-      myStartTime.value = val[0]
-      myEndTime.value = val[1]
+      myStartTime.value = getMillisecond(val[0])
+      myEndTime.value = getMillisecond(val[1])
     }
     const timeRange = () => {
       isCustom.value = true
@@ -243,6 +244,7 @@ export default {
     return {
       myStartTime,
       myEndTime,
+      getMillisecond,
       dropdownFlag,
       utcStr,
       address,