Commit c276bf94 by fukai

Merge branch 'blcMergeFromBohai' of http://114.115.138.98:8900/fukai/swifteditor…

Merge branch 'blcMergeFromBohai' of http://114.115.138.98:8900/fukai/swifteditor into blcMergeFromBohai
parents c76ebbf9 d8596d5e
...@@ -13,6 +13,7 @@ import SWFPage from "../swift/SWFPage2" ...@@ -13,6 +13,7 @@ import SWFPage from "../swift/SWFPage2"
import LeadPage from "../swift/LeadPage" import LeadPage from "../swift/LeadPage"
import Preview from "../swift/Preview" import Preview from "../swift/Preview"
import Result from "../swift/Result" import Result from "../swift/Result"
import Entry from "../swift/Entry"
function validate() { function validate() {
// 在路由群载入时做 filter 处理 // 在路由群载入时做 filter 处理
...@@ -24,8 +25,10 @@ const Routes = ({ history }) => ...@@ -24,8 +25,10 @@ const Routes = ({ history }) =>
<Route path="/" onEnter={validate}> <Route path="/" onEnter={validate}>
<IndexRedirect to="home" /> <IndexRedirect to="home" />
<Route component={App}> <Route component={App}>
<Route path="home" component={LeadPage}/> <Route path="entry" component={Entry}/>
<Route path="entry/:mctid" component={Entry}/>
<Route path="home" component={LeadPage}/>
<Route path="home/:mctid" component={LeadPage}/> <Route path="home/:mctid" component={LeadPage}/>
<Route path="lead/:mctid" component={LeadPage}/> <Route path="lead/:mctid" component={LeadPage}/>
......
import React, { Component } from 'react'
import { Button } from 'antd'
export class Entry extends Component
{
constructor(props) {
super(props)
}
render()
{
return (
<div style={{ display: 'flex', marginTop: '100px', justifyContent: 'center', alignItems: 'center' }}>
<Button type="primary" ghost>
<a onClick={ () => {
this.props.history.push(`home/${this.props.params.mctid ? this.props.params.mctid : ''}`)
} }
>MT报文</a>
</Button>
<Button type="primary" ghost style={{ marginLeft: '20px' }}>
{/* <a href="http://192.168.0.110:10003/swiftiso-editor/index.html#/">MX报文</a> */}
<a href="/swiftiso-editor/index.html">MX报文</a>
</Button>
</div>
)
}
}
export default Entry
import React,{Component} from 'react' import React,{Component} from 'react'
import {bindActionCreators} from 'redux'; import {bindActionCreators} from 'redux';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import {Table,Steps,Row,Col,Input} from 'antd' import {Table,Steps,Row,Col,Input,Affix,Button} from 'antd'
import { updateTreeValue,updateRcvBic,initSwiftMessageTree ,updateSwiftMessage} from '../store/modules/swift/swift_action'; import { updateTreeValue,updateRcvBic,initSwiftMessageTree ,updateSwiftMessage} from '../store/modules/swift/swift_action';
...@@ -171,7 +171,18 @@ export class LeadPage extends Component ...@@ -171,7 +171,18 @@ export class LeadPage extends Component
<Col span={18}> <Col span={18}>
<Table columns={this.columns} dataSource={this.state.fil?mty.filter(item=>item.mty.indexOf('mt'+this.state.fil)==0):mty} /> <Table columns={this.columns} dataSource={this.state.fil?mty.filter(item=>item.mty.indexOf('mt'+this.state.fil)==0):mty} />
</Col> </Col>
<Col span={3}/> <Col span={3}>
<Affix offsetTop={100}>
<div style={{textAlign:'right'}}>
<Button type="primary" title="Return" style={{marginRight:'1em',width:'8em'}} >
<a onClick={ () => {
this.props.history.push(`entry/${this.props.params.mctid ? this.props.params.mctid : ''}`)
} }
>Go Back</a>
</Button>
</div>
</Affix>
</Col>
</Row> </Row>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment