This commit is contained in:
熊成强 2020-11-09 14:20:11 +08:00
parent bdccdd16a2
commit 75ddbc808f
5 changed files with 26 additions and 13 deletions

View File

@ -2,9 +2,9 @@
<template> <template>
<div class="header-title"> <div class="header-title">
<div class="header-title-img"> <div class="header-title-img">
<img :src="obj.src|| ''" alt=""> <img :src="obj.src|| ''" :onerror="defaultImg" alt="">
</div> </div>
<div class="header-title-right commonFont"> <div v-if="isShow" class="header-title-right commonFont">
<span style="font-size:14px;">{{obj.name || "熊成强"}}</span> <span style="font-size:14px;">{{obj.name || "熊成强"}}</span>
<span style="font-size:12px;">{{obj.departmentName || "技术部门"}}</span> <span style="font-size:12px;">{{obj.departmentName || "技术部门"}}</span>
</div> </div>
@ -13,10 +13,19 @@
<script> <script>
export default { export default {
props: ['obj'], props: {
obj: {
type: Object,
default: () => { return {} }
},
isShow: {
type: Boolean,
default: true
}
},
data () { data () {
return { return {
defaultImg: 'this.src="' + require('@/assets/img/default.jpg') + '"'
} }
}, },
computed: {}, computed: {},

View File

@ -15,7 +15,8 @@
</transition> </transition>
<div class="navBar-right" v-if="isNav"> <div class="navBar-right" v-if="isNav">
<span>{{this.userInfo.realName}}</span> <span>{{this.userInfo.realName}}</span>
<img :src="this.userInfo.avatar || ''" alt=""> <InfoHeader :isShow='false' :obj='{src:this.userInfo.avatar}' />
<!-- <img :src="this.userInfo.avatar || ''" alt=""> -->
</div> </div>
</div> </div>
</template> </template>
@ -24,6 +25,7 @@
import routeList from '@/router/kpi_route' import routeList from '@/router/kpi_route'
import NavHeader from './NavHeader' import NavHeader from './NavHeader'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import InfoHeader from '@/components/InfoHeader'
export default { export default {
name: 'NavBar', name: 'NavBar',
data () { data () {
@ -34,7 +36,8 @@ export default {
} }
}, },
components: { components: {
NavHeader NavHeader,
InfoHeader
}, },
computed: { computed: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),

View File

@ -69,7 +69,9 @@ export default {
}) })
} }
} else { } else {
this.handleGetList() setTimeout(() => {
this.handleGetList()
}, 100)
} }
}, },
methods: { methods: {

View File

@ -3,7 +3,6 @@
<div> <div>
<router-view></router-view> <router-view></router-view>
<div @dblclick="handleClick" class="hide"> <div @dblclick="handleClick" class="hide">
</div> </div>
<div v-if="!islzmanagement && isShow" class="login"> <div v-if="!islzmanagement && isShow" class="login">
<el-input <el-input

View File

@ -10,11 +10,7 @@
> >
<el-table-column width="100"> <el-table-column width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<img <InfoHeader :isShow='false' :obj='{src:scope.row.avatar}' />
:src="scope.row.avatar"
class="todo-content-right-avatar"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="title"></el-table-column> <el-table-column prop="title"></el-table-column>
@ -31,6 +27,7 @@
</template> </template>
<script> <script>
import InfoHeader from '@/components/InfoHeader'
export default { export default {
props: ['selectedTableList'], props: ['selectedTableList'],
data () { data () {
@ -38,6 +35,9 @@ export default {
} }
}, },
components: {
InfoHeader
},
computed: {}, computed: {},
beforeMount () {}, beforeMount () {},
mounted () {}, mounted () {},