Commit e1cecf54 authored by xixinzhao's avatar xixinzhao

巡查统计->巡查记录页面修改返回按钮,弹框宽度

parent 756cd17f
...@@ -4,6 +4,7 @@ import { Modal, Carousel, Button } from 'amos-framework'; ...@@ -4,6 +4,7 @@ import { Modal, Carousel, Button } from 'amos-framework';
import dt2react from 'dt2react'; import dt2react from 'dt2react';
// import { browserHistory } from 'amos-react-router/lib'; // import { browserHistory } from 'amos-react-router/lib';
import { getHistory } from 'amos-designer/lib/utils/history'; import { getHistory } from 'amos-designer/lib/utils/history';
import { Table } from 'amos-antd/lib';
import { fetchCheckDetailById, fetchCheckInputByIdNew, fetchShortByCheckIdAndCheckInputId } from './../../../../services/checkService'; import { fetchCheckDetailById, fetchCheckInputByIdNew, fetchShortByCheckIdAndCheckInputId } from './../../../../services/checkService';
import CheckDetailTable from './CheckDetailTable'; import CheckDetailTable from './CheckDetailTable';
import CheckInputTable from './CheckInputTable'; import CheckInputTable from './CheckInputTable';
...@@ -11,7 +12,7 @@ import { XJBaseURI } from './../../../../consts/urlConsts'; ...@@ -11,7 +12,7 @@ import { XJBaseURI } from './../../../../consts/urlConsts';
import { renderLongTime } from './../../../bizview/common/tableComponent/tool'; import { renderLongTime } from './../../../bizview/common/tableComponent/tool';
import Picture from './Picture'; import Picture from './Picture';
import { pathMapping } from './../../../../routes/customRoutes'; import { pathMapping } from './../../../../routes/customRoutes';
import { Table } from 'amos-antd/lib'; import BizIcon from './../../../common/icon/BizIcon';
import './cdn.scss'; import './cdn.scss';
const CheckListPath = () => pathMapping.checkDetail; const CheckListPath = () => pathMapping.checkDetail;
...@@ -29,8 +30,10 @@ const checkDetailHeaderResult = checkDetail => { ...@@ -29,8 +30,10 @@ const checkDetailHeaderResult = checkDetail => {
pointNo = checkDetail.pointNo; pointNo = checkDetail.pointNo;
} }
} }
return <div className=""> return <div className="check-detail-header-div">
<Button icon={<img src="/src/assets/fsc/img/back.png" alt="" height="28px" />} transparent onClick={() => getHistory().goBack()} /> <div className="check-detail-new-header-goback">
<Button icon={<BizIcon icon="fanhui" />} transparent onClick={() => getHistory().goBack()} />
</div>
<span>{` ${checkTime} ${pointName} (${pointNo})`}</span> <span>{` ${checkTime} ${pointName} (${pointNo})`}</span>
</div>; </div>;
}; };
...@@ -495,6 +498,7 @@ class CheckDetailNew extends Component { ...@@ -495,6 +498,7 @@ class CheckDetailNew extends Component {
closable closable
onCancel={this.onItemCancel} onCancel={this.onItemCancel}
content={this.getItemContext()} content={this.getItemContext()}
width='1000px'
/> />
<Modal <Modal
className="check-item-modal-new" className="check-item-modal-new"
......
...@@ -15,3 +15,16 @@ ...@@ -15,3 +15,16 @@
padding: 1em; padding: 1em;
} }
} }
.check-detail-new-header-goback {
float: left;
width: 3%;
text-align: center;
button {
height: 2.5rem;
background: white;
border: 1px solid #ddddde;
opacity: 1;
}
}
...@@ -1551,6 +1551,12 @@ li.ant-calendar-time-picker-select-option-selected { ...@@ -1551,6 +1551,12 @@ li.ant-calendar-time-picker-select-option-selected {
padding-left: 10px; padding-left: 10px;
text-align: left; text-align: left;
} }
.checkDetail-root .check-header .check-detail-header .check-detail-header-div .check-detail-new-header-goback button {
height: 2.5rem;
background: rgb(0 19 53);
border: 1px solid #143c70;
opacity: 1;
}
.checkDetail-root .check-detail-content-input .check-detail-content2 .ant-table-content .ant-table-header { .checkDetail-root .check-detail-content-input .check-detail-content2 .ant-table-content .ant-table-header {
border-top: 1px solid #143c70; border-top: 1px solid #143c70;
border-left: 1px solid #143c70; border-left: 1px solid #143c70;
......
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