Commit f8f46545a93d41accd2dffd1b938cf0bc05a8fee
1 parent
5f3c3ca8
轨迹回放时间选择bugfix
Showing
1 changed file
with
28 additions
and
18 deletions
src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx
@@ -59,6 +59,9 @@ function PlayBackPicker(props: any) { | @@ -59,6 +59,9 @@ function PlayBackPicker(props: any) { | ||
59 | const { _d: checkDate, _i: nowDate } = date; | 59 | const { _d: checkDate, _i: nowDate } = date; |
60 | const checkYear = moment(checkDate).format('YYYY-MM-DD'); | 60 | const checkYear = moment(checkDate).format('YYYY-MM-DD'); |
61 | const nowYear = moment(nowDate).format('YYYY-MM-DD'); | 61 | const nowYear = moment(nowDate).format('YYYY-MM-DD'); |
62 | + const checkHours = moment(checkDate).format('HH'); | ||
63 | + const nowHours = moment(nowDate).format('HH'); | ||
64 | + | ||
62 | // if (type === 'start') { | 65 | // if (type === 'start') { |
63 | // const hour = moment(date).hour(); | 66 | // const hour = moment(date).hour(); |
64 | // const minute = moment(date).minute(); | 67 | // const minute = moment(date).minute(); |
@@ -83,24 +86,30 @@ function PlayBackPicker(props: any) { | @@ -83,24 +86,30 @@ function PlayBackPicker(props: any) { | ||
83 | // }, | 86 | // }, |
84 | // }; | 87 | // }; |
85 | // } | 88 | // } |
86 | - if (checkYear === nowYear) { | ||
87 | - const nowHour = moment(nowDate).hour(); | ||
88 | - const nowMinute = moment(nowDate).minute(); | ||
89 | - const nowSecond = moment(nowDate).second(); | ||
90 | - return { | ||
91 | - disabledHours: () => { | ||
92 | - const disabledArr = timeArr(24).splice(nowHour, timeArr(24).length - nowHour); | ||
93 | - return disabledArr; | ||
94 | - }, | ||
95 | - disabledMinutes: () => { | ||
96 | - const disabledArr = timeArr(60).splice(nowMinute, timeArr(60).length - nowMinute); | ||
97 | - return disabledArr; | ||
98 | - }, | ||
99 | - disabledSeconds: () => { | ||
100 | - const disabledArr = timeArr(60).splice(nowSecond, timeArr(60).length - nowSecond); | ||
101 | - return disabledArr; | ||
102 | - }, | ||
103 | - }; | 89 | + |
90 | + const nowHour = moment(nowDate).hour(); | ||
91 | + const nowMinute = moment(nowDate).minute(); | ||
92 | + const nowSecond = moment(nowDate).second(); | ||
93 | + const resultLimit = { | ||
94 | + // type: 'end', | ||
95 | + disabledHours: () => { | ||
96 | + const disabledArr = timeArr(24).splice(nowHour + 1, timeArr(24).length - nowHour); | ||
97 | + return disabledArr; | ||
98 | + }, | ||
99 | + disabledMinutes: () => { | ||
100 | + const disabledArr = timeArr(60).splice(nowMinute, timeArr(60).length - nowMinute); | ||
101 | + return disabledArr; | ||
102 | + }, | ||
103 | + disabledSeconds: () => { | ||
104 | + const disabledArr = timeArr(60).splice(nowSecond, timeArr(60).length - nowSecond); | ||
105 | + return disabledArr; | ||
106 | + }, | ||
107 | + }; | ||
108 | + if (checkYear === nowYear && checkHours !== nowHours) { | ||
109 | + return { disabledHours: resultLimit.disabledHours }; | ||
110 | + } | ||
111 | + if (checkYear === nowYear && checkHours === nowHours) { | ||
112 | + return resultLimit; | ||
104 | } | 113 | } |
105 | }; | 114 | }; |
106 | /** | 115 | /** |
@@ -135,6 +144,7 @@ function PlayBackPicker(props: any) { | @@ -135,6 +144,7 @@ function PlayBackPicker(props: any) { | ||
135 | }} | 144 | }} |
136 | disabledDate={disabledDate} | 145 | disabledDate={disabledDate} |
137 | disabledTime={disabledTracksTime} | 146 | disabledTime={disabledTracksTime} |
147 | + // max={disabledTracksTime} | ||
138 | onCalendarChange={ | 148 | onCalendarChange={ |
139 | (value: any) => { | 149 | (value: any) => { |
140 | setDateFlag(value); | 150 | setDateFlag(value); |