From 82367d6df2541f0b8c634dfde92fed640ea13235 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Wed, 4 Nov 2020 13:52:35 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/exportXLSX.vue      | 23 +++++++++++++++++--
 .../src/components/common/language/cn.js      |  3 ++-
 .../src/components/common/language/en.js      |  3 ++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue
index e88b560f1..186ad6fe9 100644
--- a/nezha-fronted/src/components/common/exportXLSX.vue
+++ b/nezha-fronted/src/components/common/exportXLSX.vue
@@ -72,9 +72,17 @@
               <div class="result-title">{{$t('overall.result.failedDetail')}}:</div>
                 <div class="result-detail" v-if="importResult&&importResult.failDetail">
                   <el-scrollbar style="height: 100%">
-                    <ul>
+                   <!-- <ul>
                       <li v-for="(item,index) in importResult.failDetail"><span>{{item.lineNo}}</span>:<span>{{item.errorMsg}}</span> </li>
-                    </ul>
+                    </ul>-->
+                    <template v-for="(item,index) in importResult.failDetail">
+                      <div class="import-result-block">
+                        <div class="import-result-item">
+                          <div class="line-num">{{$t('overall.result.line',[item.lineNo])}}</div>
+                          <div>{{item.errorMsg}}</div>
+                        </div>
+                      </div>
+                    </template>
                   </el-scrollbar>
                 </div>
             </div>
@@ -324,3 +332,14 @@
   }
   /*去除上传文件动画end*/
 </style>
+
+<style>
+  .result-detail .import-result-block{
+  }
+  .result-detail .import-result-block .import-result-item{
+    display: flex;
+  }
+  .import-result-item .line-num{
+    width: 55px;
+  }
+</style>
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index faf0c8bb9..ee7c65675 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -69,7 +69,8 @@ const cn = {
       total: "总计",
       failed: "失败",
       success: "成功",
-      failedDetail: "失败详情"
+      failedDetail: "失败详情",
+      line:"第{0}行:"
     },
     reset: "重置",
     submit: "保存",
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 562c2f50c..0958506d3 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -73,7 +73,8 @@ const en = {
       total:'Total',
       failed:'Failed',
       success:'Success',
-      failedDetail:'Failed Detail'
+      failedDetail:'Failed Detail',
+      line:'Line {0}:'
     },
     reset:'Reset',
     submit:'Save',