提交 74fc57ea 编写于 作者: X xinla

优化部分代码

上级 a2260850
......@@ -17,7 +17,7 @@
<div class="right-menu">
<template v-if="device !== 'mobile'">
<search id="header-search" class="right-menu-item" />
<!-- <search id="header-search" class="right-menu-item" /> -->
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<div class="right-menu-item hover-effect">
......@@ -27,7 +27,8 @@
<el-tooltip content="文档地址" effect="dark" placement="bottom">
<div class="right-menu-item hover-effect">
<svg-icon icon-class="question" @click="goto(1)" />
<i class="el-icon-reading document" @click="goto(1)"></i>
<!-- <svg-icon icon-class="question" @click="goto(1)" /> -->
</div>
</el-tooltip>
......@@ -71,7 +72,7 @@ export default {
components: {
Logo,
Search,
screenfull,
screenfull
},
computed: {
...mapGetters(['avatar', 'device', 'permission_routes']),
......@@ -82,10 +83,10 @@ export default {
set(val) {
this.$store.dispatch('settings/changeSetting', {
key: 'showSettings',
value: val,
value: val
})
},
},
}
}
},
mounted() {
// console.log(this.permission_routes)
......@@ -95,7 +96,7 @@ export default {
this.$confirm('确定注销并退出系统吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
location.href = '/'
......@@ -115,8 +116,8 @@ export default {
} else {
window.open(path, '_blank')
}
},
},
}
}
}
</script>
......@@ -159,6 +160,10 @@ export default {
background: rgba(0, 0, 0, 0.025);
}
}
.document {
font-size: 20px;
}
}
.avatar-container {
......
......@@ -5,6 +5,7 @@ const user = {
state: {
token: getToken(),
name: '',
companyName: '',
avatar: '',
roles: [],
permissions: []
......@@ -36,55 +37,66 @@ const user = {
const code = userInfo.code
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
setToken(res.token)
commit('SET_TOKEN', res.token)
resolve()
}).catch(error => {
reject(error)
})
login(username, password, code, uuid)
.then((res) => {
setToken(res.token)
commit('SET_TOKEN', res.token)
resolve()
})
.catch((error) => {
reject(error)
})
})
},
// 获取用户信息
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
getInfo(state.token).then(res => {
const user = res.user
const avatar = user.avatar == "" ? require("@/assets/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
resolve(res)
}).catch(error => {
reject(error)
})
getInfo(state.token)
.then((res) => {
const user = res.user
const avatar =
user.avatar == ''
? require('@/assets/image/profile.jpg')
: process.env.VUE_APP_BASE_API + user.avatar
if (res.roles && res.roles.length > 0) {
// 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
state.companyName = user.companyName
resolve(res)
})
.catch((error) => {
reject(error)
})
})
},
// 退出系统
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
logout(state.token).then(() => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
removeToken()
resolve()
}).catch(error => {
reject(error)
})
logout(state.token)
.then(() => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
removeToken()
resolve()
})
.catch((error) => {
reject(error)
})
})
},
// 前端 登出
FedLogOut({ commit }) {
return new Promise(resolve => {
return new Promise((resolve) => {
commit('SET_TOKEN', '')
removeToken()
resolve()
......
......@@ -200,11 +200,6 @@ export default {
}
</script>
<style lang="scss" scoped>
// * {
// padding: 0;
// margin: 0;
// }
#videoPlayer /deep/ .vjs-tech {
height: 450px;
}
......
......@@ -56,13 +56,6 @@ export default {
}
</script>
<style lang="scss" scoped>
// * {
// padding: 0;
// margin: 0;
// }
.fl {
float: left;
}
.list {
overflow-y: scroll;
height: 652px;
......@@ -73,9 +66,6 @@ export default {
/deep/ .el-loading-spinner {
margin-top: 20px;
}
.fr {
float: right;
}
.gray {
color: #999;
}
......
......@@ -66,9 +66,6 @@ export default {
/deep/ .el-loading-spinner {
margin-top: 20px;
}
.fr {
float: right;
}
.gray {
color: #999;
}
......
......@@ -101,9 +101,7 @@ export default {
/deep/ .el-loading-spinner {
margin-top: 20px;
}
.fr {
float: right;
}
.gray {
color: #999;
}
......
......@@ -59,9 +59,7 @@ export default {
/deep/ .el-loading-spinner {
margin-top: 20px;
}
.fr {
float: right;
}
.gray {
color: #999;
}
......
......@@ -57,9 +57,6 @@ export default {
/deep/ .el-loading-spinner {
margin-top: 20px;
}
.fr {
float: right;
}
.gray {
color: #999;
}
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册