From bcdc704e7857da85e7dd54a6006625e0754b0b5e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 6 Aug 2021 10:28:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=90=8E=20=E6=98=BE=E7=A4=BA=E5=AF=B9=E5=BA=94=E7=9A=84=20ass?=
 =?UTF-8?q?etID=20=E4=BB=A5=E5=8F=8AmoduleId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/rightBox/batchAddEndpoint.vue   | 11 +++++++----
 .../components/page/monitor/endpoint/endpointList.vue |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
index 9f50bf9c4..9a21b27af 100644
--- a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
+++ b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
@@ -11,7 +11,7 @@
 
     <!-- begin--表单-->
     <div class="right-box-form-box right-box__container" style="overflow: hidden;padding-left: 20px;margin-top: 0">
-      <div class="container__form">
+      <div class="container__form" style="display: flex; flex-direction: column;height: 100%">
         <el-form class="right-box-form" label-position = "top" ref="addEndpoint" :model="endpoint" :rules="rules">
           <el-form-item :label="$t('project.module.module')" prop="ChartTemplate">
             <v-selectpage
@@ -56,9 +56,9 @@
 
         <el-table
           :data="batchEndpoint.tableData"
-          :height="'calc(100% - 400px)'"
           :class="showError?'error' : ''"
-          style="width:calc(100% - 70px);margin-left: 15px;min-height:400px"
+          :height="'calc(100% - 400px)'"
+          style="width:calc(100% - 70px);margin-left: 15px;min-height:400px;flex: 1"
           border>
           <el-table-column
             v-for="(item, index) in endpointTableTitle"
@@ -166,7 +166,7 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
         ]
       },
-      batchEndpoint:{
+      batchEndpoint: {
         moduleIds: '',
         assetIds: '',
         tableData: []
@@ -350,6 +350,9 @@ export default {
             this.prevent_opt.save = false
             if (response.code === 200) {
               // this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
+              response.data.failDetail.forEach(item => {
+                item.info = 'AssetId：' + this.batchEndpoint.tableData[item.lineNo - 1].asset.id + ' ModuleId：' + this.batchEndpoint.tableData[item.lineNo - 1].module.id + ' '
+              })
               this.esc(true, response.data)
             } else {
               this.$message.error(response.msg)
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 4c811180e..0b2cb439c 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -107,7 +107,7 @@
                 <div :key="index" 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>{{item.info}} {{item.errorMsg}}</div>
                   </div>
                 </div>
               </template>