From ce658227aec0d82081ba9ba7996f1962478e1304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Fri, 20 Nov 2020 15:04:02 +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/style/common.less                                     | 1 +
 src/views/kpi/assessment/performance/components/table.vue | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/style/common.less b/src/style/common.less
index 534d165..7caafc9 100644
--- a/src/style/common.less
+++ b/src/style/common.less
@@ -16,6 +16,7 @@
   cursor: pointer;
 }
 .pre{
+  line-height: 23px;
   pre{
     line-height: 23px;
     // white-space:pre-line;
diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue
index 8aaace6..1139efd 100644
--- a/src/views/kpi/assessment/performance/components/table.vue
+++ b/src/views/kpi/assessment/performance/components/table.vue
@@ -25,10 +25,10 @@
                  <div class="names">
                    <span> {{child.target || ''}}</span>
                 </div>
-                 <div class="kaohe pre">
-                   <pre >
+                 <div class="kaohe pre" v-html="child.keyResult.replace(/\n|\r\n/g, '<br>')">
+                   <!-- <pre >
                     {{child.keyResult || ''}}
-                   </pre>
+                   </pre> -->
                  </div>
                 <div class='pre jieguo' v-if="tableInfo.result || tableAuth.showResult">
                     <el-input v-if="tableInfo.result" type="textarea"   size="mini"  placeholder="请输入内容" v-model="child.checkResult" clearable></el-input>