From 5fdef5fc6979907ad9b37270e17f1732e726eaac Mon Sep 17 00:00:00 2001
From: lyt <1105290566@qq.com>
Date: Mon, 18 Oct 2021 20:31:11 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.10.18:=E4=BC=98=E5=8C=96tagsview?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/navBars/tagsView/tagsView.vue | 4 +---
 src/layout/routerView/iframes.vue        | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue
index 9cb52d5..61e8e36 100644
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/src/layout/navBars/tagsView/tagsView.vue
@@ -82,7 +82,7 @@ export default {
 			if (getThemeConfig.value.isShareTagsView) {
 				return v.path === state.routePath;
 			} else {
-				return v.url === state.routeActive;
+				return v.url ? v.url === state.routeActive : v.path === state.routeActive;
 			}
 		};
 		// 存储 tagsViewList 到浏览器临时缓存中，页面刷新时，保留记录
@@ -507,8 +507,6 @@ export default {
 .layout-navbars-tagsview {
 	background-color: var(--el-color-white);
 	border-bottom: 1px solid #f1f2f3;
-	z-index: 1;
-	position: relative;
 	::v-deep(.el-scrollbar__wrap) {
 		overflow-x: auto !important;
 	}
diff --git a/src/layout/routerView/iframes.vue b/src/layout/routerView/iframes.vue
index 7052325..5dab992 100644
--- a/src/layout/routerView/iframes.vue
+++ b/src/layout/routerView/iframes.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="layout-view-bg-white flex" :style="{ height: `calc(100vh - ${setIframeHeight}`, border: 'none' }" v-loading="iframeLoading">
+	<div class="layout-view-bg-white flex mt1" :style="{ height: `calc(100vh - ${setIframeHeight}`, border: 'none' }" v-loading="iframeLoading">
 		<iframe :src="iframeUrl" frameborder="0" height="100%" width="100%" id="iframe" v-show="!iframeLoading"></iframe>
 	</div>
 </template>
@@ -36,8 +36,8 @@ export default defineComponent({
 			if (isTagsViewCurrenFull) {
 				return `0px`;
 			} else {
-				if (isTagsview) return `84px`;
-				else return `50px`;
+				if (isTagsview) return `83px`;
+				else return `49px`;
 			}
 		});
 		// 页面加载时