Compare commits

..

No commits in common. "0978f5d2bf339e943f15976f49bf8c26bed9204d" and "ed3fbc8c7af456ac5eea1dece2032a128f2aac8d" have entirely different histories.

19 changed files with 47 additions and 70 deletions

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

View File

@ -6,14 +6,9 @@
export default { export default {
name: 'barChart', // name: 'barChart', //
props: { props: {
list: { list: Array,
type: Array, default() {
default() { return [];
return [];
},
},
typeValue: {
type:Object,
} }
}, },
data() { data() {
@ -98,7 +93,7 @@ export default {
itemStyle: { itemStyle: {
color: '#DF8414' color: '#DF8414'
}, },
data: [10], data: [arr[arr.length-1].avg],
zlevel: 11 zlevel: 11
}, },
{ {
@ -121,7 +116,7 @@ export default {
itemStyle: { itemStyle: {
color: '#0E76AF' color: '#0E76AF'
}, },
data: [30], data: [arr[arr.length-1].med],
zlevel: 11 zlevel: 11
}, },
{ {
@ -129,7 +124,7 @@ export default {
type: 'bar', type: 'bar',
barWidth: 150, barWidth: 150,
barGap: '-100%', barGap: '-100%',
data: [20], data: [arr[arr.length-1].min],
label: { label: {
show: true, show: true,
position: 'bottom', position: 'bottom',
@ -152,7 +147,7 @@ export default {
type: 'bar', type: 'bar',
barWidth: 150, barWidth: 150,
barGap: '-100%', barGap: '-100%',
data: [200], data:[arr[arr.length-1].max],
label: { label: {
show: true, show: true,
position: 'top', position: 'top',
@ -180,16 +175,16 @@ export default {
} }
}, },
mounted() { mounted() {
this.drawBar()
}, },
watch: { watch:{
// typeValue: { list:{
// handler(newVal) { handler(newVal){
// if (newVal) { if(newVal){
// this.drawBar(newVal); this.drawBar(newVal);
// } }
// } }
// } }
} }
}; };
</script> </script>

View File

@ -128,7 +128,7 @@ export default {
}, },
}, },
mounted() { mounted() {
this.drawBar()
}, },
watch: { watch: {
typeValue: { typeValue: {

View File

@ -72,7 +72,6 @@ export default {
lineHeight: '30' lineHeight: '30'
} }
}, },
legend:{},
grid: { grid: {
left: '2%', left: '2%',
right: '4%', right: '4%',

View File

@ -1,5 +1,7 @@
<template> <template>
<div id="pieChart" ref="pieChart" style="width:100%;height:300px;"></div> <div id="pieChart" ref="pieChart" style="width:100%;height:300px;"></div>
</template> </template>
<script> <script>
@ -18,8 +20,8 @@ export default {
chartName: { chartName: {
type: String type: String
}, },
typeValue: { typeValue:{
type: Object type:Object
} }
}, },
@ -29,19 +31,7 @@ export default {
// //
legend: [], legend: [],
// pie // pie
seriesData: [ seriesData: []
{
name: '机动车',
value: 0
},
{
name: '非机动车',
value: 0
}, {
name: '行人',
value: 0
}
]
} }
}, },
created() { created() {
@ -59,11 +49,11 @@ export default {
'#FFC722' '#FFC722'
]; ];
let option = { let option = {
title: { title:{
show: true, show:true,
text: this.componentName + '-' + this.chartName + '-' + '饼状图', text:this.componentName + '-' + this.chartName + '-' + '饼状图',
textStyle: { textStyle:{
lineHeight: '30', lineHeight:'30',
} }
}, },
color: color, color: color,
@ -121,7 +111,7 @@ export default {
}, },
}, },
mounted() { mounted() {
this.drawPie();
}, },
watch: { watch: {
typeValue: { typeValue: {
@ -130,7 +120,6 @@ export default {
this.legend = newVal.type_data.map(ele => { this.legend = newVal.type_data.map(ele => {
return ele.name return ele.name
}); });
this.seriesData = []
newVal.type_data.forEach(ele => { newVal.type_data.forEach(ele => {
this.seriesData.push({ this.seriesData.push({
name: ele.name, name: ele.name,
@ -138,11 +127,13 @@ export default {
}) })
}) })
this.drawPie() this.drawPie()
this.seriesData = []
} }
} }
} }
} }
} }
</script> </script>
<style scoped></style> <style scoped>
</style>

View File

@ -69,14 +69,6 @@
</div> </div>
<div v-show="echartArr.includes('表格')"> <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"> <div v-if="pageType == '断面'" style="margin-bottom: 20px; border: 1px solid #e4e7ed">
<tableShow :msg="dataArr" :type="triggerType" /> <tableShow :msg="dataArr" :type="triggerType" />
</div> </div>

View File

@ -422,7 +422,7 @@ export default {
handler(newVal) { handler(newVal) {
this.triggerList = newVal this.triggerList = newVal
// //
console.log(newVal, 'triggerlistData'); // console.log(newVal, 'triggerlistData');
this.componentList.forEach(ele => { this.componentList.forEach(ele => {
if (ele.trigger == undefined && ele.timeMode == '触发') { if (ele.trigger == undefined && ele.timeMode == '触发') {