wulin/management_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
熊成强 2020-11-09 12:21:37 +08:00
parent 39a6a0dc0d
commit 6e536c90b4
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/App.vue
View File

@ -5,7 +5,7 @@
</template> </template>
<script> <script>
import { mapState, mapActions } from 'vuex' import { mapState, mapActions, mapMutations } from 'vuex'
import * as dd from 'dingtalk-jsapi' import * as dd from 'dingtalk-jsapi'
import { apiDingtalkLogin, apiUserInfo } from '@/api/login' import { apiDingtalkLogin, apiUserInfo } from '@/api/login'
export default { export default {
@ -37,7 +37,8 @@ export default {
onCancel () { onCancel () {
}, },
...mapActions(['GET_DEPLIST', 'SET_USER_INFO']), ...mapActions(['GET_DEPLIST']),
...mapMutations(['SET_USER_INFO']),
// 获取钉钉鉴权码 // 获取钉钉鉴权码
handleGetDingtalkCode () { handleGetDingtalkCode () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -77,9 +78,7 @@ export default {
let res = await apiUserInfo() let res = await apiUserInfo()
console.log('获取用户信息res: ', res) console.log('获取用户信息res: ', res)
if (res.code === 200) { if (res.code === 200) {
console.log('this.SET_USER_INFO: ', this.SET_USER_INFO) this.SET_USER_INFO(res.user)
// this.SET_USER_INFO(res.user)
this.$store.commit('SET_USER_INFO', res.user)
} }
} }
} }

8
src/components/kpi-layout/NavBar.vue
View File

@ -14,8 +14,8 @@
<nav-header v-if="!isNav"/> <nav-header v-if="!isNav"/>
</transition> </transition>
<div class="navBar-right" v-if="isNav"> <div class="navBar-right" v-if="isNav">
<span>{{this.info.realName}}</span> <span>{{this.userInfo.realName}}</span>
<img :src="this.info || ''" alt=""> <img :src="this.userInfo.avatar || ''" alt="">
</div> </div>
</div> </div>
</template> </template>
@ -23,7 +23,7 @@
<script> <script>
import routeList from '@/router/kpi_route' import routeList from '@/router/kpi_route'
import NavHeader from './NavHeader' import NavHeader from './NavHeader'
import { mapState } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
name: 'NavBar', name: 'NavBar',
data () { data () {
@ -37,7 +37,7 @@ export default {
NavHeader NavHeader
}, },
computed: { computed: {
...mapState({ info: state => state.user.info }), ...mapGetters(['userInfo']),
isNav () { isNav () {
return !!this.$route.meta.isNav return !!this.$route.meta.isNav
}, },

6
src/views/kpi/workbench/index.vue
View File

@ -56,13 +56,11 @@ export default {
this.token = res.token this.token = res.token
this.$cookies.set('token', res.token, res.expire) this.$cookies.set('token', res.token, res.expire)
let ress = await apiUserInfo() let ress = await apiUserInfo()
console.log('ress.user: ', ress.user)
if (ress.code === 200) { if (ress.code === 200) {
// this.SET_USER_INFO(ress.user) this.SET_USER_INFO(ress.user)
this.$store.commit('SET_USER_INFO', ress.user)
} }
console.log('ress: ', ress) console.log('ress: ', ress)
// location.reload() location.reload()
} }
} }
}, },