This commit is contained in:
timorls 2022-03-04 17:21:41 +08:00
parent 224912ef76
commit 955d94d6a5
4 changed files with 36 additions and 17 deletions

View File

@ -15,8 +15,6 @@
font-size: 14px;
}
.paragraph_name{
display: block;
margin: 20px 0;
font-size: 14px;
}
/* p>.ant-tag{
margin: 20px 0;
} */

View File

@ -1,6 +1,6 @@
import React, { Component } from 'react';
import api from "@/api/request"
import { Input, Button, Row, Col, Tree,BackTop } from 'antd'
import { Input, Button, Row, Col, Tree,BackTop,Tag } from 'antd'
import "@/assets/style/editReport.css"
class EditReport extends Component {
@ -142,25 +142,25 @@ class EditReport extends Component {
treeData={this.state.tree}
onSelect={this.onSelect}
/></Col>
<Col span={21}><Button onClick={this.onFinish} type='primary' style={{float:'right'}}>输出</Button>
<Col span={21}><Button onClick={this.onFinish} type='primary' style={{position:'absolute',right:0}}>输出</Button>
{this.state.data.map((item, i) => {
return <React.Fragment><span className="paragraph_name" id={i.toString()} >
return <React.Fragment><p><Tag color="#3b5999" id={i.toString()} >
{item["章节"]}
</span>
</Tag></p>
{item["章节内容"].map((item_child, j) => {
return <React.Fragment><span className="paragraph_name" id={i.toString() + j.toString()}>{item_child["小节"]}</span>
return <React.Fragment><p><Tag color="#55acee" id={i.toString() + j.toString()}>{item_child["小节"]}</Tag></p>
{
item_child["小节内容"].map((item_child_child, m) => {
return Object.keys(item_child_child).map((key, n) => {
return key === "表格" ? <React.Fragment>
<span id={i.toString() + j.toString() + m.toString()} className="paragraph_name">{key}:</span>
{this.simulate(item_child_child[key], i, j, m, n)}
<p><Tag color="#87d068" id={i.toString() + j.toString() + m.toString()} >{key}:</Tag></p>
<p>{this.simulate(item_child_child[key], i, j, m, n)}</p>
</React.Fragment>
: <React.Fragment>
<span id={i.toString() + j.toString() + m.toString()} className="paragraph_name">{key}:</span>
<Input.TextArea
<p><Tag color="#87d068" id={i.toString() + j.toString() + m.toString()} >{key}:</Tag></p>
<p><Input.TextArea
defaultValue={item_child_child[key]}
onChange={this.onOutput.bind(this, i, j, m, n)} />
onChange={this.onOutput.bind(this, i, j, m, n)} /></p>
</React.Fragment>
})
})

View File

@ -12,6 +12,8 @@ import AnalysisDetails from './branch/manage/industry/branch/analysisDetails'
import UserSet from './branch/setting/user'
import EmptyContent from "./empty"
import { connect } from 'react-redux';
import { CloseOutlined } from '@ant-design/icons';
import { Button } from 'antd';
import { Tabs, Empty } from 'antd';
@ -85,6 +87,10 @@ class Main extends Component {
store.dispatch(operationAction(newPanes, newActiveKey))
};
clearAll = () => {
store.dispatch(operationAction([],'0'))
}
getBranch = (props, name) => {
var id
if (name.match(/\((.+)\)/g)) {
@ -141,6 +147,12 @@ class Main extends Component {
onChange={this.onChange}
activeKey={this.props.activeKey}
onEdit={this.onEdit}
tabBarExtraContent={{
right: <Button
onClick={this.clearAll}
icon={<CloseOutlined />}
/>,
}}
>
{this.props.panes.map(pane => (
<TabPane tab={pane.title} key={pane.key} closable={pane.closable}>

View File

@ -24,11 +24,15 @@ class Side extends Component {
}
componentDidUpdate(preProps, preState) {
console.log(preProps, preState)
if (preProps.activeKey !== preState.currentKey) {
// const title = preProps.panes.filter(item => {
// return item.key === preProps.activeKey ? item.title : null
// })
// this.setState({
// currentKey:preState.data.filter((item,index)=>{
// return title === item.title?index.toString():'0'
// })
// })
}
}
@ -39,12 +43,16 @@ class Side extends Component {
})
}
handleCurrentClick = e =>{
this.setState({ currentKey: e.key });
}
render() {
const menus = localStorage.getItem("menus").split(',') || ['Board', 'Manage', 'Model', 'Test', 'Setting']
const menuItem = menus.map((item, i) => {
return <Menu.ItemGroup title={item} key={i}>
{this.state.data.map((ele, index) => {
return ele.category === item ? <Menu.Item key={index} icon={ele.icon} onClick={this.handleClick}>{ele.title}</Menu.Item> : null
return ele.category === item ? <Menu.Item key={index.toString()} icon={ele.icon} onClick={this.handleClick}>{ele.title}</Menu.Item> : null
})}
</Menu.ItemGroup>
})
@ -57,6 +65,7 @@ class Side extends Component {
style={{ height: '100%', borderRight: 0, position: 'fixed', width: '220px' }}
theme="dark"
className='menu'
onClick={this.handleCurrentClick}
>
<PageHeader title="TFSE" style={{ marginBottom: '40px', color: '#fff' }}></PageHeader>
{menuItem}