From 694ffa950bf2435affef95272c7bfd6b62704639 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/layout/index.vue | 132 ++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 60 deletions(-)
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 37ab14d..3424c5b 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,18 +1,18 @@
<template>
<div :class="classObj" class="app-wrapper">
- <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+ <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
<sidebar class="sidebar-container" />
<div class="main-container">
- <div :class="{'fixed-header':fixedHeader}">
+ <div :class="{ 'fixed-header': fixedHeader }">
<navbar />
</div>
<div class="clearFixed" />
<!-- 娓呴櫎瀹氫綅鐨勫奖鍝� -->
<div class="breadcrumb">
- <Breadcrumb class="breadcrumb-container" ref="breadcrumb" />
+ <Breadcrumb class="breadcrumb-container" ref="breadcrumb" />
</div>
<div class="app-main">
- <app-main ref="main" @triggerCombackBtn="triggerCombackBtn"/>
+ <app-main ref="main" @triggerCombackBtn="triggerCombackBtn" />
</div>
</div>
</div>
@@ -51,20 +51,26 @@
}
}
},
+ created() {
+ if (sessionStorage.getItem("flushPage") == 0) {
+ location.reload();
+ sessionStorage.setItem("flushPage",1)
+ }
+ },
methods: {
handleClickOutside() {
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
},
- combackPlan(){
- this.$refs.main.childMethod()
+ combackPlan() {
+ this.$refs.main.childMethod()
},
- indexAdd(){
+ indexAdd() {
this.$refs.main.mainAdd()
},
- showIndexAdd(){
+ showIndexAdd() {
this.$refs.breadcrumb.showadd()
},
- triggerCombackBtn(){
+ triggerCombackBtn() {
this.$refs.breadcrumb.triggerBtnPlan()
}
}
@@ -72,63 +78,69 @@
</script>
<style lang="scss" scoped>
- @import "~@/styles/mixin.scss";
- @import "~@/styles/variables.scss";
+@import "~@/styles/mixin.scss";
+@import "~@/styles/variables.scss";
- .app-wrapper {
- @include clearfix;
- position: relative;
- height: 100%;
- width: 100%;
- &.mobile.openSidebar{
- position: fixed;
- top: 0;
- }
- .sidebar-container{
- box-shadow: 0 0 0.857143rem rgba(0,0,0,.12);
- }
- .main-container{
- position: relative;
- background: #f0f2f5;
- .clearFixed{
- height: 50px;
- }
- .breadcrumb{
- position: fixed;
- left: 0.57rem !important;
- width: 93.8%;
- z-index: 999;
- }
- .app-main{
- margin-top: 4vh;
- }
- }
- }
- .drawer-bg {
- background: #000;
- opacity: 0.3;
- width: 100%;
- top: 0;
- height: 100%;
- position: absolute;
- z-index: 999;
- }
+.app-wrapper {
+ @include clearfix;
+ position: relative;
+ height: 100%;
+ width: 100%;
- .fixed-header {
+ &.mobile.openSidebar {
position: fixed;
top: 0;
- right: 0;
- z-index: 9;
- width: calc(100% - #{$sideBarWidth});
- // width: calc(100% - 100px);
- transition: width 0.28s;
}
- .hideSidebar .fixed-header {
- width: calc(100% - #{$sideBarWidth})
+ .sidebar-container {
+ box-shadow: 0 0 0.857143rem rgba(0, 0, 0, .12);
}
- .mobile .fixed-header {
- width: 100%;
+ .main-container {
+ position: relative;
+ background: #f0f2f5;
+
+ .clearFixed {
+ height: 50px;
+ }
+
+ .breadcrumb {
+ position: fixed;
+ left: 0.57rem !important;
+ width: 93.8%;
+ z-index: 999;
+ }
+
+ .app-main {
+ margin-top: 4vh;
+ }
}
-</style>
+}
+
+.drawer-bg {
+ background: #000;
+ opacity: 0.3;
+ width: 100%;
+ top: 0;
+ height: 100%;
+ position: absolute;
+ z-index: 999;
+}
+
+.fixed-header {
+ position: fixed;
+ top: 0;
+ right: 0;
+ z-index: 9;
+ width: calc(100% - #{$sideBarWidth});
+ // width: calc(100% - 100px);
+ transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+ width: calc(100% - #{$sideBarWidth})
+}
+
+.mobile .fixed-header {
+ width: 100%;
+}</style>
--
Gitblit v1.9.3