From d29e49e23b582cfdf2469da28113ff0dcec01faa Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 26 May 2025 11:14:06 +0800
Subject: [PATCH] 注册账号设置默认密码最后更新时间
---
ruoyi-ui/src/layout/components/AppMain.vue | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index 423437b..f6e0875 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -2,21 +2,43 @@
<section class="app-main">
<transition name="fade-transform" mode="out-in">
<keep-alive :include="cachedViews">
- <router-view :key="key" />
+ <router-view v-if="!$route.meta.link" :key="key" />
</keep-alive>
</transition>
+ <iframe-toggle />
+ <copyright />
</section>
</template>
<script>
+import copyright from "./Copyright/index"
+import iframeToggle from "./IframeToggle/index"
+
export default {
name: 'AppMain',
+ components: { iframeToggle, copyright },
computed: {
cachedViews() {
return this.$store.state.tagsView.cachedViews
},
key() {
return this.$route.path
+ }
+ },
+ watch: {
+ $route() {
+ this.addIframe()
+ }
+ },
+ mounted() {
+ this.addIframe()
+ },
+ methods: {
+ addIframe() {
+ const { name } = this.$route
+ if (name && this.$route.meta.link) {
+ this.$store.dispatch('tagsView/addIframeView', this.$route)
+ }
}
}
}
@@ -31,7 +53,11 @@
overflow: hidden;
}
-.fixed-header+.app-main {
+.app-main:has(.copyright) {
+ padding-bottom: 36px;
+}
+
+.fixed-header + .app-main {
padding-top: 50px;
}
@@ -41,7 +67,7 @@
min-height: calc(100vh - 84px);
}
- .fixed-header+.app-main {
+ .fixed-header + .app-main {
padding-top: 84px;
}
}
@@ -51,7 +77,21 @@
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
- padding-right: 15px;
+ padding-right: 6px;
}
}
+
+::-webkit-scrollbar {
+ width: 6px;
+ height: 6px;
+}
+
+::-webkit-scrollbar-track {
+ background-color: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+ background-color: #c0c0c0;
+ border-radius: 3px;
+}
</style>
--
Gitblit v1.9.3