zhoulisen před 5 roky
rodič
revize
74e8bfb282

+ 7
- 18
src/pages/resource/openScreen/edit.jsx Zobrazit soubor

@@ -251,26 +251,13 @@ const header = props => {
251 251
 
252 252
     function disabledDateTime() {
253 253
         return {
254
-            disabledHours: () => range(0, 24).splice(4, 20),
255
-            disabledMinutes: () => range(30, 60),
256
-            disabledSeconds: () => [55, 56],
254
+            disabledHours: () => range(0, moment().hour()),
255
+            disabledMinutes: () => range(0, moment().minute()+1),
256
+            disabledSeconds: () => [],
257 257
         };
258 258
     }
259
+// range(moment().second(), moment().second())
259 260
 
260
-    function disabledRangeTime(_, type) {
261
-        if (type === 'start') {
262
-            return {
263
-                disabledHours: () => range(0, 60).splice(4, 20),
264
-                disabledMinutes: () => range(30, 60),
265
-                disabledSeconds: () => [55, 56],
266
-            };
267
-        }
268
-        return {
269
-            disabledHours: () => range(0, 60).splice(20, 4),
270
-            disabledMinutes: () => range(0, 31),
271
-            disabledSeconds: () => [55, 56],
272
-        };
273
-    }
274 261
 
275 262
     const fields = [
276 263
         {
@@ -356,7 +343,9 @@ const header = props => {
356 343
                 // </div>, 
357 344
                 // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,
358 345
                 <DatePicker
359
-                // disabledDate={disabledDate}format: 'HH:mm:ss'
346
+                showToday = {false}
347
+                disabledDate={disabledDate}
348
+                disabledTime = { disabledDateTime }
360 349
                 showTime={{ defaultValue: moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') }}
361 350
                     // showTime={{ data.invalidTime, 'HH:mm:ss' }}
362 351
                 />,

+ 1
- 1
src/pages/resource/openScreen/index.jsx Zobrazit soubor

@@ -92,7 +92,7 @@ function header(props) {
92 92
             dataIndex: 'noticeImg',
93 93
             key: 'noticeImg',
94 94
             align: 'center',
95
-            render: (text, record) => <img src={record.noticeImg} className={styles.touxiang} />,
95
+            render: (text, record) => <img style={{width:'140px',height:'92px'}} src={record.noticeImg} className={styles.touxiang} />,
96 96
         },
97 97
         {
98 98
             title: '关联业务类型',