|
@@ -246,6 +246,9 @@
|
|
|
}
|
|
|
let result = res.data;
|
|
|
for (let key in result) {
|
|
|
+ if(key == 'time'){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
let value = result[key];
|
|
|
names.push(key);
|
|
|
values.push(value);
|
|
@@ -268,6 +271,9 @@
|
|
|
}
|
|
|
let result = res.data;
|
|
|
for (let key in result) {
|
|
|
+ if(key == 'time'){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
let value = result[key];
|
|
|
names.push(key);
|
|
|
values.push(value);
|
|
@@ -361,7 +367,7 @@
|
|
|
},
|
|
|
echartsRight_1(data){
|
|
|
let names = ['民用工程', '工业工程', '市政工程', '碰口作业', '基建工程', '顶管工程'];
|
|
|
- let values = [120, 200, 150, 80, 70, 110, 130];
|
|
|
+ let values = [120, 200, 150, 80, 70, 110];
|
|
|
// names = data.name;
|
|
|
// values = data.value;
|
|
|
let myChart = echarts.init(document.getElementById('echartsRight_1'));
|
|
@@ -374,7 +380,8 @@
|
|
|
animation: false,
|
|
|
grid: {
|
|
|
top: "18%",
|
|
|
- right: "15%",
|
|
|
+ // left: "3%",
|
|
|
+ right: "3%",
|
|
|
bottom: "28%"
|
|
|
},
|
|
|
legend:{
|
|
@@ -551,15 +558,20 @@
|
|
|
},
|
|
|
echartsRight_2(data){
|
|
|
let names = ['民用工程', '工业工程', '市政工程', '碰口作业', '基建工程', '顶管工程'];
|
|
|
- let values = [120, 200, 150, 80, 70, 110, 130];
|
|
|
+ let values = [120, 200, 150, 80, 70, 110];
|
|
|
// names = data.name;
|
|
|
// values = data.value;
|
|
|
let myChart = echarts.init(document.getElementById('echartsRight_2'));
|
|
|
let option = {
|
|
|
grid: {
|
|
|
- top: "18%",
|
|
|
- right: "15%",
|
|
|
- bottom: "28%"
|
|
|
+ borderWidth: 0,
|
|
|
+ top: '18%',
|
|
|
+ // left: '10%',
|
|
|
+ right:'3%',
|
|
|
+ bottom: '28%',
|
|
|
+ textStyle: {
|
|
|
+ color: '#fff',
|
|
|
+ },
|
|
|
},
|
|
|
tooltip: {
|
|
|
trigger: 'axis',
|
|
@@ -575,16 +587,6 @@
|
|
|
borderWidth: 2,
|
|
|
padding: [20, 20, 20, 20],
|
|
|
},
|
|
|
- grid: {
|
|
|
- borderWidth: 0,
|
|
|
- top: '15%',
|
|
|
- left: '10%',
|
|
|
- right:'7%',
|
|
|
- bottom: '15%',
|
|
|
- textStyle: {
|
|
|
- color: '#fff',
|
|
|
- },
|
|
|
- },
|
|
|
legend: {
|
|
|
show:false,
|
|
|
bottom: '-3%',
|
|
@@ -649,7 +651,8 @@
|
|
|
interval: 0,
|
|
|
color: '#32ABCC',
|
|
|
fontSize: 12,
|
|
|
- formatter: '{value} %'
|
|
|
+ // formatter: '{value} %'
|
|
|
+ formatter: '{value}'
|
|
|
},
|
|
|
splitArea: {
|
|
|
show: false,
|