diff --git a/企业级管理系统/web/admin_system/src/layout/Index.vue b/企业级管理系统/web/admin_system/src/layout/Index.vue index 4a52dec..7366ab4 100644 --- a/企业级管理系统/web/admin_system/src/layout/Index.vue +++ b/企业级管理系统/web/admin_system/src/layout/Index.vue @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2023-01-04 11:05:44 * @LastEditors: Kane - * @LastEditTime: 2023-01-26 01:56:37 + * @LastEditTime: 2023-01-26 10:29:03 * @FilePath: \admin_system\src\layout\Index.vue * @Description: * @@ -55,32 +55,34 @@ export default { /* min-width: 1280px; */ } -#layout-aside { - /* width: 175px; */ - background-color: #2f4156; - overflow-x: hidden; +#layout-container-down { height: calc(100vh - 50px); max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); } +#layout-aside { + /* width: 175px; */ + background-color: #2f4156; + overflow-x: hidden; + /* height: calc(100vh - 50px); + max-height: calc(100vh - 50px); + min-height: calc(100vh - 50px); */ + height: 100%; +} + #layout-header { height: 50px; - /* background-color: #77bc99; */ padding: 0px; flex-grow: 0; } #layout-main { background-color: #ecf2f9; - /* height: 0; */ + padding: 0px; + height: 100%; + /* height: calc(100vh - 50px); */ /* flex-grow: 1; */ /* overflow: overlay; */ } - -#layout-container-down { - height: calc(100vh - 50px); - max-height: calc(100vh - 50px); - min-height: calc(100vh - 50px); -} \ No newline at end of file diff --git a/企业级管理系统/web/admin_system/src/layout/components/Aside.vue b/企业级管理系统/web/admin_system/src/layout/components/Aside.vue index 23ae695..ad31cf5 100644 --- a/企业级管理系统/web/admin_system/src/layout/components/Aside.vue +++ b/企业级管理系统/web/admin_system/src/layout/components/Aside.vue @@ -2,14 +2,14 @@ * @Author: Kane * @Date: 2023-01-04 11:30:33 * @LastEditors: Kane - * @LastEditTime: 2023-01-25 23:44:43 + * @LastEditTime: 2023-01-26 08:10:40 * @FilePath: \admin_system\src\layout\components\Aside.vue * @Description: * * Copyright (c) ${2022} by Kane, All Rights Reserved. 223142 2f4156 --> - + \ No newline at end of file diff --git a/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue b/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue index 0475ed1..f3a0305 100644 --- a/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue +++ b/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue @@ -2,65 +2,71 @@ * @Author: Kane * @Date: 2023-01-25 23:13:47 * @LastEditors: Kane - * @LastEditTime: 2023-01-26 01:51:53 + * @LastEditTime: 2023-01-26 10:56:40 * @FilePath: \admin_system\src\views\requirement\RequirementManager.vue * @Description: * * Copyright (c) ${2022} by Kane, All Rights Reserved. --> @@ -84,15 +90,13 @@ export default { \ No newline at end of file