Commit c5627a8e3641281204299dcdd4d81434e6c1a7ad

Authored by 莫红玲
2 parents 549a8094 f8f46545

Merge remote-tracking branch 'origin/bug_fix'

src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx
... ... @@ -59,6 +59,9 @@ function PlayBackPicker(props: any) {
59 59 const { _d: checkDate, _i: nowDate } = date;
60 60 const checkYear = moment(checkDate).format('YYYY-MM-DD');
61 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 65 // if (type === 'start') {
63 66 // const hour = moment(date).hour();
64 67 // const minute = moment(date).minute();
... ... @@ -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 144 }}
136 145 disabledDate={disabledDate}
137 146 disabledTime={disabledTracksTime}
  147 + // max={disabledTracksTime}
138 148 onCalendarChange={
139 149 (value: any) => {
140 150 setDateFlag(value);
... ...