From 03b31652a2179f812a63af77077d826fdf05bc12 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 23 九月 2021 18:53:17 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/layout/components/Settings/index.vue | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/ruoyi-ui/src/layout/components/Settings/index.vue
index a96b73f..ffdedb4 100644
--- a/ruoyi-ui/src/layout/components/Settings/index.vue
+++ b/ruoyi-ui/src/layout/components/Settings/index.vue
@@ -41,7 +41,7 @@
<el-divider/>
<h3 class="drawer-title">绯荤粺甯冨眬閰嶇疆</h3>
-
+
<div class="drawer-item">
<span>寮�鍚� TopNav</span>
<el-switch v-model="topNav" class="drawer-switch" />
@@ -162,14 +162,8 @@
this.sideTheme = val;
},
saveSetting() {
- const loading = this.$loading({
- lock: true,
- fullscreen: false,
- text: "姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍚�...",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)"
- });
- localStorage.setItem(
+ this.$modal.loading("姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍚�...");
+ this.$cache.local.set(
"layout-setting",
`{
"topNav":${this.topNav},
@@ -181,17 +175,11 @@
"theme":"${this.theme}"
}`
);
- setTimeout(loading.close(), 1000)
+ setTimeout(this.$modal.closeLoading(), 1000)
},
resetSetting() {
- this.$loading({
- lock: true,
- fullscreen: false,
- text: "姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍚�...",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)"
- });
- localStorage.removeItem("layout-setting")
+ this.$modal.loading("姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍚�...");
+ this.$cache.local.remove("layout-setting")
setTimeout("window.location.reload()", 1000)
}
}
--
Gitblit v1.9.3