diff --git a/src/components/chart/lineChart.vue b/src/components/chart/lineChart.vue index 29d5438..ef036a6 100644 --- a/src/components/chart/lineChart.vue +++ b/src/components/chart/lineChart.vue @@ -369,6 +369,9 @@ export default { }; series[0].data = newVal.map((val) => { if (timeMode == '固定间隔') { + if (val.ave_headway == -1) { + return '-'; + } return val.ave_headway; } else { return val.headway; diff --git a/src/components/chart/pieChart.vue b/src/components/chart/pieChart.vue index e9ea145..b368a80 100644 --- a/src/components/chart/pieChart.vue +++ b/src/components/chart/pieChart.vue @@ -1,162 +1,167 @@ diff --git a/src/components/sensorFusion/echartsLine.vue b/src/components/sensorFusion/echartsLine.vue index 179acba..2cb8c28 100644 --- a/src/components/sensorFusion/echartsLine.vue +++ b/src/components/sensorFusion/echartsLine.vue @@ -63,6 +63,11 @@ export default { if (key == 'speed' && item[key]) { return Math.abs(item[key]); } + if ((key == 'ave_headway' || key == 'headway') && item[key]) { + if (item[key] == -1) { + return '-'; + } + } return item[key]; }); }, diff --git a/src/components/sensorFusion/echartsPie.vue b/src/components/sensorFusion/echartsPie.vue index ed07e19..2ea1c33 100644 --- a/src/components/sensorFusion/echartsPie.vue +++ b/src/components/sensorFusion/echartsPie.vue @@ -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 = [ '#0CD2E6', @@ -122,11 +131,17 @@ export default { color: color, animation: false, legend: { - top: 20, - right: 'center', + top: 5, + right: 5, + bottom: 5, + orient: 'vertical', textStyle: {}, type: 'scroll', - width: '80%' + // top: 0, + // right: 'center', + // textStyle: {}, + // type: 'scroll', + // width: '80%' // data: [ // { // name: '流量_1-zone2-饼状图-实时触发', @@ -153,9 +168,9 @@ export default { }, series: [ { - name: '流量_1-zone2-饼状图-实时触发', + name: '', type: 'pie', - center: ['50%', '55%'], + center: ['33%', '50%'], radius: '70%', label: { normal: { diff --git a/src/components/target/typeChart.vue b/src/components/target/typeChart.vue index 5779d1d..12027dc 100644 --- a/src/components/target/typeChart.vue +++ b/src/components/target/typeChart.vue @@ -391,7 +391,8 @@ export default { this.cycleAccumulateDataArr[0].headway = val[0].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) { this.cycleAccumulateDataArr[0].n_stay = val[0].n_stay; @@ -424,7 +425,7 @@ export default { this.newDataArr[0].headway = val[0].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) { this.newDataArr[0].n_stay = val[0].n_stay; diff --git a/src/views/general/AboutMachine.vue b/src/views/general/AboutMachine.vue index 1d696c5..e4c3795 100644 --- a/src/views/general/AboutMachine.vue +++ b/src/views/general/AboutMachine.vue @@ -675,8 +675,8 @@ export default { }, // 备份服务器事件 backupHandle() { - var ipUrl = window.location.origin - // var ipUrl = '172.16.1.168' + // var ipUrl = window.location.origin + var ipUrl = '172.16.1.168' this.$confirm('此操作将备份操作, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/sensorFusion/index.vue b/src/views/sensorFusion/index.vue index e594c89..8d558fa 100644 --- a/src/views/sensorFusion/index.vue +++ b/src/views/sensorFusion/index.vue @@ -3519,11 +3519,15 @@ export default { // console.log('固定间隔', msgN); for (let j = 0; j < msgN.length; j++) { //处理speed正负值和-1,卡片区在html上处理了,数据源不做处理 - let newSpeed = '-'; + let newSpeed = '-',aveHeadway = msgN[j].ave_headway; if ((msgN[j].speed && msgN[j].speed != -1) || msgN[j].speed === 0) { newSpeed = Math.abs(msgN[j].speed); } + if (msgN[j].ave_headway == -1) { + aveHeadway = '-'; + } if (msgN[j].component_type == '车头时距') { + // console.log('固定间隔-车头时距', sgN[j]); //图表区数组加表格数据 let carTou = { name: msgN[j].name, @@ -3536,7 +3540,7 @@ export default { ave_occ: msgN[j].ave_occ, ave_delay: msgN[j].ave_delay, speed: newSpeed, - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, avg: msgN[j].avg, max: msgN[j].max, med: msgN[j].med, @@ -3559,7 +3563,7 @@ export default { }); //卡片区 let map = { - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, time: msgN[j].time }; this.$nextTick(() => { @@ -3597,7 +3601,7 @@ export default { ave_occ: msgN[j].ave_occ, ave_delay: msgN[j].ave_delay, speed: newSpeed, - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, avg: msgN[j].avg, max: msgN[j].max, med: msgN[j].med, @@ -3647,7 +3651,7 @@ export default { ave_delay: msgN[j].ave_delay, speed: newSpeed, type_data: msgN[j].type_data, - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, avg: msgN[j].avg, max: msgN[j].max, med: msgN[j].med, @@ -3697,7 +3701,7 @@ export default { ave_occ: msgN[j].ave_occ, ave_delay: msgN[j].ave_delay, speed: newSpeed, - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, avg: msgN[j].avg, max: msgN[j].max, med: msgN[j].med, @@ -3743,7 +3747,7 @@ export default { ave_occ: msgN[j].ave_occ, ave_delay: msgN[j].ave_delay, speed: newSpeed, - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, avg: msgN[j].avg, max: msgN[j].max, med: msgN[j].med, @@ -3789,7 +3793,7 @@ export default { ave_occ: msgN[j].ave_occ, ave_delay: msgN[j].ave_delay, speed: newSpeed, - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, avg: msgN[j].avg, max: msgN[j].max, med: msgN[j].med, @@ -3837,7 +3841,7 @@ export default { ave_occ: msgN[j].ave_occ, ave_delay: msgN[j].ave_delay, speed: newSpeed, - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, avg: msgN[j].avg, max: msgN[j].max, med: msgN[j].med, @@ -3891,14 +3895,17 @@ export default { // this.cycleStatisticsData = msgN; for (let j = 0; j < msgN.length; j++) { //处理speed正负值和-1,卡片区在html上处理了,数据源不做处理 - let newSpeed = '-'; + let newSpeed = '-',aveHeadway = msgN[j].ave_headway; if ((msgN[j].speed && msgN[j].speed != -1) || msgN[j].speed === 0) { newSpeed = Math.abs(msgN[j].speed); } + if (msgN[j].ave_headway == -1) { + aveHeadway = '-'; + } if (msgN[j].component_type == '车头时距') { //卡片区 let map = { - ave_headway: msgN[j].ave_headway, + ave_headway: aveHeadway, time: msgN[j].time }; this.$nextTick(() => {