lixiaobang
/
TransFlow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug修改

This commit is contained in:
qiudan 2023-11-16 17:39:29 +08:00
parent 4cdf66ec1c
commit 1bc240416b
7 changed files with 204 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/chart/lineChart.vue
View File

@ -369,6 +369,9 @@ export default {
}; };
series[0].data = newVal.map((val) => { series[0].data = newVal.map((val) => {
if (timeMode == '固定间隔') { if (timeMode == '固定间隔') {
if (val.ave_headway == -1) {
return '-';
}
return val.ave_headway; return val.ave_headway;
} else { } else {
return val.headway; return val.headway;

301
src/components/chart/pieChart.vue
View File

@ -1,162 +1,167 @@
<template> <template>
<div style="width: 100%; margin-top: 5px"> <div style="width: 100%; margin-top: 5px">
<div class="tableTitle"> <div class="tableTitle">
<div> <div>
<span <span
style=" style="
width: 10px; width: 10px;
height: 10px; height: 10px;
border-radius: 50%; border-radius: 50%;
background-color: #3297ff; background-color: #3297ff;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: 8px; margin-right: 8px;
" "
></span> ></span>
<span <span style="font-size: 18px">{{this.componentName + '-' + this.chartName + '-' + '饼状图'+'-'+status, }}</span>
style="font-size: 18px" </div>
>{{this.componentName + '-' + this.chartName + '-' + '饼状图'+'-'+status, }}</span </div>
> <div id="pieChart" ref="pieChart" style="width: 705px; height: 300px"></div>
</div>
</div> </div>
<div id="pieChart" ref="pieChart" style="width: 705px; height: 300px"></div>
</div>
</template> </template>
<script> <script>
export default { export default {
name: "pieChart", //饼图图组件 name: 'pieChart', //饼图图组件
props: { props: {
list: { list: {
type: Array, type: Array,
default() { default() {
return []; return [];
}, }
},
componentName: {
type: String,
},
chartName: {
type: String,
},
typeValue: {
type: Object,
},
status: {
type: String,
},
},
data() {
return {};
},
created() {},
methods: {
drawPie(newVal) {
if (newVal&&newVal.type_data&&newVal.type_data.length>0) {
var legend = newVal.type_data.map((ele) => {
return ele.name;
});
var seriesData = [];
newVal.type_data.forEach((ele) => {
seriesData.push({
name: ele.name,
value: ele.quantity,
});
});
this.drawPie();
}
let myChart = this.$echarts.getInstanceByDom(this.$refs.pieChart);
if (myChart == null) {
myChart = this.$echarts.init(this.$refs.pieChart);
}
var color = [
"#0CD2E6",
"#3751E6",
"#FFC722",
"#00FFFF",
"#00FF80",
"#FFEA00",
"#FF7300",
"#9500B3",
"#3377FF",
"#5087EC",
"#68BBC4",
"#58A55C",
"#F2BD42",
"#EE752F",
"#D95040",
"#14CAFB"
];
let option = {
// title: {
// show: true,
// text: this.componentName + '-' + this.chartName + '-' + '饼状图',
// textStyle: {
// lineHeight: '30'
// }
// },
color: color,
animation: false,
legend: {
top: 20,
right: "center",
textStyle: {},
data: legend,
}, },
tooltip: {}, componentName: {
series: [ type: String
{ },
type: "pie", chartName: {
center: ["50%", "55%"], type: String
radius: "70%", },
label: { typeValue: {
normal: { type: Object
show: false, },
}, status: {
}, type: String
labelLine: { }
show: false,
length: 0,
length2: 0,
},
label: {
normal: {
show: true,
position: "inside",
formatter: "{value|{c}}",
rich: {
value: {
fontSize: 20,
color: "#ffffff",
},
},
},
},
data: seriesData,
},
],
};
myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();
});
// this.$nextTick(() => {
// myChart.setOption(option)
// myChart.resize();
// })
}, },
}, data() {
mounted() {}, return {};
watch: { },
// 监听单个的数据 created() {},
}, methods: {
drawPie(newVal) {
// var legend = [];
if (newVal && newVal.type_data && newVal.type_data.length > 0) {
// var legend = newVal.type_data.map((ele) => {
// return ele.name;
// });
var seriesData = [];
newVal.type_data.forEach((ele) => {
console.log(JSON.stringify(ele))
if (ele.quantity != 0) {
seriesData.push({
name: ele.name,
value: ele.quantity
});
// legend.push(ele.name)
}
});
this.drawPie();
}
let myChart = this.$echarts.getInstanceByDom(this.$refs.pieChart);
if (myChart == null) {
myChart = this.$echarts.init(this.$refs.pieChart);
}
var color = [
'#0CD2E6',
'#3751E6',
'#FFC722',
'#00FFFF',
'#00FF80',
'#FFEA00',
'#FF7300',
'#9500B3',
'#3377FF',
'#5087EC',
'#68BBC4',
'#58A55C',
'#F2BD42',
'#EE752F',
'#D95040',
'#14CAFB'
];
let option = {
// title: {
// show: true,
// text: this.componentName + '-' + this.chartName + '-' + '饼状图',
// textStyle: {
// lineHeight: '30'
// }
// },
color: color,
animation: false,
legend: {
top: 20,
right: 10,
bottom: 20,
orient: 'vertical',
textStyle: {},
// data: legend
},
tooltip: {},
series: [
{
type: 'pie',
center: ['30%', '55%'],
radius: '70%',
label: {
normal: {
show: false
}
},
labelLine: {
show: false,
length: 0,
length2: 0
},
label: {
normal: {
show: true,
position: 'inside',
formatter: '{value|{c}}',
rich: {
value: {
fontSize: 20,
color: '#ffffff'
}
}
}
},
data: seriesData
}
]
};
myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
// this.$nextTick(() => {
// myChart.setOption(option)
// myChart.resize();
// })
}
},
mounted() {},
watch: {
// 监听单个的数据
}
}; };
</script> </script>
<style scoped> <style scoped>
.tableTitle { .tableTitle {
background: #f7f8fa; background: #f7f8fa;
margin-bottom: 5px; margin-bottom: 5px;
padding: 8px; padding: 8px;
} }
</style> </style>

5
src/components/sensorFusion/echartsLine.vue
View File

@ -63,6 +63,11 @@ export default {
if (key == 'speed' && item[key]) { if (key == 'speed' && item[key]) {
return Math.abs(item[key]); return Math.abs(item[key]);
} }
if ((key == 'ave_headway' || key == 'headway') && item[key]) {
if (item[key] == -1) {
return '-';
}
}
return item[key]; return item[key];
}); });
}, },

