diff --git a/src/App.vue b/src/App.vue index 2fc1690..bc7bc45 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,10 +18,9 @@ export default { padding: 0px; width: 100%; height: 100%; - overflow-x: auto; } /* .app-container{ margin: 0; padding: 0; } */ - + \ No newline at end of file diff --git a/src/components/AlertChart.vue b/src/components/AlertChart.vue index 31eaee8..1335681 100644 --- a/src/components/AlertChart.vue +++ b/src/components/AlertChart.vue @@ -487,8 +487,8 @@ watch(monthlyCounts, () => { background-color: #304555; color: #fff; border-radius: 8px; - padding: 0; - margin: 0; + /* padding: 10px; */ + /* margin: 10px; */ } .alert-header { @@ -498,7 +498,9 @@ watch(monthlyCounts, () => { } .chart-container { - height: 350px; + /* min-height: 350px; */ + min-height: 41vh; + min-width: 40vw; } ::v-deep .el-tabs__item { diff --git a/src/components/Cameras.vue b/src/components/Cameras.vue index 17805a7..f691767 100644 --- a/src/components/Cameras.vue +++ b/src/components/Cameras.vue @@ -7,7 +7,7 @@
通道
- + @@ -278,6 +278,7 @@ onMounted(() => { .scroll-container { height: 170px; + height: 27vh; /* overflow-y: auto; */ } @@ -285,7 +286,7 @@ onMounted(() => { .status-summary-chart, .camera-count-chart { /* width: 100%; */ - height: 170px; + height: 27vh; } .loading-container { @@ -324,7 +325,8 @@ onMounted(() => { } .camera-row { - max-height: 250px; + max-height: 37vh; + /* max-height: 250px; */ /* max-width: 1680px; */ overflow-x: auto; /* gap: 1px; */ diff --git a/src/components/Statistics.vue b/src/components/Statistics.vue index 2a0aee8..45c014b 100644 --- a/src/components/Statistics.vue +++ b/src/components/Statistics.vue @@ -117,7 +117,7 @@ const initChart = () => { name: '告警类型', type: 'pie', radius: '50%', - center: ['50%', '150px'], + center: ['50%', '50%'], data: seriesData.value, data: [], emphasis: { @@ -177,8 +177,8 @@ onMounted(async () => { /* background: linear-gradient(to top, rgba(16, 84, 194, 0.6), rgba(31, 48, 207, 0.7)); */ color: #fff; border-radius: 8px; - margin: 0; - padding: 0; + /* margin: 10px; */ + /* padding: 10px; */ /* height: 100vh; */ } @@ -190,13 +190,15 @@ onMounted(async () => { } .stats-row { - margin-top: 20px; - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 34px; } .chart { width: 100%; - height: 365px; + /* min-height: 365px; */ + height: 41vh; + min-width: 40vw; /* height: 445px; */ } diff --git a/src/html/DataStatistics.vue b/src/html/DataStatistics.vue index fd137f1..e974929 100644 --- a/src/html/DataStatistics.vue +++ b/src/html/DataStatistics.vue @@ -1,5 +1,5 @@