xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2023-04-19 11:13:51 +08:00
parent 4d932a504f
commit 81fa474fcc
2 changed files with 98 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/layout/components/Navbar.vue
View File

@ -7,11 +7,7 @@
@toggleClick="toggleSideBar" @toggleClick="toggleSideBar"
/> />
<breadcrumb <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
id="breadcrumb-container"
class="breadcrumb-container"
v-if="!topNav"
/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" /> <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
<div class="right-menu"> <div class="right-menu">
@ -24,7 +20,7 @@
<!-- <el-tooltip content="文档地址" effect="dark" placement="bottom"> <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
<ruo-yi-doc id="xinyilu-doc" class="right-menu-item hover-effect" /> <ruo-yi-doc id="xinyilu-doc" class="right-menu-item hover-effect" />
</el-tooltip> --> </el-tooltip>-->
<screenfull id="screenfull" class="right-menu-item hover-effect" /> <screenfull id="screenfull" class="right-menu-item hover-effect" />
@ -33,10 +29,7 @@
</el-tooltip> </el-tooltip>
</template> </template>
<el-dropdown <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
class="avatar-container right-menu-item hover-effect"
trigger="click"
>
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="avatar" class="user-avatar" /> <img :src="avatar" class="user-avatar" />
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
@ -77,7 +70,7 @@ export default {
SizeSelect, SizeSelect,
Search, Search,
xinyiluGit, xinyiluGit,
xinyiluDoc, xinyiluDoc
}, },
computed: { computed: {
...mapGetters(["sidebar", "avatar", "device"]), ...mapGetters(["sidebar", "avatar", "device"]),
@ -88,15 +81,15 @@ export default {
set(val) { set(val) {
this.$store.dispatch("settings/changeSetting", { this.$store.dispatch("settings/changeSetting", {
key: "showSettings", key: "showSettings",
value: val, value: val
}); });
}, }
}, },
topNav: { topNav: {
get() { get() {
return this.$store.state.settings.topNav; return this.$store.state.settings.topNav;
}, }
}, }
}, },
methods: { methods: {
toggleSideBar() { toggleSideBar() {
@ -106,7 +99,7 @@ export default {
this.$confirm("确定注销并退出系统吗？", "提示", { this.$confirm("确定注销并退出系统吗？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
}) })
.then(() => { .then(() => {
this.$store.dispatch("LogOut").then(() => { this.$store.dispatch("LogOut").then(() => {
@ -114,8 +107,8 @@ export default {
}); });
}) })
.catch(() => {}); .catch(() => {});
}, }
}, }
}; };
</script> </script>

2
src/store/modules/user.js
View File

@ -51,7 +51,7 @@ const user = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo().then(res => { getInfo().then(res => {
const user = res.user const user = res.user
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/logo/logo.png") : process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles) commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions) commit('SET_PERMISSIONS', res.permissions)