25
src/components/sensorFusion/echartsPie.vue
View File

@ -93,6 +93,15 @@ export default {
} }
} }
} }
if(seriesData&&seriesData.length>0){
let temp=[];
seriesData.forEach((ele) => {
if (ele.value != 0) {
temp.push(ele)
}
})
seriesData = temp
}
var color = [ var color = [
'#0CD2E6', '#0CD2E6',
@ -122,11 +131,17 @@ export default {
color: color, color: color,
animation: false, animation: false,
legend: { legend: {
top: 20, top: 5,
right: 'center', right: 5,
bottom: 5,
orient: 'vertical',
textStyle: {}, textStyle: {},
type: 'scroll', type: 'scroll',
width: '80%' // top: 0,
// right: 'center',
// textStyle: {},
// type: 'scroll',
// width: '80%'
// data: [ // data: [
// { // {
// name: '流量_1-zone2-饼状图-实时触发', // name: '流量_1-zone2-饼状图-实时触发',
@ -153,9 +168,9 @@ export default {
}, },
series: [ series: [
{ {
name: '流量_1-zone2-饼状图-实时触发', name: '',
type: 'pie', type: 'pie',
center: ['50%', '55%'], center: ['33%', '50%'],
radius: '70%', radius: '70%',
label: { label: {
normal: { normal: {

5
src/components/target/typeChart.vue
View File

@ -391,7 +391,8 @@ export default {
this.cycleAccumulateDataArr[0].headway = val[0].headway; this.cycleAccumulateDataArr[0].headway = val[0].headway;
} }
if (val[0].ave_headway) { if (val[0].ave_headway) {
this.cycleAccumulateDataArr[0].headway = val[0].ave_headway;
this.cycleAccumulateDataArr[0].headway = val[0].ave_headway==-1?'-':val[0].ave_headway;
} }
if (val[0].n_stay) { if (val[0].n_stay) {
this.cycleAccumulateDataArr[0].n_stay = val[0].n_stay; this.cycleAccumulateDataArr[0].n_stay = val[0].n_stay;
@ -424,7 +425,7 @@ export default {
this.newDataArr[0].headway = val[0].headway; this.newDataArr[0].headway = val[0].headway;
} }
if (val[0].ave_headway) { if (val[0].ave_headway) {
this.newDataArr[0].headway = val[0].ave_headway; this.newDataArr[0].headway = val[0].ave_headway==-1?'-':val[0].ave_headway;
} }
if (val[0].n_stay) { if (val[0].n_stay) {
this.newDataArr[0].n_stay = val[0].n_stay; this.newDataArr[0].n_stay = val[0].n_stay;

4
src/views/general/AboutMachine.vue
View File

@ -675,8 +675,8 @@ export default {
}, },
// 备份服务器事件 // 备份服务器事件
backupHandle() { backupHandle() {
var ipUrl = window.location.origin // var ipUrl = window.location.origin
// var ipUrl = '172.16.1.168' var ipUrl = '172.16.1.168'
this.$confirm('此操作将备份操作, 是否继续?', '提示', { this.$confirm('此操作将备份操作, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',

29
src/views/sensorFusion/index.vue
View File

@ -3519,11 +3519,15 @@ export default {
// console.log('固定间隔', msgN); // console.log('固定间隔', msgN);
for (let j = 0; j < msgN.length; j++) { for (let j = 0; j < msgN.length; j++) {
//处理speed正负值和-1，卡片区在html上处理了，数据源不做处理 //处理speed正负值和-1，卡片区在html上处理了，数据源不做处理
let newSpeed = '-'; let newSpeed = '-',aveHeadway = msgN[j].ave_headway;
if ((msgN[j].speed && msgN[j].speed != -1) || msgN[j].speed === 0) { if ((msgN[j].speed && msgN[j].speed != -1) || msgN[j].speed === 0) {
newSpeed = Math.abs(msgN[j].speed); newSpeed = Math.abs(msgN[j].speed);
} }
if (msgN[j].ave_headway == -1) {
aveHeadway = '-';
}
if (msgN[j].component_type == '车头时距') { if (msgN[j].component_type == '车头时距') {
// console.log('固定间隔-车头时距', sgN[j]);
//图表区数组加表格数据 //图表区数组加表格数据
let carTou = { let carTou = {
name: msgN[j].name, name: msgN[j].name,
@ -3536,7 +3540,7 @@ export default {
ave_occ: msgN[j].ave_occ, ave_occ: msgN[j].ave_occ,
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
speed: newSpeed, speed: newSpeed,
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
avg: msgN[j].avg, avg: msgN[j].avg,
max: msgN[j].max, max: msgN[j].max,
med: msgN[j].med, med: msgN[j].med,
@ -3559,7 +3563,7 @@ export default {
}); });
//卡片区 //卡片区
let map = { let map = {
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
time: msgN[j].time time: msgN[j].time
}; };
this.$nextTick(() => { this.$nextTick(() => {
@ -3597,7 +3601,7 @@ export default {
ave_occ: msgN[j].ave_occ, ave_occ: msgN[j].ave_occ,
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
speed: newSpeed, speed: newSpeed,
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
avg: msgN[j].avg, avg: msgN[j].avg,
max: msgN[j].max, max: msgN[j].max,
med: msgN[j].med, med: msgN[j].med,
@ -3647,7 +3651,7 @@ export default {
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
speed: newSpeed, speed: newSpeed,
type_data: msgN[j].type_data, type_data: msgN[j].type_data,
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
avg: msgN[j].avg, avg: msgN[j].avg,
max: msgN[j].max, max: msgN[j].max,
med: msgN[j].med, med: msgN[j].med,
@ -3697,7 +3701,7 @@ export default {
ave_occ: msgN[j].ave_occ, ave_occ: msgN[j].ave_occ,
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
speed: newSpeed, speed: newSpeed,
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
avg: msgN[j].avg, avg: msgN[j].avg,
max: msgN[j].max, max: msgN[j].max,
med: msgN[j].med, med: msgN[j].med,
@ -3743,7 +3747,7 @@ export default {
ave_occ: msgN[j].ave_occ, ave_occ: msgN[j].ave_occ,
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
speed: newSpeed, speed: newSpeed,
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
avg: msgN[j].avg, avg: msgN[j].avg,
max: msgN[j].max, max: msgN[j].max,
med: msgN[j].med, med: msgN[j].med,
@ -3789,7 +3793,7 @@ export default {
ave_occ: msgN[j].ave_occ, ave_occ: msgN[j].ave_occ,
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
speed: newSpeed, speed: newSpeed,
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
avg: msgN[j].avg, avg: msgN[j].avg,
max: msgN[j].max, max: msgN[j].max,
med: msgN[j].med, med: msgN[j].med,
@ -3837,7 +3841,7 @@ export default {
ave_occ: msgN[j].ave_occ, ave_occ: msgN[j].ave_occ,
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
speed: newSpeed, speed: newSpeed,
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
avg: msgN[j].avg, avg: msgN[j].avg,
max: msgN[j].max, max: msgN[j].max,
med: msgN[j].med, med: msgN[j].med,
@ -3891,14 +3895,17 @@ export default {
// this.cycleStatisticsData = msgN; // this.cycleStatisticsData = msgN;
for (let j = 0; j < msgN.length; j++) { for (let j = 0; j < msgN.length; j++) {
//处理speed正负值和-1，卡片区在html上处理了，数据源不做处理 //处理speed正负值和-1，卡片区在html上处理了，数据源不做处理
let newSpeed = '-'; let newSpeed = '-',aveHeadway = msgN[j].ave_headway;
if ((msgN[j].speed && msgN[j].speed != -1) || msgN[j].speed === 0) { if ((msgN[j].speed && msgN[j].speed != -1) || msgN[j].speed === 0) {
newSpeed = Math.abs(msgN[j].speed); newSpeed = Math.abs(msgN[j].speed);
} }
if (msgN[j].ave_headway == -1) {
aveHeadway = '-';
}
if (msgN[j].component_type == '车头时距') { if (msgN[j].component_type == '车头时距') {
//卡片区 //卡片区
let map = { let map = {
ave_headway: msgN[j].ave_headway, ave_headway: aveHeadway,
time: msgN[j].time time: msgN[j].time
}; };
this.$nextTick(() => { this.$nextTick(() => {