gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复时间选择器第二次选择时时间变成1970年的问题

Browse Source
This commit is contained in:
chenjinsong
2022-10-12 22:58:16 +08:00
parent 5e10374398
commit d6cc6ce1f4
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/common/TimeRange/DateTimeRange.vue
View File

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