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

src/styles/view/biz/situation/situation.scss

@@ -166,6 +166,14 @@
     height: vh(600);
     position: relative;
 
+
+    .div-map-echarts {
+      margin-left: 2%;
+      height: 91% !important;
+      width: 95% !important;
+      top: 8%;
+    }
+
     .statistics-banner {
       position: absolute;
       left: vw(95);
@@ -176,6 +184,8 @@
       justify-content: space-between;
       z-index: 2;
 
+
+
       .statistics-banner-content {
         height: vh(100);
         width: vw(380);
@@ -222,6 +232,8 @@
         }
       }
     }
+
+
   }
 
   .risk-trend-view {

src/styles/view/monitor/homePage.scss

@@ -178,7 +178,7 @@
   }
 
   .sou {
-    height: 10%;
+    height: vh(66);
     width: 100%;
     display: flex;
     top: -2%;
@@ -284,7 +284,7 @@
       position: relative;
       text-align: center;
       /* vertical-align: middle; */
-      top: 29%;
+      top: 27%;
       margin-left: 12%;
 
       .search-one-button {
@@ -446,6 +446,7 @@
         bottom: vh(1);
         right: vw(-2);
         content: '' !important;
+        top: vh(-5);
       }
 
       .three-font {

src/view/biz/duty/detail/echarts/IncidenceSeverityMatrix.js

@@ -140,7 +140,7 @@ class IncidenceSeverityMatrix extends Component {
     const option = this.getOptions();
     return (
       <div className="risk-incidence-severity-matrix">
-        <AmosEcharts option={option} style={{ height: '330px', width: '660px' }} />
+        <AmosEcharts option={option} className ="div-severity-echarts" />
       </div>
     );
   }

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

@@ -533,7 +533,7 @@ class CentralInfoView extends Component {
                           <Option value="收点">收点</Option>
                         </Select>
                       </div>
-                      <div className="selectDiv" style={{ display: 'inline-block' }}>
+                      <div className="selectDiv1" style={{ display: 'inline-block' }}>
                         统计类别：
                         <Select defaultValue="全部" onChange={this.onSumClazzChange}>
                           <Option value="全部">全部</Option>

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

@@ -50,7 +50,7 @@ class RiskAssessment extends Component {
               {this.props.detailTitle}
             </div>
             <div className="headerRight" style={{ display: 'inline' }}>
-              <img src="/src/assets/detail/return.png" onClick={this.onClick} width="42px" style={{ marginTop: 3 }} />
+              <img src="/src/assets/detail/return.png" onClick={this.onClick} className="img-headerRight" />
             </div>
           </Header>
           <Layout>
@@ -60,7 +60,7 @@ class RiskAssessment extends Component {
                   <img src="/src/assets/detail/secondTitle4.png" style={{ width: 256, height: 38, margin: 0 }} />
                 </Header>
                 <Content className="oneHeaderContent">
-                  <img src="/src/assets/detail/RPNr.png" style={{ width: 922, height: 503, marginTop: 35, marginLeft: 160 }} />
+                   <img className="image-div" src="/src/assets/detail/RPNr.png"  />
                   {this.getLegend()}
                 </Content>
               </Header>