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 1/2] =?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',

From 7ab9ed81f7a088a564955ab049f9c36fdbedf22d Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Wed, 4 Nov 2020 15:38:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=89=80=E6=9C=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E6=95=B4=E5=88=97=E5=AE=BD=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss                 | 1 +
 nezha-fronted/src/components/charts/chart-detail.vue      | 2 +-
 .../src/components/common/alert/alertMessageTable.vue     | 6 ++----
 .../src/components/common/bottomBox/tabs/cabinetTab.vue   | 3 +--
 .../src/components/common/bottomBox/tabs/endpointTab.vue  | 4 +---
 .../src/components/common/project/popData/alertTable.vue  | 2 +-
 .../src/components/common/project/popData/assetTable.vue  | 2 +-
 nezha-fronted/src/components/page/alert/config.vue        | 4 +---
 nezha-fronted/src/components/page/asset/asset.vue         | 4 +---
 nezha-fronted/src/components/page/config/account.vue      | 3 +--
 nezha-fronted/src/components/page/config/dc.vue           | 3 +--
 nezha-fronted/src/components/page/config/mib.vue          | 2 +-
 nezha-fronted/src/components/page/config/model.vue        | 3 +--
 nezha-fronted/src/components/page/config/operationlog.vue | 3 +--
 nezha-fronted/src/components/page/config/promServer.vue   | 3 +--
 nezha-fronted/src/components/page/config/terminallog.vue  | 3 +--
 nezha-fronted/src/components/page/project/project.vue     | 8 ++++----
 17 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 4d2bc65a0..d42f977a9 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -819,6 +819,7 @@ li{
 .nz-table .el-table {
   border: none;
   font-size: 12px;
+  display: table-cell!important;
 }
 .nz-table::before {
   height: 0;
diff --git a/nezha-fronted/src/components/charts/chart-detail.vue b/nezha-fronted/src/components/charts/chart-detail.vue
index dea87c7da..30dcd062b 100644
--- a/nezha-fronted/src/components/charts/chart-detail.vue
+++ b/nezha-fronted/src/components/charts/chart-detail.vue
@@ -93,7 +93,7 @@
                               v-scrollBar:el-table="'small'"
                             >
                               <el-table-column
-                                :resizable="false"
+                                :resizable="true"
                                 v-for="(_item, _index) in setLabels(value)"
                                 v-if="_item.show"
                                 :key="`col-${_index}`"
diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 61104a563..387974218 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -39,11 +39,9 @@
       >
       </el-table-column>
       <el-table-column
-        :resizable="false"
+        :resizable="true"
         v-for="(item, index) in tools.customTableTitle"
         v-if="item.show"
-        :width="item.width"
-        :minWidth="item.minWidth"
         :key="`col-${index}`"
         :label="item.label"
         :show-overflow-tooltip="item.prop != 'labels' && item.prop != 'alertRule'"
@@ -156,7 +154,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="28" :resizable="false">
+      <el-table-column width="28" :resizable="true">
         <template slot="header" slot-scope="scope">
           <span @mousedown.stop="!tools.showCustomTableTitle && (tools.showCustomTableTitle = true)" class="nz-table-gear">
             <i class="nz-icon nz-icon-gear"></i>
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 9916c081e..9911912b0 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -35,10 +35,9 @@
           align="center">
         </el-table-column>
       <el-table-column
-        :resizable="false"
+        :resizable="true"
         v-for="(item, index) in tableTitle"
         v-if="item.show"
-        :width="item.width"
         :key="`col-${index}`"
         :label="item.label"
       >
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
index 6304bc108..b1a798a99 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
@@ -59,13 +59,11 @@
           align="center">
         </el-table-column>
       <el-table-column
-        :resizable="false"
+        :resizable="true"
         v-for="(item, index) in tools.customTableTitle"
         v-if="item.show"
-        :width="item.width"
         :key="`col-${index}`"
         :label="item.label"
-        :min-width="(item.minWidth?item.minWidth+'px':'110px')"
         :sortable="$tableSet.sortableShow(item.prop,'endpointTab')"
         :prop="$tableSet.propTitle(item.prop,'endpointTab')"
         :sort-orders="['ascending', 'descending']"
diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue
index 59c2f57a3..a0215df2d 100644
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -55,7 +55,7 @@
           <!--&gt;-->
           <!--</el-table-column>-->
           <el-table-column
-            :resizable="false"
+            :resizable="true"
             v-for="(item, index) in tableTitle"
             v-if="item.show"
             :width="item.width"
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index d506a8cad..e080606e8 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -45,7 +45,7 @@
           @sort-change="tableDataSort"
         >
           <el-table-column
-            :resizable="false"
+            :resizable="true"
             v-for="(item, index) in tableTitle"
             v-if="item.show"
             :width="item.width"
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index 48c6e820d..c4800d39c 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -85,14 +85,12 @@
           align="center">
         </el-table-column>
         <el-table-column
-          :resizable="false"
+          :resizable="true"
           v-for="(item, index) in tools.customTableTitle"
           v-if="item.show"
-          :width="item.width"
           :key="`col-${index}`"
           :label="item.label"
           show-overflow-tooltip
-          min-width="110px"
           :sort-orders="['ascending', 'descending']"
           :sortable="$tableSet.sortableShow(item.prop,'alertRules')"
           :prop="$tableSet.propTitle(item.prop,'alertRules')"
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index fa51a8404..1e8eed135 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -54,15 +54,13 @@
           align="center">
         </el-table-column>
         <el-table-column
-          :resizable="false"
+          :resizable="true"
           v-for="(item, index) in tools.customTableTitle"
           v-if="item.show"
-          :width="item.width"
           :key="`col_${index}`"
           :label="item.label"
           :fixed="item.fixed"
           :show-overflow-tooltip="item.prop != 'Alert' || item.prop != 'Module'"
-          min-width="110px"
           :class-name="item.prop == 'option' ? 'content-right-options' : ''"
           :sortable="$tableSet.sortableShow(item.prop,'asset')"
           :prop="$tableSet.propTitle(item.prop,'asset')"
diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue
index 81dea8482..e4d180526 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -53,10 +53,9 @@
           align="center">
         </el-table-column>
         <el-table-column
-          :resizable="false"
+          :resizable="true"
           v-for="(item, index) in tools.customTableTitle"
           v-if="item.show"
-          :width="item.width"
           :key="`col-${index}`"
           :label="item.label"
           :prop="item.prop"
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index ee2fdd8eb..3bdc5f6ee 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -53,11 +53,10 @@
           align="center">
         </el-table-column>
         <el-table-column
-          :resizable="false"
+          :resizable="true"
           show-overflow-tooltip
           v-for="(item, index) in tools.customTableTitle"
           v-if="item.show"
-          :width="item.width"
           :key="`col-${index}`"
           :label="item.label"
           :sortable="$tableSet.sortableShow(item.prop,'dc')"
diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue
index d53749fc2..ce052a3d3 100644
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -45,7 +45,7 @@
           width="40"
           align="center">
         </el-table-column>
-        <el-table-column :resizable="false" v-for="(item, index) in tools.customTableTitle" v-if="item.show" :width="item.width" :class-name="item.prop == 'modelsDetail'?'detail-column':''"
+        <el-table-column :resizable="true" v-for="(item, index) in tools.customTableTitle" v-if="item.show"  :class-name="item.prop == 'modelsDetail'?'detail-column':''"
                          :key="`col-${index}`" :label="item.label" :sortable="$tableSet.sortableShow(item.prop,'mib')"
                          :prop="$tableSet.propTitle(item.prop,'mib')"
                          :sort-orders="['ascending', 'descending']">
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index ad5683597..c9ce96a39 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -49,10 +49,9 @@
           width="40"
           align="center">
         </el-table-column>
-        <el-table-column :resizable="false"
+        <el-table-column :resizable="true"
                          v-for="(item, index) in tools.customTableTitle"
                          v-if="item.show"
-                         :width="item.width"
                          :key="`col-${index}`"
                          :label="item.label"
                          :sortable="$tableSet.sortableShow(item.prop,'model')"
diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue
index 497eb7cf2..3096dbc31 100644
--- a/nezha-fronted/src/components/page/config/operationlog.vue
+++ b/nezha-fronted/src/components/page/config/operationlog.vue
@@ -36,10 +36,9 @@
       @sort-change="tableDataSort"
     >
       <el-table-column
-        :resizable="false"
+        :resizable="true"
         v-for="(item, index) in tools.customTableTitle"
         v-if="item.show"
-        :width="item.width"
         :key="`col-${index}`"
         :label="item.label"
         :sortable="$tableSet.sortableShow(item.prop,'operationlog')"
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index e7a26fa75..c46eb74bc 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -41,9 +41,8 @@
           width="40"
           align="center">
         </el-table-column>
-        <el-table-column :resizable="false" v-for="(item, index) in tools.customTableTitle"
+        <el-table-column :resizable="true" v-for="(item, index) in tools.customTableTitle"
                          v-if="item.show"
-                         :width="item.width"
                          :key="`col-${index}`"
                          :label="item.label"
                          :sortable="$tableSet.sortableShow(item.prop,'promServer')"
diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue
index 4337814cf..24f2f909c 100644
--- a/nezha-fronted/src/components/page/config/terminallog.vue
+++ b/nezha-fronted/src/components/page/config/terminallog.vue
@@ -35,10 +35,9 @@
       style="width: 100%;"
       @sort-change="tableDataSort">
       <el-table-column
-        :resizable="false"
+        :resizable="true"
         v-for="(item, index) in tools.customTableTitle"
         v-if="item.show"
-        :width="item.width"
         :key="`col-${index}`"
         :label="item.label"
         :sortable="$tableSet.sortableShow(item.prop,'temrminallog')"
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 9c950fb25..719d9491f 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -68,6 +68,7 @@
           @sort-change="tableDataSort"
           @row-dblclick="detailEndpoint"
           @selection-change="(selection)=>{this.batchDeleteObjs=selection}"
+          @header-dragend="()=>{this.$refs.endpointTable.doLayout();}"
         >
           <el-table-column
             :resizable="false"
@@ -76,13 +77,12 @@
             align="center">
           </el-table-column>
           <el-table-column
-            :resizable="false"
+            :resizable="true"
             v-for="(item, index) in tools.customTableTitle"
             v-if="item.show"
-            :width="item.width"
             :key="`col-${index}`"
             :label="item.label"
-            min-width="110px"
+            :min-width="item.width"
             :sortable="$tableSet.sortableShow(item.prop,'project')"
             :prop="$tableSet.propTitle(item.prop,'project')"
             :sort-orders="['ascending', 'descending']"
@@ -132,7 +132,7 @@
               <template v-else>-</template>
             </template>
           </el-table-column>
-          <el-table-column width="28" :resizable="false">
+          <el-table-column width="28" :resizable="true">
             <template slot="header" slot-scope="scope">
             <span @mousedown.stop="!tools.showCustomTableTitle && (tools.showCustomTableTitle = true)" class="nz-table-gear">
               <i class="nz-icon nz-icon-gear"></i>