diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index aea5bde..d581038 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -116,7 +116,7 @@ } & .nest-menu .el-submenu > .el-submenu__title, - & .el-submenu .el-menu-item { + & .nest-menu .el-menu-item { min-width: var(--base-sidebar-width) !important; padding: 0 35px !important; @@ -124,6 +124,9 @@ background-color: rgba(0, 0, 0, 0.06) !important; } } + & .nest-menu .el-menu > .nest-menu .el-menu-item { + padding: 0 55px !important; + } & .theme-dark .nest-menu .el-submenu > .el-submenu__title, & .theme-dark .el-submenu .el-menu-item { @@ -328,18 +331,21 @@ } } } - .hideSidebar .fixed-header{ + .hideSidebar .fixed-header { width: calc(100% - 0.54rem) !important; } .el-submenu__title { font-size: 0.14rem !important; height: 0.56rem !important; line-height: 0.56rem !important; - font-size:0.14rem !important; + font-size: 0.14rem !important; padding: 0 0.2rem !important; } #app .sidebar-container .nest-menu .el-submenu > .el-submenu__title, - #app .sidebar-container .el-submenu .el-menu-item { + #app .sidebar-container .nest-menu .el-menu-item { padding: 0 0.35rem !important; } + #app .sidebar-container .nest-menu .el-menu > .nest-menu .el-menu-item { + padding: 0 0.55rem !important; + } } diff --git a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue index 6e8e74e..a4cc44b 100644 --- a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue +++ b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue @@ -1092,7 +1092,7 @@ export default { }, getPercentage(value) { // 将 progress1 的值转换为百分比 - return ((value / 3.2) * 100).toFixed(2); + return (((value - 0.1) / 3.2) * 100).toFixed(2); }, }, };