From 2eb85efd1da1ffe432f090530f3b8582e64b9920 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, 23 Nov 2020 15:46:38 +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/assets/img/yidong.png                | Bin 0 -> 2329 bytes
 src/views/kpi/assessment/goals/index.vue |   7 ++++++-
 src/views/kpi/set/authority/index.vue    |   6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/img/yidong.png

diff --git a/src/assets/img/yidong.png b/src/assets/img/yidong.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2dc4ab2924f97fe9338ca4e15d90f8d66d09c52
GIT binary patch
literal 2329
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
J)$ZU3{si#w0$cz9

literal 0
HcmV?d00001

diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue
index d68a440..6daf74a 100644
--- a/src/views/kpi/assessment/goals/index.vue
+++ b/src/views/kpi/assessment/goals/index.vue
@@ -41,7 +41,7 @@
                     v-for="(j,indexJ) in handleFilter(i.detailDtos)"
                     :key="indexJ"
                     >
-                      <div style="width:30%" class="my-handle"><i style="margin-right:6px;"  class=" el-icon-s-operation"></i>{{j.target}}</div>
+                      <div style="width:30%" class="my-handle"><img style="width:20px;height:20px;" src="@/assets/img/yidong.png" alt="">{{j.target}}</div>
                       <div style="width:30%" class="kaohe" ><pre >{{j.keyResult}}</pre></div>
                       <div style="width:30%">{{ Math.round((j.checkWeight * 100)*1000)/1000}}%</div>
                       <div style="width:10%">
@@ -336,6 +336,11 @@ export default {
   position: relative;
   .my-handle{
     cursor: move ;
+    display: flex;
+    align-items: center;
+    img{
+      margin-right: 10px;
+    }
   }
   &-bottom{
     position: fixed;
diff --git a/src/views/kpi/set/authority/index.vue b/src/views/kpi/set/authority/index.vue
index a49fb1d..27d0f81 100644
--- a/src/views/kpi/set/authority/index.vue
+++ b/src/views/kpi/set/authority/index.vue
@@ -11,7 +11,7 @@
             @click="handleChangeDirector"
           >更换智能绩效主管理员</el-button>
         </div>
-        <div class="comonPrompt">绩效应用的主管理员，可由钉钉主管理员设置，绩效主管理员具有应用所有权限，且可以设置智能绩效应用子管理员</div>
+绩效应用的主管理员，可由钉钉主管理员设置，绩效主管理员具有应用所有权        <div class="comonPrompt">限，且可以设置智能绩效应用子管理员</div>
         <div class="authority-main-info">
           <!-- <el-avatar
             icon="el-icon-user-solid"
@@ -526,7 +526,9 @@ export default {
       let msg = '是否将智能绩效主管理员变更为' + val.title
       this.$confirm(msg, '提示')
         .then(_ => {
+          console.log('this.mainData: ', this)
           let dicPara = {
+            id: this.mainData.masterFirst.id || '',
             departmentLevel: 'MASTER_PM',
             staffId: val.value
           }
@@ -549,7 +551,7 @@ export default {
           showClose: true,
           message: msg,
           type: 'error'
-        }); return
+        })
       }
       if (this.showPopupAddSub) {
         // 添加子管理员