From 375b60d4c2ad53d2f33575aed5068efec8654ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Wed, 4 Nov 2020 09:45:51 +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/views/kpi/assessment/goals/index.vue      |  2 +-
 .../performance/components/table.vue          | 22 +++++++++++--------
 .../edit/components/templateSet.vue           |  4 ++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue
index a3aad5b..aa14d91 100644
--- a/src/views/kpi/assessment/goals/index.vue
+++ b/src/views/kpi/assessment/goals/index.vue
@@ -45,7 +45,7 @@
                     :key="indexJ"
                     >
                       <div style="width:30%"><i style="margin-right:6px;"  class="my-handle el-icon-s-operation"></i>{{j.target}}</div>
-                      <div style="width:30%">{{j.keyResult}}</div>
+                      <pre style="width:30%">{{j.keyResult}}</pre>
                       <div style="width:30%">{{ Math.round((j.checkWeight * 100)*1000)/1000}}%</div>
                       <div style="width:10%">
                             <el-button
diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue
index a25d222..62f4963 100644
--- a/src/views/kpi/assessment/performance/components/table.vue
+++ b/src/views/kpi/assessment/performance/components/table.vue
@@ -6,7 +6,7 @@
             <div class="table-header-flex name">名称</div>
             <div class="table-header-flex">考核标准</div>
             <div class="table-header-flex" v-if="tableInfo.result || auth.showResult">结果值</div>
-            <div class="table-header-flex quanzhomng">权重({{obj.weight*100}}%)</div>
+            <div class="table-header-flex quanzhomng" style="flex:none;">权重({{obj.weight*100}}%)</div>
             <div class="table-header-flex"  v-if="tableInfo.score || auth.showScore">上级评分</div>
             <div class="table-header-flex"   v-if="tableInfo.score || auth.showScore">评分说明</div>
           </div>
@@ -28,13 +28,15 @@
                    <span> {{child.target || ''}}</span>
                 </div>
                  <div>
+                   <pre>
                     {{child.keyResult || ''}}
-                </div>
+                   </pre>
+                 </div>
                 <div v-if="tableInfo.result || auth.showResult">
                     <el-input v-if="tableInfo.result"   style="width:120px;" size="mini"  placeholder="请输入内容" v-model="child.checkResult" clearable></el-input>
                     <span v-else>{{child.checkResult || '--'}}</span>
                 </div>
-                <div class="quanzhomng">
+                <div class="quanzhomng" style="flex:none;">
                     {{(child.checkWeight)*100}}%
                 </div>
                 <div v-if="tableInfo.score || auth.showScore">
@@ -62,7 +64,7 @@
                 </div>
                 <div v-if="tableInfo.result">
                 </div>
-                <div class="quanzhomng">
+                <div class="quanzhomng"  style="flex:none;">
                 </div>
                 <div v-if="tableInfo.score">
                 </div>
@@ -190,9 +192,7 @@ export default {
 .table-list{
    border: 1px solid @borderColor;
    border-bottom: none;
-   .quanzhomng{
-    flex: 0.5 !important;
-   }
+
 }
 .table-header{
   display: flex;
@@ -209,7 +209,7 @@ export default {
   }
   &-flex{
     flex: 1;
-    .center();
+    // .center();
   }
 }
 .table-content{
@@ -262,7 +262,7 @@ export default {
       display: flex;
       >div{
       flex: 1;
-      .center();
+      // .center();
      }
     }
   }
@@ -270,6 +270,10 @@ export default {
 .table-left{
   width: 60px;
 }
+.quanzhomng{
+     width: 100px !important;
+     text-align: center;
+  }
 .table{
     position: relative;
     &-bottoms{
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
index 62f93c0..0d68bf0 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
@@ -97,7 +97,7 @@
                     :key="indexJ"
                     >
                       <div style="width:30%">{{j.name}}</div>
-                      <div style="width:30%">{{j.keyResult}}</div>
+                      <pre style="width:30%">{{j.keyResult}}</pre>
                       <div style="width:30%">{{j.weight * 100}}%</div>
                       <div style="width:10%">
                             <el-button
@@ -561,7 +561,7 @@ export default {
         &-content{
            display: flex;
             align-items: center;
-          height: 60px;
+          min-height: 60px;
           border-bottom: 1px solid @borderColor;
           justify-content: space-between;
           div{