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

src/styles/view/biz/detail/detail.scss

@@ -57,7 +57,6 @@
                 background:rgba(0,185,255,0.3);
                 border-radius:17px; 
                 top: 30px;
-                margin-left: 880px;
                 color: #5FFFFD;
                 .amos-search-icon-right{
                    left: 255px;     
@@ -70,6 +69,21 @@
                     border-radius: 17px;
                 }
               } 
+              .selectDiv{
+                position: relative;
+                right: -900px;
+                margin-left: 20px;
+                color: white;  
+                .amos-select-dropdown {
+                  border: 0; 
+                  min-width: 7em;
+                  line-height: 32px;
+                  background-color: rgba(0,185,255,0.3);
+                  border-radius: 15px;
+                  top: -3px;
+                }
+              }
+             
             }
             .infoContent{
              height:888px;
@@ -233,7 +247,7 @@
      width: 100%;
      .ant-table-thead > tr > th {
          background:rgba(0,185,255,0.38)!important;
-         font-size:20p!important;
+         font-size:20px!important;
          font-family:Microsoft YaHei;
          font-weight:bold;
          color:rgba(255,255,255,1);

src/view/biz/duty/detail/data.js

@@ -107,35 +107,48 @@ const sevenDaysRiskCensusData = [{
     'sa': '复龙换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 },
 {
-    'sa': '奉贤换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+    'sa': '奉贤换流站', 'sb': '收点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 },
 {
     'sa': '苏州换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 },
 {
-    'sa': '中州换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+    'sa': '中州换流站', 'sb': '收点', 'sc': '隐患', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 
 },
 {
     'sa': '天山换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 },
 {
-    'sa': '金华换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+    'sa': '金华换流站', 'sb': '送点', 'sc': '隐患', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 },
 {
-    'sa': '龙泉换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+    'sa': '三亚换流站', 'sb': '送点', 'sc': '隐患', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 
 },
 {
-    'sa': '政平换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+    'sa': '龙泉换流站', 'sb': '收点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 
 },
 {
-    'sa': '伊克昭换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+    'sa': '厦门换流站', 'sb': '收点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 
 },
 {
-    'sa': '陕北换流站', 'sb': '送点', 'sc': '告警', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+    'sa': '南昌换流站', 'sb': '送点', 'sc': '隐患', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+
+},
+
+{
+    'sa': '政平换流站', 'sb': '送点', 'sc': '隐患', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+
+},
+{
+    'sa': '伊克昭换流站', 'sb': '收点', 'sc': '隐患', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
+
+},
+{
+    'sa': '陕北换流站', 'sb': '送点', 'sc': '隐患', 'sd': '23', 'se': '23', 'sf': '12', 'sg': '12', 'sh': '12', 'si': '23', 'sj': '97',
 
 },
 {

src/view/biz/duty/situation/GrowthStatistics.js

@@ -7,7 +7,7 @@ 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}}
+        <div style={{position:"initial",width:28,height:28,marginTop:-28,marginLeft:358}}
            onClick={this.props.onWarnClick}></div>
           <div className='growth-item growth-item-header'>
             <div>日期</div>
@@ -22,7 +22,6 @@ class GrowthStatistics extends Component {
               <div>{item.growth}</div>
             </div>
             )
-
            )
           }
         </div>

src/view/biz/duty/situation/RecentStatistics.js

@@ -34,7 +34,7 @@ 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}}
+         <div style={{position:"initial",width:28,height:28,marginTop:-19,marginLeft:362}}
                onClick={this.props.onStatisticClick}></div>
            <ReactEcharts option={recentData}  style={{ height: '100%', width: '100%' }} />
          </div>

src/view/biz/duty/situation/RiskFailure.js

@@ -8,7 +8,7 @@ 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}}
+        <div style={{position:"initial",width:28,height:28,marginTop:-35,marginLeft:352}}
           onClick={this.props.onRiskClick}></div>
         {
           riskFailureData.map((item,index)=>

src/view/biz/duty/situation/SafetyRate.js

@@ -11,7 +11,7 @@ class SafetyRate extends Component {
              安全指数 TOP10
         </div>
         <div className='top-ten-content' style={{position:"initial"}}>
-          <div style={{position:"initial",width:28,height:28,marginTop:-32,marginLeft:352}}
+          <div style={{position:"initial",width:28,height:28,marginTop:-36,marginLeft:352}}
           onClick={this.props.onClick}></div>
         {
           SafetyRateData.map((item,index)=>

src/view/monitor/statistical/AlarmControlTable.js

@@ -49,7 +49,7 @@ const data = [
             title: '换流站',
             dataIndex: 'name',
             key: 'name',
-            width: '10%',
+            width: '20%',
             query: true,          
            
           },
@@ -57,7 +57,7 @@ const data = [
             title: '火警告警',
             dataIndex: 'sex',
             key: 'sex',
-            width: '9%',
+            width: '15%',
             query: true,
             required: true, //是否是默认显示的          
             // render: (text,record) => {
@@ -72,7 +72,7 @@ const data = [
             title: '故障报警',
             dataIndex: 'age',
             key: 'age',
-            width: '10%',
+            width: '15%',
             query: true,
             required: true, //是否是默认显示的
             // render: (text,record) => {
@@ -85,7 +85,7 @@ const data = [
             title: '巡检告警',
             dataIndex: 'address',
             key: 'address',
-            width: '10%',
+            width: '15%',
             query: true,
             required: true, //是否是默认显示的
             // render: (text,record) => {
@@ -112,7 +112,7 @@ const data = [
             query: true,
          
             st: 'text', //搜索的类型
-            width: '10%'
+            width: '20%'
           }
       
         ];

src/view/monitor/statistical/DangerControlTable.js

@@ -49,7 +49,7 @@ const data = [
             title: '换流站',
             dataIndex: 'name',
             key: 'name',
-            width: '10%',
+            width: '20%',
             query: true,          
            
           },
@@ -57,7 +57,7 @@ const data = [
             title: '已治理',
             dataIndex: 'sex',
             key: 'sex',
-            width: '9%',
+            width: '15%',
             query: true,
             required: true, //是否是默认显示的          
             // render: (text,record) => {
@@ -72,7 +72,7 @@ const data = [
             title: '未治理',
             dataIndex: 'age',
             key: 'age',
-            width: '10%',
+            width: '15%',
             query: true,
             required: true, //是否是默认显示的
             // render: (text,record) => {
@@ -85,7 +85,7 @@ const data = [
             title: '逾期未治理',
             dataIndex: 'address',
             key: 'address',
-            width: '10%',
+            width: '15%',
             query: true,
             required: true, //是否是默认显示的
             // render: (text,record) => {
@@ -99,7 +99,7 @@ const data = [
             key: 'id',
             query: true,
             required: true, //是否是默认显示的        
-            width: '10%',
+            width: '15%',
             // render: (text,record) => {
             //     return  <p className="si">{text}</p> ;
               
@@ -112,7 +112,7 @@ const data = [
             query: true,
          
             st: 'text', //搜索的类型
-            width: '10%'
+            width: '20%'
           }
       
         ];
@@ -226,7 +226,7 @@ class DangerControlTable extends Component {
       <div className="souh" >
           <div className="sou">
             <div className="inputxq1">
-            <StdForm >
+            <StdForm>
             <Search  value={name}  className="input_item_select" icon={<Icon icon='search'  onClick={ this.onIconClick1} />}   onChange={ this.onChange1}   />
            
             </StdForm>