周立森 5 years ago
parent
commit
50a4e42a54

+ 1
- 1
src/pages/activity/drainage/Detail.jsx View File

156
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
156
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
157
         <Form.Item>
157
         <Form.Item>
158
         {getFieldDecorator('time')(
158
         {getFieldDecorator('time')(
159
-            <RangePicker showTime format="YYYY-MM-DD" 
159
+            <RangePicker showTime format="YYYY-MM-DD HH:mm:ss" 
160
             showTime
160
             showTime
161
             onChange={onChangetime}
161
             onChange={onChangetime}
162
             />,
162
             />,

+ 1
- 1
src/pages/activity/groupActivity/list.jsx View File

282
       <AuthButton name="admin.taShareActivity.post" noRight={null}>
282
       <AuthButton name="admin.taShareActivity.post" noRight={null}>
283
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
283
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
284
       </AuthButton>
284
       </AuthButton>
285
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
285
+      <Table style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
286
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
286
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
287
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
287
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
288
       </div>
288
       </div>

+ 1
- 1
src/pages/building/list/index.jsx View File

324
       </Row>
324
       </Row>
325
       {/* 分页 */}
325
       {/* 分页 */}
326
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
326
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
327
-        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} current={dataSource.current}/>
327
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} />
328
       </div>
328
       </div>
329
     </>
329
     </>
330
   );
330
   );