Skip to content

S
station-elec-manage-view
Commit ba83440e authored by 王海涛's avatar 王海涛
Browse files
Options

滚动条样式优化

parent 4a1b97f7
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 208 deletions
src/view/biz/regulate/ContentModal.js 0 → 100644
View file @ ba83440e
import React, { Component } from 'react';
import CommonCard from '../../common/commonCard/CommonCard';
import { Table } from 'amos-antd';
import PropTypes from 'prop-types';
class ContentModal extends Component {
constructor(props) {
super(props);
}
render() {
const { safeInfo = [], columns1 = [], alertData = [] } = this.props;
return (
<div>
<div className="detail-card">
<CommonCard title="1.消防安全登记单基本信息">
<div className="safety-detail">
{safeInfo.map((item) => {
return (
<div className="safety-info" key={item.data}>
<div className="safety-name">{item.title}</div>
<div className="safety-data">{item.data}</div>
</div>
);
})}
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="2.告警信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="3.风险信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="4.隐患信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="5.消防安全管理">
<div className="info-style">
<div className="info-left">消防安全管理</div>
<div className="info-right">按照消防管理要求，站内具备消防演练方案5个，今年完成培训次数0次，完成日常训练0次，站内消防器材保养3次，需加强消防安全培训及日常训练工作。</div>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="6.治理建议及意见">
<div className="info-style">
<div className="info-left">意见及建议</div>
<div className="info-right">请输入</div>
</div>
</CommonCard>
</div>
</div>
);
}
}
ContentModal.propTypes = {
safeInfo: PropTypes.array,
columns1: PropTypes.array,
alertData: PropTypes.array
};
export default ContentModal;
src/view/biz/regulate/bills/index.js
View file @ ba83440e
...@@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; ...@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
import { Input, Select, Table, Button, DatePicker, Pagination } from 'amos-antd'; import { Input, Select, Table, Button, DatePicker, Pagination } from 'amos-antd';
import CommonContainer from './../../../common/commonContainer'; import CommonContainer from './../../../common/commonContainer';
import DetailContent from '../../../common/detailContent'; import DetailContent from '../../../common/detailContent';
import CommonCard from '../../../common/commonCard/CommonCard';
import detaileImg from '../../../../consts/detailImages'; import detaileImg from '../../../../consts/detailImages';
import ContentModal from '../ContentModal';
import './bills.scss'; import './bills.scss';
const Search = Input.Search; const Search = Input.Search;
...@@ -82,6 +82,16 @@ class Bills extends Component { ...@@ -82,6 +82,16 @@ class Bills extends Component {
componentWillUnmount() {} componentWillUnmount() {}
getStartDate = (d) => {
console.log(d);
this.setState({ stratTime: d });
}
getEndDate = (d) => {
console.log(d);
this.setState({ endTime: d });
}
handleDetail = (text) => { handleDetail = (text) => {
console.log(text); console.log(text);
...@@ -96,15 +106,6 @@ class Bills extends Component { ...@@ -96,15 +106,6 @@ class Bills extends Component {
return `共 ${total} 条`; return `共 ${total} 条`;
} }
getStartDate = (d) => {
console.log(d);
this.setState({ stratTime: d });
}
getEndDate = (d) => {
console.log(d);
this.setState({ endTime: d });
}
handleSelected = (value) => { handleSelected = (value) => {
console.log(value); console.log(value);
...@@ -123,7 +124,7 @@ class Bills extends Component { ...@@ -123,7 +124,7 @@ class Bills extends Component {
} }
render() { render() {
const { detailVisible } = this.state; const { detailVisible, alertData } = this.state;
const columns = [ const columns = [
{ {
title: '序号', title: '序号',
...@@ -277,69 +278,11 @@ class Bills extends Component { ...@@ -277,69 +278,11 @@ class Bills extends Component {
detailVisible={detailVisible} detailVisible={detailVisible}
handleClose={this.handleClose} handleClose={this.handleClose}
> >
<div className="detail-card"> <ContentModal
<CommonCard title="1.消防安全登记单基本信息"> alertData={alertData}
<div className="safety-detail"> columns1={columns1}
{safeInfo.map((item) => { safeInfo={safeInfo}
return ( />
<div className="safety-info" key={item.data}>
<div className="safety-name">{item.title}</div>
<div className="safety-data">{item.data}</div>
</div>
);
})}
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="2.告警信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="3.风险信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="4.隐患信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="5.消防安全管理">
<div className="info-style">
<div className="info-left">消防安全管理</div>
<div className="info-right">按照消防管理要求，站内具备消防演练方案5个，今年完成培训次数0次，完成日常训练0次，站内消防器材保养3次，需加强消防安全培训及日常训练工作。</div>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="6.治理建议及意见">
<div className="info-style">
<div className="info-left">意见及建议</div>
<div className="info-right">请输入</div>
</div>
</CommonCard>
</div>
</DetailContent> </DetailContent>
</div> </div>
); );
......
src/view/biz/regulate/firecontrol/index.js
View file @ ba83440e
...@@ -4,6 +4,7 @@ import { Input, Select, Table, Button, DatePicker, Pagination } from 'amos-antd' ...@@ -4,6 +4,7 @@ import { Input, Select, Table, Button, DatePicker, Pagination } from 'amos-antd'
import CommonContainer from './../../../common/commonContainer'; import CommonContainer from './../../../common/commonContainer';
import DetailContent from '../../../common/detailContent'; import DetailContent from '../../../common/detailContent';
import CommonCard from '../../../common/commonCard/CommonCard'; import CommonCard from '../../../common/commonCard/CommonCard';
import ContentModal from '../ContentModal';
import '../bills/bills.scss'; import '../bills/bills.scss';
...@@ -123,7 +124,7 @@ class Firecontrol extends Component { ...@@ -123,7 +124,7 @@ class Firecontrol extends Component {
} }
render() { render() {
const { detailVisible } = this.state; const { detailVisible, alertData } = this.state;
const columns = [ const columns = [
{ {
title: '序号', title: '序号',
...@@ -263,69 +264,11 @@ class Firecontrol extends Component { ...@@ -263,69 +264,11 @@ class Firecontrol extends Component {
detailVisible={detailVisible} detailVisible={detailVisible}
handleClose={this.handleClose} handleClose={this.handleClose}
> >
<div className="detail-card"> <ContentModal
<CommonCard title="1.消防安全登记单基本信息"> alertData={alertData}
<div className="safety-detail"> columns1={columns1}
{safeInfo.map((item) => { safeInfo={safeInfo}
return ( />
<div className="safety-info" key={item.data}>
<div className="safety-name">{item.title}</div>
<div className="safety-data">{item.data}</div>
</div>
);
})}
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="2.告警信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="3.风险信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="4.隐患信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="5.消防安全管理">
<div className="info-style">
<div className="info-left">消防安全管理</div>
<div className="info-right">按照消防管理要求，站内具备消防演练方案5个，今年完成培训次数0次，完成日常训练0次，站内消防器材保养3次，需加强消防安全培训及日常训练工作。</div>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="6.治理建议及意见">
<div className="info-style">
<div className="info-left">意见及建议</div>
<div className="info-right">请输入</div>
</div>
</CommonCard>
</div>
</DetailContent> </DetailContent>
</div> </div>
); );
......
src/view/biz/regulate/supervise/index.js
View file @ ba83440e
...@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; ...@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { Input, Select, Table, Button, Pagination } from 'amos-antd'; import { Input, Select, Table, Button, Pagination } from 'amos-antd';
import CommonContainer from './../../../common/commonContainer'; import CommonContainer from './../../../common/commonContainer';
import DetailContent from '../../../common/detailContent'; import DetailContent from '../../../common/detailContent';
import CommonCard from '../../../common/commonCard/CommonCard'; import ContentModal from '../ContentModal';
import './supervise.scss'; import './supervise.scss';
...@@ -52,13 +52,9 @@ class Supervise extends Component { ...@@ -52,13 +52,9 @@ class Supervise extends Component {
}; };
} }
componentWillMount() {}
componentDidMount() {} componentDidMount() {}
componentWillUnmount() {}
handleDetail = (text) => { handleDetail = (text) => {
console.log(text); console.log(text);
this.setState({ detailVisible: true }); this.setState({ detailVisible: true });
...@@ -89,7 +85,7 @@ class Supervise extends Component { ...@@ -89,7 +85,7 @@ class Supervise extends Component {
console.log(payload); console.log(payload);
} }
render() { render() {
const { detailVisible } = this.state; const { detailVisible, alertData } = this.state;
const columns = [ const columns = [
{ {
title: '换流站', title: '换流站',
...@@ -295,69 +291,11 @@ class Supervise extends Component { ...@@ -295,69 +291,11 @@ class Supervise extends Component {
detailVisible={detailVisible} detailVisible={detailVisible}
handleClose={this.handleClose} handleClose={this.handleClose}
> >
<div className="detail-card"> <ContentModal
<CommonCard title="1.消防安全登记单基本信息"> alertData={alertData}
<div className="safety-detail"> columns1={columns1}
{safeInfo.map((item) => { safeInfo={safeInfo}
return ( />
<div className="safety-info" key={item.data}>
<div className="safety-name">{item.title}</div>
<div className="safety-data">{item.data}</div>
</div>
);
})}
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="2.告警信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="3.风险信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="4.隐患信息">
<div className="table-style">
<Table
pagination={false}
columns={columns1}
dataSource={this.state.alertData}
/>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="5.消防安全管理">
<div className="info-style">
<div className="info-left">消防安全管理</div>
<div className="info-right">按照消防管理要求，站内具备消防演练方案5个，今年完成培训次数0次，完成日常训练0次，站内消防器材保养3次，需加强消防安全培训及日常训练工作。</div>
</div>
</CommonCard>
</div>
<div className="detail-card">
<CommonCard title="6.治理建议及意见">
<div className="info-style">
<div className="info-left">意见及建议</div>
<div className="info-right">请输入</div>
</div>
</CommonCard>
</div>
</DetailContent> </DetailContent>
</div> </div>
); );
......
src/view/biz/regulate/supervise/supervise.scss
View file @ ba83440e
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
::-webkit-scrollbar{ ::-webkit-scrollbar{
width: 5px; width: 5px;
height: 110px; height: 5px;
background-color: #F5F5F5; background-color: #F5F5F5;
} }
/*定义滚动条轨道 内阴影+圆角*/ /*定义滚动条轨道 内阴影+圆角*/
......
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