diff --git a/src/assets/css/main.css b/src/assets/css/main.css index c1f7db9..c1e330b 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -24,13 +24,40 @@ i { } .table-container { + flex: 1; + overflow: auto; background-color: #fff; padding: 22px 17px; box-sizing: border-box; border-radius: 5px; box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.12); + /* scrollbar-width: none; + -ms-overflow-style: none; */ } +.el-card { + flex-shrink: 0; +} + +.table-container::-webkit-scrollbar { + width: 6px; + height: 6px; +} + +.table-container::-webkit-scrollbar-thumb { + background-color: #B2B2B2; + border-radius: 4px; +} + +.table-container::-webkit-scrollbar-track:hover { + background-color: #fff; +} + +.table-container::-webkit-scrollbar-thumb:hover { + background-color: #909399; +} + + .el-table th { background-color: #f5f7fa !important; } @@ -108,6 +135,17 @@ i { --active-color: var(--el-color-primary); } + +.container { + flex: 1; + padding: 0 20px; + box-sizing: border-box; + overflow: hidden; + display: flex; + flex-direction: column; +} + + .noScrollbar { scrollbar-width: none; -ms-overflow-style: none; diff --git a/src/views/monitoringCenter/index.vue b/src/views/monitoringCenter/index.vue index 9aa4ed6..d34b048 100644 --- a/src/views/monitoringCenter/index.vue +++ b/src/views/monitoringCenter/index.vue @@ -118,7 +118,7 @@ const getdeviceList = async () => { const res = await deviceList(devicePaging); deviceData.value = res.records; if (res.records.length > 0) { - deviceInfo.value = res.records[1]; + deviceInfo.value = res.records[0]; getHealthLatestData(); getLocateRecord(); IntervalFn(); diff --git a/src/views/synthesizeManage/setting/index.vue b/src/views/synthesizeManage/setting/index.vue index 97ee240..d819b58 100644 --- a/src/views/synthesizeManage/setting/index.vue +++ b/src/views/synthesizeManage/setting/index.vue @@ -81,10 +81,11 @@