From 9d4f45939870dde9b59d354616d87536d6274ef1 Mon Sep 17 00:00:00 2001 From: p-honggang.li <p-honggang.li@pcitc.com> Date: 星期三, 03 九月 2025 18:30:07 +0800 Subject: [PATCH] 修改交易员确认 --- src/views/layout/index.vue | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 3d30d3a..25fd5ce 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -1,27 +1,30 @@ <template> <div class="app-wrapper" :class="classObj"> - <div class="header" style="width: auto; overflow: inherit" v-if="!containerOperate?.specialcontainer"> + <!-- 澶撮儴鑿滃崟 - 鏍规嵁鐜閰嶇疆鏄剧ず --> + <div class="header" style="width: auto; overflow: inherit" v-if="!containerOperate?.specialcontainer && menuConfig.showHeader"> <AppHeader @menuCollapse="changeMenuCollapse"></AppHeader> </div> - <div class="header" style="width: auto; overflow: inherit" v-if="containerOperate?.specialcontainer"> + <div class="header" style="width: auto; overflow: inherit" v-if="containerOperate?.specialcontainer && menuConfig.showHeader"> <template v-if="currentMenuCode!='activityInitiate'&¤tMenuCode!='activityInitiate6'"> <AppActHeader ref='appActHeaderRef' ></AppActHeader> </template> </div> <div :class="containerOperate?.specialcontainer?'content-wrapperall':'content-wrapper'"> + <!-- 宸︿晶鑿滃崟 - 鏍规嵁鐜閰嶇疆鏄剧ず --> <LeftSidebar - v-if="!containerOperate?.specialcontainer" + v-if="!containerOperate?.specialcontainer && menuConfig.showLeftMenu" class="sidebar-container" :menuState="menuState" ></LeftSidebar> <div class="main-container"> - <topMenu class="nav-head" v-if="!containerOperate?.specialcontainer"></topMenu> + <!-- 椤堕儴鑿滃崟 - 鏍规嵁鐜閰嶇疆鏄剧ず --> + <topMenu class="nav-head" v-if="!containerOperate?.specialcontainer && menuConfig.showTopMenu"></topMenu> <!-- <el-main class="main"> <Breadcrumb id="breadcrumb" class="breadcrumb" /> </el-main> --> <el-scrollbar class="scrollbar-main" - :style="{ 'max-height': 'calc(95vh - 90px)','min-width':'900px' }" + :style="{ 'max-height': layoutConfig.mainContainerHeight, 'min-width':'900px' }" ref="scrollViewContainer" > <router-view v-slot="{ Component, route }"> @@ -36,7 +39,8 @@ </transition> </router-view> </el-scrollbar> - <div class="fontDiv">涓浗浜ら�氬缓璁鹃泦鍥㈡湁闄愬叕鍙� 鐗堟潈鎵�鏈�</div> + <!-- 鐗堟潈淇℃伅 - 鏍规嵁鐜閰嶇疆鏄剧ず --> + <div class="fontDiv" v-if="menuConfig.showFooter">涓浗浜ら�氬缓璁鹃泦鍥㈡湁闄愬叕鍙� 鐗堟潈鎵�鏈�</div> </div> </div> </div> @@ -53,6 +57,8 @@ import { storeToRefs } from 'pinia' import { useNavTabs } from '@/stores/modules/navTabs' import { useRoute } from 'vue-router' +// 瀵煎叆鐜閰嶇疆宸ュ叿 +import { getMenuConfig, getLayoutConfig } from '@/utils/env' const navTabsStore = useNavTabs() const appActHeaderRef=ref() @@ -60,6 +66,11 @@ const { cachedViews, excludeViews } = storeToRefs(navTabsStore) const scrollViewContainer = ref() const isRouterAlive = ref<boolean>(true) + +// 鐜閰嶇疆 +const menuConfig = computed(() => getMenuConfig()) +const layoutConfig = computed(() => getLayoutConfig()) + const reload = () => { isRouterAlive.value = false nextTick(() => { @@ -118,7 +129,7 @@ .content-wrapper { width: 100%; - height: calc(100vh - 70px); + height: calc(100vh); display: flex; } .content-wrapperall{ -- Gitblit v1.8.0