Commit 4f27b07d authored by 吴俊凯's avatar 吴俊凯

巡检统计提交

parent c7da753f
...@@ -116,7 +116,14 @@ ...@@ -116,7 +116,14 @@
//地图zoom显示级别 //地图zoom显示级别
// showZoom: [7, 13, 18], // showZoom: [7, 13, 18],
//离线地图地址 //离线地图地址
picURI: 'http://172.16.3.121:8001/shanxi/amap' picURI: 'http://172.16.3.121:8001/shanxi/amap',
//获取Echarts字体然后,不配置默认为黑色
theme: {
echarts: {
color: 'white'
}
}
}; };
// 配置日志系统 // 配置日志系统
......
...@@ -71,6 +71,10 @@ ...@@ -71,6 +71,10 @@
text-align: left; text-align: left;
background-color: $biz-title-color; //rgba(40, 40, 40, 1); background-color: $biz-title-color; //rgba(40, 40, 40, 1);
} }
.point-month-ins-content {
width: 100%;
height: 333px !important;
}
} }
.danger-month-ins { .danger-month-ins {
......
...@@ -182,6 +182,12 @@ ...@@ -182,6 +182,12 @@
.amos-cardpane-head-title { .amos-cardpane-head-title {
font-size: 18px; font-size: 18px;
line-height: 40px; line-height: 40px;
.amos-cardpane-head-content {
height: '100%';
width: '100%';
color: black;
background-color: transparent;
}
} }
.amos-cardpane-body { .amos-cardpane-body {
......
...@@ -3,6 +3,10 @@ import PropTypes from 'prop-types'; ...@@ -3,6 +3,10 @@ import PropTypes from 'prop-types';
import AmosEcharts from 'amos-viz/lib/echarts'; import AmosEcharts from 'amos-viz/lib/echarts';
import { fetchMonthCountChkAction } from './../../../services/checkInfoService'; import { fetchMonthCountChkAction } from './../../../services/checkInfoService';
import moment from 'moment'; import moment from 'moment';
import * as endConf from 'amos-processor/lib/config/endconf';
const AmosConfig = endConf.AmosConfig;
const theme = AmosConfig.theme;
/** /**
* 巡检点统计 * 巡检点统计
* @class MonthlyInspection * @class MonthlyInspection
...@@ -46,6 +50,10 @@ class MonthlyInspection extends Component { ...@@ -46,6 +50,10 @@ class MonthlyInspection extends Component {
} }
getOptions() { getOptions() {
let typeface = 'black';
if (theme) {
typeface = theme.echarts.color;
}
return { return {
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
...@@ -131,7 +139,7 @@ class MonthlyInspection extends Component { ...@@ -131,7 +139,7 @@ class MonthlyInspection extends Component {
axisLabel: { axisLabel: {
show: true, show: true,
textStyle: { textStyle: {
color: 'black' //'#FFFFFF' color: typeface //'#FFFFFF'
} }
}, },
splitLine: { splitLine: {
...@@ -151,7 +159,7 @@ class MonthlyInspection extends Component { ...@@ -151,7 +159,7 @@ class MonthlyInspection extends Component {
// }, // },
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: 'black' //'#FFFFFF' color: typeface //'#FFFFFF'
} }
}, },
splitLine: { splitLine: {
...@@ -216,7 +224,9 @@ class MonthlyInspection extends Component { ...@@ -216,7 +224,9 @@ class MonthlyInspection extends Component {
return ( return (
<div className="point-month-ins"> <div className="point-month-ins">
<div className="point-month-ins-title">本月巡检情况统计</div> <div className="point-month-ins-title">本月巡检情况统计</div>
<AmosEcharts option={option} /> <div className="point-month-ins-content">
<AmosEcharts option={option} />
</div>
</div> </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