diff --git a/web/src/view/layout/bottomInfo/bottomInfo.vue b/web/src/view/layout/bottomInfo/bottomInfo.vue new file mode 100644 index 0000000000000000000000000000000000000000..889136fed43811dd4c1737d28aff29ed12debf8e --- /dev/null +++ b/web/src/view/layout/bottomInfo/bottomInfo.vue @@ -0,0 +1,37 @@ + + + diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue index 85df0b76d8903f54142a7196eea74c9b8759aebe..64df2c2988a15b7fdfa565dd97978d9ffb439580 100644 --- a/web/src/view/layout/index.vue +++ b/web/src/view/layout/index.vue @@ -64,6 +64,7 @@ + @@ -91,6 +92,7 @@ import Aside from '@/view/layout/aside' import HistoryComponent from '@/view/layout/aside/historyComponent/history' import Screenfull from '@/view/layout/screenfull' import Search from '@/view/layout/search/search' +import BottomInfo from '@/view/layout/bottomInfo/bottomInfo' import { mapGetters, mapActions } from 'vuex' import { changePassword } from '@/api/user' export default { @@ -135,7 +137,8 @@ export default { Aside, HistoryComponent, Screenfull, - Search + Search, + BottomInfo }, methods: { ...mapActions('user', ['LoginOut']), @@ -241,6 +244,7 @@ $mainHight: 100vh; z-index: 999; } .admin-box { + min-height: calc(100vh - 240px); background-color: rgb(255, 255, 255); margin-top: 100px; } @@ -272,7 +276,7 @@ $mainHight: 100vh; // padding: 6px; // border-bottom: 1px solid #eee; } - + &.el-main { overflow: auto; background: #fff; @@ -366,6 +370,7 @@ $mainHight: 100vh; } } + .screenfull { display: inline-block; }