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

src/view/biz/analysis/report/report.scss → src/styles/view/biz/analysis/report.scss

@@ -68,7 +68,7 @@
         .card-detail {
           width: vw(233);
           height: vh(39);
-          background: url('../../../../assets/images/title_bg.png');
+          //background-image: url('../../../../assets/images/title_bg.png');
           background-size: cover;
           margin: vh(35) auto;
           text-align: center;

src/styles/view/biz/index.scss

+@import './analysis/report.scss';
+@import './analysis/reportQuery.scss';
+@import './regulate/bills.scss';
+@import './regulate/bills.scss';
+@import './regulate/supervise.scss';
 @import './situation/situation.scss';
 @import './detail/detail.scss';
 @import './situationDetail/situationDetail.scss';

src/styles/view/disaster/index.scss

@@ -33,7 +33,7 @@
       display: flex;
       align-items: center;
       padding: 0 9px 0 12px;
-      font-size: 20px;
+      font-size: 0.2rem;
       position: relative;
 
       .current {

src/view/biz/analysis/report/index.js

 import React, { Component }  from 'react';
 import { Input, Tree } from 'amos-antd';
 import CommonContainer from '../../../common/commonContainer';
-import './report.scss';
 import detaileImg from '../../../../consts/detailImages';
 
 const Search = Input.Search;

src/view/biz/analysis/reportQuery/index.js

 import React, { Component }  from 'react';
 import { Input, DatePicker } from 'amos-antd';
 import CommonContainer from '../../../common/commonContainer';
-import './reportQuery.scss';
 import detaileImg from '../../../../consts/detailImages';
 import SafeReport from './SafeReport';
 

src/view/biz/regulate/bills/index.js

@@ -6,7 +6,6 @@ import DetailContent from '../../../common/detailContent';
 import detaileImg from '../../../../consts/detailImages';
 import ContentModal from '../ContentModal';
 import { billData, alertData, safeInfo } from '../../../../_mock/safeData/data';
-import './bills.scss';
 
 const Search = Input.Search;
 const Option = Select.Option;

src/view/biz/regulate/firecontrol/index.js

@@ -5,8 +5,6 @@ import CommonContainer from './../../../common/commonContainer';
 import DetailContent from '../../../common/detailContent';
 import ContentModal from '../ContentModal';
 import { billData, alertData, safeInfo } from '../../../../_mock/safeData/data';
-import '../bills/bills.scss';
-
 
 const Search = Input.Search;
 const Option = Select.Option;

src/view/biz/regulate/supervise/index.js

@@ -5,7 +5,6 @@ import CommonContainer from './../../../common/commonContainer';
 import DetailContent from '../../../common/detailContent';
 import ContentModal from '../ContentModal';
 import { safeData, alertData, safeInfo } from '../../../../_mock/safeData/data';
-import './supervise.scss';
 
 const Search = Input.Search;
 const Option = Select.Option;