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

src/view/biz/duty/situation/data.js → src/_mock/rczsData/data.js

@@ -41,23 +41,7 @@ export const riskTrendData = {
       fontSize: 14
     }
   },
-  dataZoom: [
-    {
-      show: true,
-      realtime: true,
-      backgroundColor: '#00B9ff',
-      borderColor: '#00B9ff',
-      left: 40,
-      height: 14,
-      width: 996,
-      bottom: 5
-    },
-    {
-      type: 'inside',
-      realtime: true,
-      textStyle: false
-    }
-  ],
+
   xAxis: {
     type: 'category',
     boundaryGap: false,

src/view/biz/duty/situation/geo.js → src/_mock/rczsData/geo.js

@@ -271,4 +271,14 @@ const geoCoordMap = {
   大庆: [125.03, 46.58]
 };
 
-export { provienceData, geoCoordMap };
+
+//地图标点用
+const dmtData = [
+  { latitude: 30.67, longitude: 104.07 },
+  { latitude: 34.76, longitude: 113.65 },
+  { latitude: 29.65, longitude: 91.13 },
+  { latitude: 43.82, longitude: 87.62 }
+];
+
+
+export { provienceData, geoCoordMap, dmtData };

src/styles/view/monitor/homePage.scss

@@ -433,6 +433,7 @@
         text-stroke: 1 rgba(0, 0, 0, 0);
         border-radius: 17px;
         width: 102%;
+        margin-bottom: vh(7);
       }
 
       .ant-calendar-picker-icon:after {
@@ -442,7 +443,7 @@
         background-size: 100% 100%;
         width: vw(18);
         height: vh(20);
-        bottom: vh(0);
+        bottom: vh(1);
         right: vw(-2);
         content: '' !important;
       }
