diff --git a/src/components/chart/lineChart.vue b/src/components/chart/lineChart.vue index 54a797c9..720749e5 100644 --- a/src/components/chart/lineChart.vue +++ b/src/components/chart/lineChart.vue @@ -255,13 +255,14 @@ export default { return ele.in_flow + ele.out_flow; }); } else if (this.title == '车头时距') { + console.log("车头时距",newVal) this.tooltip = { formatter: '{a} {b}:{c}/s', show: true, confine: true }; this.series[0].data = newVal.map(val => { - return val.ave_speed; + return val.headway; }); } else if (this.title == '排队数') { this.series[0].data = newVal.map(val => { @@ -272,7 +273,9 @@ export default { return val.n_stay; }); } else if (this.title == '延误') { - this.series[0].data = newVal.map(val => {}); + this.series[0].data = newVal.map(val => { + return val.ave_delay; + }); } else if (this.title == '拥堵') { this.series[0].data = newVal.map(val => {}); } diff --git a/src/components/target/typeChart.vue b/src/components/target/typeChart.vue index 3a4b3ce9..f636cb9c 100644 --- a/src/components/target/typeChart.vue +++ b/src/components/target/typeChart.vue @@ -30,27 +30,32 @@
速度
- {{ typeValue.speed }} + + {{ dataArr[0].speed }}
流量
- {{ typeValue.flow }} + {{ dataArr[0].flow }}
车头时距
- {{ typeValue.heavy }} + {{ dataArr[0].headway}}
排队数 - {{ typeValue.n_queue }} + {{ dataArr[0].n_queue }}
检测数 - {{ typeValue.n_stay }} + {{ dataArr[0].n_stay }} +
+
+ 延误 + {{ dataArr[0].ave_delay }}
- {{ typeValue.time }} + {{ dataArr[0].time }}
@@ -68,7 +73,7 @@ {{ this.chartName + '-' + this.componentName + '-' + '表格' }}
- {{ typeValue.time }} + {{ dataArr[0].time }}
diff --git a/src/views/bounced/dataBoard.vue b/src/views/bounced/dataBoard.vue index 38b75598..58a6e88b 100644 --- a/src/views/bounced/dataBoard.vue +++ b/src/views/bounced/dataBoard.vue @@ -3,15 +3,11 @@ -
+
-
+
- + @@ -498,7 +576,7 @@ export default { /deep/ .el-scrollbar__view { display: inline-block !important; - width: 100%; + width: 100% } /deep/ .el-scrollbar__wrap { @@ -512,6 +590,7 @@ export default { .dataBoard { height: 100%; } + } .dataBoard .region, @@ -601,4 +680,4 @@ export default { .active { transition: all 0.5s linear; } - + \ No newline at end of file