Compare commits
No commits in common. "0978f5d2bf339e943f15976f49bf8c26bed9204d" and "ed3fbc8c7af456ac5eea1dece2032a128f2aac8d" have entirely different histories.
0978f5d2bf
...
ed3fbc8c7a
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -6,14 +6,9 @@
|
|||
export default {
|
||||
name: 'barChart', //均值图图组件
|
||||
props: {
|
||||
list: {
|
||||
type: Array,
|
||||
list: Array,
|
||||
default() {
|
||||
return [];
|
||||
},
|
||||
},
|
||||
typeValue: {
|
||||
type:Object,
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
|
@ -98,7 +93,7 @@ export default {
|
|||
itemStyle: {
|
||||
color: '#DF8414'
|
||||
},
|
||||
data: [10],
|
||||
data: [arr[arr.length-1].avg],
|
||||
zlevel: 11
|
||||
},
|
||||
{
|
||||
|
|
@ -121,7 +116,7 @@ export default {
|
|||
itemStyle: {
|
||||
color: '#0E76AF'
|
||||
},
|
||||
data: [30],
|
||||
data: [arr[arr.length-1].med],
|
||||
zlevel: 11
|
||||
},
|
||||
{
|
||||
|
|
@ -129,7 +124,7 @@ export default {
|
|||
type: 'bar',
|
||||
barWidth: 150,
|
||||
barGap: '-100%',
|
||||
data: [20],
|
||||
data: [arr[arr.length-1].min],
|
||||
label: {
|
||||
show: true,
|
||||
position: 'bottom',
|
||||
|
|
@ -152,7 +147,7 @@ export default {
|
|||
type: 'bar',
|
||||
barWidth: 150,
|
||||
barGap: '-100%',
|
||||
data: [200],
|
||||
data:[arr[arr.length-1].max],
|
||||
label: {
|
||||
show: true,
|
||||
position: 'top',
|
||||
|
|
@ -180,16 +175,16 @@ export default {
|
|||
}
|
||||
},
|
||||
mounted() {
|
||||
this.drawBar()
|
||||
|
||||
},
|
||||
watch: {
|
||||
// typeValue: {
|
||||
// handler(newVal) {
|
||||
// if (newVal) {
|
||||
// this.drawBar(newVal);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
watch:{
|
||||
list:{
|
||||
handler(newVal){
|
||||
if(newVal){
|
||||
this.drawBar(newVal);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ export default {
|
|||
},
|
||||
},
|
||||
mounted() {
|
||||
this.drawBar()
|
||||
|
||||
},
|
||||
watch: {
|
||||
typeValue: {
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ export default {
|
|||
lineHeight: '30'
|
||||
}
|
||||
},
|
||||
legend:{},
|
||||
grid: {
|
||||
left: '2%',
|
||||
right: '4%',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<template>
|
||||
|
||||
<div id="pieChart" ref="pieChart" style="width:100%;height:300px;"></div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
|
@ -18,8 +20,8 @@ export default {
|
|||
chartName: {
|
||||
type: String
|
||||
},
|
||||
typeValue: {
|
||||
type: Object
|
||||
typeValue:{
|
||||
type:Object
|
||||
}
|
||||
|
||||
},
|
||||
|
|
@ -29,19 +31,7 @@ export default {
|
|||
// 图例数据
|
||||
legend: [],
|
||||
// pie图数据
|
||||
seriesData: [
|
||||
{
|
||||
name: '机动车',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name: '非机动车',
|
||||
value: 0
|
||||
}, {
|
||||
name: '行人',
|
||||
value: 0
|
||||
}
|
||||
]
|
||||
seriesData: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -59,11 +49,11 @@ export default {
|
|||
'#FFC722'
|
||||
];
|
||||
let option = {
|
||||
title: {
|
||||
show: true,
|
||||
text: this.componentName + '-' + this.chartName + '-' + '饼状图',
|
||||
textStyle: {
|
||||
lineHeight: '30',
|
||||
title:{
|
||||
show:true,
|
||||
text:this.componentName + '-' + this.chartName + '-' + '饼状图',
|
||||
textStyle:{
|
||||
lineHeight:'30',
|
||||
}
|
||||
},
|
||||
color: color,
|
||||
|
|
@ -121,7 +111,7 @@ export default {
|
|||
},
|
||||
},
|
||||
mounted() {
|
||||
this.drawPie();
|
||||
|
||||
},
|
||||
watch: {
|
||||
typeValue: {
|
||||
|
|
@ -130,7 +120,6 @@ export default {
|
|||
this.legend = newVal.type_data.map(ele => {
|
||||
return ele.name
|
||||
});
|
||||
this.seriesData = []
|
||||
newVal.type_data.forEach(ele => {
|
||||
this.seriesData.push({
|
||||
name: ele.name,
|
||||
|
|
@ -138,11 +127,13 @@ export default {
|
|||
})
|
||||
})
|
||||
this.drawPie()
|
||||
|
||||
this.seriesData = []
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped></style>
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
|
|
@ -69,14 +69,6 @@
|
|||
|
||||
</div>
|
||||
<div v-show="echartArr.includes('表格')">
|
||||
<div class="tableTitle">
|
||||
<div class="">
|
||||
|
||||
</div>
|
||||
<div class="tableTime">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="pageType == '断面'" style="margin-bottom: 20px; border: 1px solid #e4e7ed">
|
||||
<tableShow :msg="dataArr" :type="triggerType" />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -422,7 +422,7 @@ export default {
|
|||
handler(newVal) {
|
||||
this.triggerList = newVal
|
||||
// 触发数据
|
||||
console.log(newVal, 'triggerlistData');
|
||||
// console.log(newVal, 'triggerlistData');
|
||||
|
||||
this.componentList.forEach(ele => {
|
||||
if (ele.trigger == undefined && ele.timeMode == '触发') {
|
||||
|
|
|
|||
Loading…
Reference in New Issue