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:00:37 +08:00
parent d03fa9eef9
commit d68b14233a
7 changed files with 37 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/App.vue
View File

@ -6,7 +6,7 @@
<script>
import { mapState, mapActions } from 'vuex'
// import * as dd from 'dingtalk-jsapi'
import * as dd from 'dingtalk-jsapi'
import { apiDingtalkLogin, apiUserInfo } from '@/api/login'
export default {
name: 'App',
@ -26,11 +26,10 @@ export default {
...mapState(['user'])
},
async created () {
console.log('this', this)
// if (!dd.other) {
// await this.handleGetDingtalkCode()
// await this.handleDingtalkLogin()
// }
if (!dd.other) {
await this.handleGetDingtalkCode()
await this.handleDingtalkLogin()
}
this.GET_DEPLIST()
},
@ -40,24 +39,24 @@ export default {
},
...mapActions(['GET_DEPLIST', 'SET_USER_INFO']),
// 获取钉钉鉴权码
// handleGetDingtalkCode () {
// return new Promise((resolve, reject) => {
// let _this = this
// dd.runtime.permission.requestAuthCode({
// corpId: 'ding267474e759bbca1c35c2f4657eb6378f',
// onSuccess (res) {
// console.log('result===', res)
// _this.dingCode = res
// resolve()
// },
// onFail (err) {
// console.log('err===', err)
// _this.dingCode = err
// resolve()
// }
// })
// })
// },
handleGetDingtalkCode () {
return new Promise((resolve, reject) => {
let _this = this
dd.runtime.permission.requestAuthCode({
corpId: 'ding267474e759bbca1c35c2f4657eb6378f',
onSuccess (res) {
console.log('result===', res)
_this.dingCode = res
resolve()
},
onFail (err) {
console.log('err===', err)
_this.dingCode = err
resolve()
}
})
})
},
// 钉钉免登录
async handleDingtalkLogin (val = this.dingCode) {
const res = await apiDingtalkLogin(val)
@ -79,7 +78,8 @@ export default {
console.log('获取用户信息res: ', res)
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)
}
}
}

2
src/components/InfoHeader/index.vue
View File

@ -2,7 +2,7 @@
<template>
<div class="header-title">
<div class="header-title-img">
<img onerror="javascript:this.src='@/assets/img/default.jpg';" :src="obj.src|| ''" alt="">
<img :src="obj.src|| ''" alt="">
</div>
<div class="header-title-right commonFont">
<span style="font-size:14px;">{{obj.name || "熊成强"}}</span>

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

@ -12,19 +12,10 @@
{{i.meta.title}}</li>
</ul>
<nav-header v-if="!isNav"/>
<!-- <div class="noNav" v-if="!isNav">
<div class="noNav-left">
<i @click="handleBack" class="el-icon-arrow-left"></i>
</div>
<div>{{name}}</div>
</div> -->
</transition>
<div>{{isNav}}---{{this.userInfo.realName}}</div>
<div class="navBar-right">
<span>{{this.userInfo.realName}}</span><span>{{this.userInfo}}</span><span>熊承强</span>
<img src="@/assets/img/default.jpg" />
<!-- <img src="../../../@/assets/img/default.jpg" /> -->
<!-- <img onerror="javascript:this.src='@/assets/img/default.jpg';" :src="this.userInfo.avatar || ''" alt=""> -->
<div class="navBar-right" v-if="isNav">
<span>{{this.info.realName}}</span>
<img :src="this.info || ''" alt="">
</div>
</div>
</template>
@ -32,7 +23,7 @@
<script>
import routeList from '@/router/kpi_route'
import NavHeader from './NavHeader'
import { mapGetters } from 'vuex'
import { mapState } from 'vuex'
export default {
name: 'NavBar',
data () {
@ -46,7 +37,7 @@ export default {
NavHeader
},
computed: {
...mapGetters(['userInfo']),
...mapState({ info: state => state.user.info }),
isNav () {
return !!this.$route.meta.isNav
},
@ -56,7 +47,6 @@ export default {
},
beforeMount () {},
mounted () {
console.log('userInfo: ', this.userInfo)
},
methods: {
handleToRouter (item) {

6
src/components/kpi-layout/NavHeader.vue
View File

@ -30,13 +30,7 @@ export default {
mounted () {},
methods: {
handleBack () {
console.log('this.isPopup: ', this.isPopup)
if (this.isPopup) return this.open()
console.log('history: ', history)
console.log('this.$router: ', this.$router)
console.log('this.$store: ', this.$store)
// window.history.back()
this.$router.go(-1)
},
open () {

2
src/views/kpi/assessment/performance/index.vue
View File

@ -91,7 +91,7 @@
<div class="performance-content-jilu-item-content">
<div class="performance-content-jilu-item-content-img">
<img
onerror="javascript:this.src='@/assets/img/default.jpg';" :src="i.avatar|| ''"
:src="i.avatar|| ''"
alt=""
>
</div>

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

@ -28,7 +28,7 @@ const islzmanagement = window.location.host.indexOf('hostList') > -1 && window.l
export default {
data () {
return {
isShow: false,
isShow: true,
islzmanagement,
input: localStorage.getItem('input'),
verify: '888888',
@ -56,8 +56,10 @@ export default {
this.token = res.token
this.$cookies.set('token', res.token, res.expire)
let ress = await apiUserInfo()
console.log('ress.user: ', ress.user)
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)
location.reload()

2
src/views/kpi/workbench/todo/tableItem.vue
View File

@ -12,7 +12,7 @@
<template slot-scope="scope">
<img
:src="scope.row.avatar"
onerror="javascript:this.src='@/assets/img/default.jpg';"
class="todo-content-right-avatar"
/>
</template>