diff --git a/1.5dist.zip b/1.5dist.zip deleted file mode 100644 index 3dd479a..0000000 Binary files a/1.5dist.zip and /dev/null differ diff --git a/122dist.zip b/122dist.zip deleted file mode 100644 index 0b9b8f9..0000000 Binary files a/122dist.zip and /dev/null differ diff --git a/dist11.25.zip b/dist11.25.zip deleted file mode 100644 index eab9d07..0000000 Binary files a/dist11.25.zip and /dev/null differ diff --git a/src/views/monitor/components/box-1.vue b/src/views/monitor/components/box-1.vue index cbeb1f7..434a562 100644 --- a/src/views/monitor/components/box-1.vue +++ b/src/views/monitor/components/box-1.vue @@ -80,12 +80,12 @@ -
+
+ :data="jamXAxisData" height="350" />
@@ -625,10 +625,9 @@ } .box { flex: 1; - height: vh(340); + height: vh(400); background-image: url('@/assets/images/bg-3.png'); background-size: 100% 100%; - // .title-2 { // width: vw(253); // height: vh(28); diff --git a/src/views/monitor/components/traffic-jam.vue b/src/views/monitor/components/traffic-jam.vue index 38b6be7..b0fe39f 100644 --- a/src/views/monitor/components/traffic-jam.vue +++ b/src/views/monitor/components/traffic-jam.vue @@ -46,7 +46,7 @@ left: '4%', right: '8%', top: '10%', - bottom: '14%', + bottom: '2%', containLabel: true }, xAxis: { @@ -61,7 +61,7 @@ } }, axisLabel: { - fontSize: fitChartSize(20), + fontSize: fitChartSize(16), color: 'rgba(255,255,255,0.9)' }, data: getXAxisData() @@ -79,7 +79,7 @@ type: 'value', axisLabel: { show: true, - fontSize: fitChartSize(20), + fontSize: fitChartSize(18), color: 'rgba(255,255,255,0.9)' }, splitLine: { @@ -94,7 +94,7 @@ { type: 'bar', data: getSeriesData(), - barWidth: fitChartSize(40), + barWidth: fitChartSize(32), label: { show: true, position: 'top', @@ -139,7 +139,8 @@