Commit 20613542 authored by zhengjiangtao's avatar zhengjiangtao

Merge branch 'developer' of http://172.16.10.76/station/station-elec-manage-view into developer

parents 4e85a43b 9c3c23f1
This diff is collapsed.
This diff is collapsed.
import combineRoutes from 'amos-pluggable/lib/combineRoutes';
/**
* 系统自定义路由
*/
export const customRoutes = [
];
......@@ -16,7 +14,6 @@ export const customRoutes = [
* const stage = parseText(pathMapping.stage, { objkey });
*/
export const pathMapping = {
};
export const activitiMapping = {
......
This diff is collapsed.
@import './situation/situation.scss';
@import './detail/detail.scss';
.biz-view-root {
height: 100%;
background: url('/src/assets/bg/biz-bg.png') no-repeat;
......
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import {Layout } from 'amos-framework';
import {Layout,Search } from 'amos-framework';
import {Input,Table, Button } from 'amos-antd';
import './../../../../styles/view/biz/detail/detail.scss';
import JsonData from './data';
import RiskAssessment from './riskDetail';
......@@ -22,14 +21,20 @@ class CentralInfoView extends Component {
riskVisable: 'none',
buttonVisable:'block',
type:'', //当前表格类型
detailTitle:''
detailTitle:'',
};
}
componentDidMount(){
this.props.onRef&&this.props.onRef(this)
}
/**
* 安全指数详情
*/
kpsi = () => {
kpsi = (values) => {
console.log(values);
this.setState({
title: "安全指数",
divVisable: 'block',
......@@ -98,7 +103,7 @@ class CentralInfoView extends Component {
dataIndex: 'ka',
width: 100,
render : (text, record) => {
return(<div style={{color:'yellow'}}>{text}</div>)
return(<div style={{color:'yellow',fontWeight: 'normal'}}>{text}</div>)
}
},
{
......@@ -167,7 +172,7 @@ class CentralInfoView extends Component {
dataIndex: 'ka',
width: 100,
render : (text, record) => {
return(<div style={{color:'yellow'}}>{text}</div>)
return(<div style={{color:'yellow',fontWeight: 'normal'}}>{text}</div>)
}
},
{
......@@ -234,7 +239,10 @@ class CentralInfoView extends Component {
{
title: '换流站',
dataIndex: 'da',
width: 120
width: 120,
render : (text, record) => {
return(<div style={{fontWeight: 'normal'}}>{text}</div>)
}
},
{
title: '告警',
......@@ -255,7 +263,10 @@ class CentralInfoView extends Component {
{
title: '换流站',
dataIndex: 'sa',
width: 100
width: 100,
render : (text, record) => {
return(<div style={{fontWeight: 'normal'}}>{text}</div>)
}
},
{
title: '类型',
......@@ -374,29 +385,22 @@ class CentralInfoView extends Component {
const _pageNation={pageSize:pageSize,size:'small',showTotal:this.showTotalPage};
return (
<div>
<div style={{display:buttonVisable}}>
<Button onClick={this.kpsi}>安全指数</Button>
<Button onClick={this.safetyRiskFailure}>安全风险失效</Button>
<Button onClick={this.dangerWeekCensus}>告警隐患周增幅统计</Button>
<Button onClick={this.sevenDaysRiskCensus}>七日风险统计</Button>
</div>
<div className="mainContent" style={{display:divVisable}} >
<Layout>
<Header className="contentHeader">
<Header className="contentHeader">
<div className="headerLeft" style={{display:'inline'}}>{title}</div>
<div className="headerRight" style={{display:'inline'}}>
<img src="/src/assets/detail/close.png" onClick={this.closeDiv} width="36px"/>
<img src="/src/assets/detail/close.png" onClick={this.closeDiv} width="42px" style={{marginTop:'5px'}}/>
</div>
</Header>
<Content className="content">
<div className="contentInfo">
<div className="infoHeader">
<Input className="titleInput" addonAfter={<img src="/src/assets/detail/search.png" style={{width:20}}/>} />
{/* <Input className="titleInput" value=" 搜索" addonAfter={<img src="/src/assets/detail/search.png" onClick={this.} style={{width:20,marginTop:27,marginLeft:-33}}/>} /> */}
<Search icon="search" value=" 搜索" onChange={this.onChange} onIconClick={this.onIconClick} />
</div>
<div className="infoContent">
<Table className="tableDetail"
<Table className="tableDetail"
dataSource={this.getDataSource(type)}
style={{background:'linear-gradient(180deg,rgba(0,0,0,0.57) 0%,rgba(12,181,213,0.1) 100%)'}}
columns={this.columns(type)}
......
......@@ -8,6 +8,7 @@ import IncidenceSeverityMatrix from './echarts/IncidenceSeverityMatrix';
/**
* 风险评估
*/
class RiskAssessment extends Component {
//获取等级
......@@ -38,58 +39,58 @@ class RiskAssessment extends Component {
);
}
onClick=()=>{
this.props.updateParents({ divVisable: 'block',riskVisable:'none'});
this.props.updateParents({ divVisable:'block', riskVisable:'none'});
}
render() {
return (
<div className="mainContent" style={{ width: '100%', height: '100%', display: this.props.riskVisable }}>
<div className="mainContent" style={{display: this.props.riskVisable }}>
<Layout>
<Layout style={{width : 900}}>
<Header className="contentHeader">
<Header className="contentHeader">
<div className="headerLeft" style={{ display: 'inline' }}>{this.props.detailTitle}</div>
<div className="headerRight" style={{ display: 'inline' }}>
<img src="/src/assets/detail/return.png" onClick={this.onClick} width="36px" />
<img src="/src/assets/detail/return.png" onClick={this.onClick} width="42px" style={{marginTop:5}} />
</div>
</Header>
<Content className="riskcontent">
<Header className="blockOneHeader">
</Header>
<Layout>
<Content className="riskcontent">
<Header className="blockOneHeader">
<Header className="oneChildHeader">
<img src="/src/assets/detail/secondTitle1.png" style={{ width: 192, height: 29, margin: 0 }} />
<img src="/src/assets/detail/secondTitle1.png" style={{ width: 256, height: 38, margin: 0 }} />
</Header>
<Content className="oneHeaderContent">
<img src="/src/assets/detail/RPNr.png" style={{ width: 692, height: 378, marginTop: 20 ,marginLeft: 100}} />
{this.getLegend()}
<Content className="oneHeaderContent">
<img src="/src/assets/detail/RPNr.png" style={{ width: 922, height: 503, marginTop: 35 ,marginLeft:248}} />
{this.getLegend()}
</Content>
</Header>
<Content className="blockOneContent">
<Content className="blockOneContent">
<Layout className="oneChildLayout">
<Sider className="oneChildSider">
<Header className="twoChildHeader">
<img src="/src/assets/detail/secondTitle2.png" style={{ width: 192, height: 29, margin: 0 }} />
<img src="/src/assets/detail/secondTitle2.png" style={{ width: 277, height: 38, margin: 0 }} />
</Header>
<Content className="twoHeaderContent">
<div className="risk-degree-pie">
<div className="risk-degree-pie1">
{/* <RiskDegreePie /> */}
{/* <div>5</div>
<div>5</div>
<div>2%</div>
<div>本年风险</div> */}
</div>
<div>本年风险</div>
</div>
</div>
</Content>
</Sider>
</Layout>
</Content>
<Content className="blockTwoContent">
<Content className="blockTwoContent">
<Layout className="oneChildLayout">
<Sider className="oneChildSider">
<Header className="twoChildHeader">
<img src="/src/assets/detail/secondTitle3.png" style={{ width: 208, height: 29, margin: 0 }} />
<img src="/src/assets/detail/secondTitle3.png" style={{ width: 277, height: 38, margin: 0 }} />
</Header>
<Content className="twoHeaderContent">
{/* <IncidenceSeverityMatrix /> */}
......@@ -97,17 +98,18 @@ class RiskAssessment extends Component {
</Sider>
</Layout>
</Content>
</Content>
</Layout>
<Sider className="risksider">
<Header className="risksiderHeader">
<img src="/src/assets/detail/secondTitle4.png" style={{ width: 192, height: 29, margin: 0 }} />
<img src="/src/assets/detail/secondTitle4.png" style={{ width: 256, height: 38, margin: 0 }} />
</Header>
<Content className="risksiderContent">
{/* <RiskDegreeHistogram /> */}
</Content>
</Sider>
</Sider>
</Layout>
</Layout>
</div>
);
......
......@@ -7,6 +7,8 @@ class GrowthStatistics extends Component {
<div className='growth-statistics-view common-margin'>
<div className='daily-title daily-title-content'>告警隐患周增幅统计</div>
<div className='growth-content'>
<div style={{position:"initial",width:28,height:28,marginTop:-23,marginLeft:358}}
onClick={this.props.onWarnClick}></div>
<div className='growth-item growth-item-header'>
<div>日期</div>
<div>告警隐患</div>
......
......@@ -34,6 +34,8 @@ class RecentStatistics extends Component {
<Button size='sm' children={<span>隐患</span>} className='button-style' value="2" style={(value == '2')?select:noselect}/>
</ButtonGroup>
<div className='recent-statistics-content'>
<div style={{position:"initial",width:28,height:28,marginTop:-14,marginLeft:362}}
onClick={this.props.onStatisticClick}></div>
<ReactEcharts option={recentData} style={{ height: '100%', width: '100%' }} />
</div>
</div>
......
......@@ -8,6 +8,8 @@ class RiskFailure extends Component {
<div className='risk-failure-view common-margin daily-title'>
<div className='daily-title daily-title-content'>安全风险失效 TOP10</div>
<div className='top-ten-content'>
<div style={{position:"initial",width:28,height:28,marginTop:-32,marginLeft:352}}
onClick={this.props.onRiskClick}></div>
{
riskFailureData.map((item,index)=>
<div className='top-ten-item' key={index}>
......
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import {SafetyRateData} from './data';
import { OverFlowText } from 'amos-framework';
import { OverFlowText, Button } from 'amos-framework';
class SafetyRate extends Component {
render() {
return (
<div className='safety-rate-view common-margin daily-title'>
<div className='daily-title-content'>安全指数 TOP10</div>
<div className='top-ten-content'>
<div className='daily-title-content'>
安全指数 TOP10
</div>
<div className='top-ten-content' style={{position:"initial"}}>
<div style={{position:"initial",width:28,height:28,marginTop:-32,marginLeft:352}}
onClick={this.props.onClick}></div>
{
SafetyRateData.map((item,index)=>
<div className='top-ten-item' key={index}>
......
......@@ -6,10 +6,11 @@ import RiskFailure from './RiskFailure';
import RiskTrend from './RiskTrend';
import Statistics from './Statistics';
import SafetyRate from './SafetyRate';
import CentralInfoView from './../detail/index';
/**
* situation
*安全态势
* 安全态势
* @class situation
* @extends {Component}
*/
......@@ -17,7 +18,9 @@ class Situation extends Component {
constructor(props) {
super(props);
this.state = {
divVisable:'none' ,//控制弹窗显示
title: '', //modal标题
type: '' //弹窗类型(根据类型切换不同弹窗)
};
}
......@@ -33,16 +36,33 @@ class Situation extends Component {
}
onRef=(ref)=>{
this.child1=ref;
}
//安全指数弹窗
kpsi(values){
console.log(values);
this.setState({
divVisable : values.divVisable,
title : values.title,
type : values.type
})
}
render() {
return (
<div className='class-Situation'>
<div className='daily-duties-content'>
<div className='daily-duties-left'>
<div>
<SafetyRate />
<SafetyRate onClick={()=>{
this.child1.kpsi()}}/>
</div>
<div>
<GrowthStatistics/>
<GrowthStatistics onWarnClick={()=>{
this.child1.dangerWeekCensus()}}/>
</div>
</div>
<div className='daily-duties-middle'>
......@@ -55,13 +75,18 @@ class Situation extends Component {
</div>
<div className='daily-duties-right'>
<div>
<RiskFailure/>
<RiskFailure onRiskClick={()=>{
this.child1.safetyRiskFailure()}}/>
</div>
<div>
<RecentStatistics/>
<RecentStatistics onStatisticClick={()=>{
this.child1.sevenDaysRiskCensus()}}/>
</div>
</div>
</div>
</div>
<div>
</div>
<CentralInfoView onRef={this.onRef}/>
</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