@@ -585,7 +586,7 @@
 .risk-model-model99 {
   .amos-modal-container {
     background: rgba(14, 127, 180, 0.29);
-    height: 70%;
+    // height: 70%;
   }
 
   .amos-modal-content {
@@ -1185,7 +1186,7 @@
         margin-left: vw(17);
         height: vh(260) !important;
         width: 82% !important;
-        background-position: 60px vh(14) !important;
+        background-position: vw(60) vh(14) !important;
       }
 
       .jiantou {

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

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { growthData } from './data';
+import { growthData } from './../../../../_mock/rczsData/data';
 import CommonCard from '../../../common/commonCard/CommonCard';
 
 class GrowthStatistics extends Component {

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

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactEcharts from 'amos-viz/lib/echarts';
-import { recentData1, recentData2 } from './data';
+import { recentData1, recentData2 } from './../../../../_mock/rczsData/data';
 import { Button } from 'amos-framework';
 import CommonCard from '../../../common/commonCard/CommonCard';
 
@@ -36,7 +36,7 @@ class RecentStatistics extends Component {
           </ButtonGroup>
           <div className="recent-statistics-content" style={{position: 'relative'}}>
             <div className="content-detail" onClick={this.props.onStatisticClick}>...</div>
-            <ReactEcharts option={recentData} style={{ height: '100%', width: '100%' }} />
+            <ReactEcharts option={recentData} className="div-echars-style" />
           </div>
         </CommonCard>
       </div>

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

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { riskFailureData } from './data';
+import { riskFailureData } from './../../../../_mock/rczsData/data';
 import { OverFlowText } from 'amos-framework';
 import CommonCard from '../../../common/commonCard/CommonCard';
 

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

 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import ReactEcharts from 'amos-viz/lib/echarts';
-import { riskTrendData } from './data';
+import { riskTrendData } from './../../../../_mock/rczsData/data';
 import { Button } from 'amos-framework';
 import CommonCard from '../../../common/commonCard/CommonCard';
 
@@ -32,7 +31,7 @@ class RiskTrend extends Component {
             <Button size="sm" children={<span>治理数</span>} className="button-style" value="4" style={value == '4' ? select : noselect} />
           </ButtonGroup>
           <div className="risk-trend-content">
-            <ReactEcharts option={riskTrendData} style={{ height: '100%', width: '100%' }} />
+             <ReactEcharts option={riskTrendData}  className="div-echars"  />
           </div>
         </CommonCard>
       </div>

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

 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { SafetyRateData } from './data';
-import { OverFlowText, Button } from 'amos-framework';
+import { SafetyRateData } from './../../../../_mock/rczsData/data';
+import { OverFlowText } from 'amos-framework';
 import CommonCard from '../../../common/commonCard/CommonCard';
 
+/**
+ * 安全指数top10
+ */
 class SafetyRate extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      data: []
+    };
+  }
+
+  componentDidMount() {
+    this.querySafetyData();
+  }
+
+  querySafetyData = () => {
+    this.setState({
+      data: SafetyRateData
+    });
+  };
+
   render() {
+    let { data } = this.state;
     return (
-      <div className='safety-rate-view common-margin daily-title'>
-{/*         <div className='daily-title-content'>
+      <div className="safety-rate-view common-margin daily-title">
+        {/*         <div className='daily-title-content'>
              安全指数 TOP10
         </div> */}
         <CommonCard title="安全指数 TOP10">
-          <div className='top-ten-content' style={{ position: 'relative' }}>
-            <div className="content-detail"
-            onClick={this.props.onClick}>...</div>
-          {
-            SafetyRateData.map((item,index)=>
-              <div className='top-ten-item' key={index}>
+          <div className="top-ten-content" style={{ position: 'relative' }}>
+            <div className="content-detail" onClick={this.props.onClick}>
+              ...
+            </div>
+            {data.map((item, index) => (
+              <div className="top-ten-item">
                 <OverFlowText>
                   <p style={{ width: '80px' }}>{item.name}</p>
                 </OverFlowText>
-                <div className='top-ten-item-middle'>
-                  <div className='top-ten-item-middlelinear' style={{height:8,width:`${item.value}%`}}> </div>
+                <div className="top-ten-item-middle">
+                  <div className="top-ten-item-middlelinear" style={{ height: 8, width: `${item.value}%` }}>
+                    {' '}
+                  </div>
                 </div>
-                <div className ='top-ten-item-bottom'>
+                <div className="top-ten-item-bottom">
                   <span>{item.value}</span>
-                  </div>
+                </div>
               </div>
-            )
-          }
+            ))}
           </div>
         </CommonCard>
       </div>

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

 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { MapChart } from 'amos-viz/lib/echarts';
-import { chainMapData, option123 } from './data';
 import echarts from 'echarts/lib/echarts';
 import 'echarts/map/js/china';
 import geoJson from 'echarts/map/json/china.json';
-import { geoCoordMap, provienceData } from './geo';
+import { geoCoordMap, provienceData,dmtData } from './../../../../_mock/rczsData/geo';
 import CommonCard from '../../../common/commonCard/CommonCard';
 
-export const dmtData = [
-  { latitude: 30.67, longitude: 104.07 },
-  { latitude: 34.76, longitude: 113.65 },
-  { latitude: 29.65, longitude: 91.13 },
-  { latitude: 43.82, longitude: 87.62 }
-];
 
 class Statistics extends Component {
   constructor(props) {
@@ -26,45 +17,9 @@ class Statistics extends Component {
   }
 
   initalECharts() {
-    const data = [
-      { name: '黑龙江', area: '东北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '吉林', area: '东北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '辽宁', area: '东北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '内蒙古', area: '其他', type: 'areaCenterCity', InValue: '0' },
-      { name: '北京', area: '华北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '天津', area: '华北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '河北', area: '华北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '山东', area: '华北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '山西', area: '华北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '江苏', area: '华东大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '上海', area: '华东大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '浙江', area: '华东大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '福建', area: '华南大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '广东', area: '华南大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '海南', area: '华南大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '台湾', area: '其他', type: 'areaCenterCity', InValue: '0' },
-      { name: '香港', area: '其他', type: 'areaCenterCity', InValue: '0' },
-      { name: '澳门', area: '其他', type: 'areaCenterCity', InValue: '0' },
-      { name: '河南', area: '华北大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '安徽', area: '华中大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '江西', area: '华中大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '广东', area: '华南大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '陕西', area: '华西大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '湖北', area: '华中大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '湖南', area: '华中大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '广西', area: '华南大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '宁夏', area: '华西大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '重庆', area: '华西大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '贵州', area: '华西大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '四川', area: '华西大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '云南', area: '华西大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '甘肃', area: '华西大区', type: 'areaCenterCity', InValue: '0' },
-      { name: '青海', area: '其他', type: 'areaCenterCity', InValue: '0' },
-      { name: '西藏', area: '其他', type: 'areaCenterCity', InValue: '0' },
-      { name: '新疆', area: '其他', type: 'areaCenterCity', InValue: '0' }
-    ];
+    const data = provienceData;
     echarts.registerMap('china', geoJson);
-    debugger;
+
     for (const item of provienceData) {
       if (item.area === '东北大区') {
         item.itemStyle = {

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

 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import GrowthStatistics from './GrowthStatistics';
 import RecentStatistics from './RecentStatistics';
 import RiskFailure from './RiskFailure';