From 75ddbc808f0b43e56f832886ba322d8112932577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Mon, 9 Nov 2020 14:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/InfoHeader/index.vue        | 17 +++++++++++++----
 src/components/kpi-layout/NavBar.vue       |  7 +++++--
 src/views/kpi/workbench/home/index.vue     |  4 +++-
 src/views/kpi/workbench/index.vue          |  1 -
 src/views/kpi/workbench/todo/tableItem.vue | 10 +++++-----
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/components/InfoHeader/index.vue b/src/components/InfoHeader/index.vue
index f91b744..dce6614 100644
--- a/src/components/InfoHeader/index.vue
+++ b/src/components/InfoHeader/index.vue
@@ -2,9 +2,9 @@
 <template>
     <div class="header-title">
             <div class="header-title-img">
-              <img  :src="obj.src|| ''" alt="">
+              <img  :src="obj.src|| ''"  :onerror="defaultImg" alt="">
             </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:12px;">{{obj.departmentName || "技术部门"}}</span>
             </div>
@@ -13,10 +13,19 @@
 
 <script>
 export default {
-  props: ['obj'],
+  props: {
+    obj: {
+      type: Object,
+      default: () => { return {} }
+    },
+    isShow: {
+      type: Boolean,
+      default: true
+    }
+  },
   data () {
     return {
-
+      defaultImg: 'this.src="' + require('@/assets/img/default.jpg') + '"'
     }
   },
   computed: {},
diff --git a/src/components/kpi-layout/NavBar.vue b/src/components/kpi-layout/NavBar.vue
index c54c760..47d012c 100644
--- a/src/components/kpi-layout/NavBar.vue
+++ b/src/components/kpi-layout/NavBar.vue
@@ -15,7 +15,8 @@
        </transition>
        <div class="navBar-right" v-if="isNav">
           <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>
 </template>
@@ -24,6 +25,7 @@
 import routeList from '@/router/kpi_route'
 import NavHeader from './NavHeader'
 import { mapGetters } from 'vuex'
+import InfoHeader from '@/components/InfoHeader'
 export default {
   name: 'NavBar',
   data () {
@@ -34,7 +36,8 @@ export default {
     }
   },
   components: {
-    NavHeader
+    NavHeader,
+    InfoHeader
   },
   computed: {
     ...mapGetters(['userInfo']),
diff --git a/src/views/kpi/workbench/home/index.vue b/src/views/kpi/workbench/home/index.vue
index 3a2420c..f30e5a8 100644
--- a/src/views/kpi/workbench/home/index.vue
+++ b/src/views/kpi/workbench/home/index.vue
@@ -69,7 +69,9 @@ export default {
         })
       }
     } else {
-      this.handleGetList()
+      setTimeout(() => {
+        this.handleGetList()
+      }, 100)
     }
   },
   methods: {
diff --git a/src/views/kpi/workbench/index.vue b/src/views/kpi/workbench/index.vue
index 1defaaf..ef43859 100644
--- a/src/views/kpi/workbench/index.vue
+++ b/src/views/kpi/workbench/index.vue
@@ -3,7 +3,6 @@
     <div>
         <router-view></router-view>
         <div @dblclick="handleClick" class="hide">
-
         </div>
         <div v-if="!islzmanagement && isShow" class="login">
           <el-input
diff --git a/src/views/kpi/workbench/todo/tableItem.vue b/src/views/kpi/workbench/todo/tableItem.vue
index 1f7d01f..351f81f 100644
--- a/src/views/kpi/workbench/todo/tableItem.vue
+++ b/src/views/kpi/workbench/todo/tableItem.vue
@@ -10,11 +10,7 @@
           >
             <el-table-column width="100">
               <template slot-scope="scope">
-                <img
-                  :src="scope.row.avatar"
-
-                  class="todo-content-right-avatar"
-                />
+                <InfoHeader :isShow='false' :obj='{src:scope.row.avatar}' />
               </template>
             </el-table-column>
             <el-table-column prop="title"></el-table-column>
@@ -31,6 +27,7 @@
 </template>
 
 <script>
+import InfoHeader from '@/components/InfoHeader'
 export default {
   props: ['selectedTableList'],
   data () {
@@ -38,6 +35,9 @@ export default {
 
     }
   },
+  components: {
+    InfoHeader
+  },
   computed: {},
   beforeMount () {},
   mounted () {},