gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修改批量修改表格高度 以及 导入失败后 显示对应的 assetID 以及moduleId

Browse Source
This commit is contained in:
zhangyu
2021-08-06 10:28:48 +08:00
parent 6eda2c2e41
commit bcdc704e78
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
View File

@@ -11,7 +11,7 @@
<!-- begin--表单--> <!-- begin--表单-->
<div class="right-box-form-box right-box__container" style="overflow: hidden;padding-left: 20px;margin-top: 0"> <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 class="right-box-form" label-position = "top" ref="addEndpoint" :model="endpoint" :rules="rules">
<el-form-item :label="$t('project.module.module')" prop="ChartTemplate"> <el-form-item :label="$t('project.module.module')" prop="ChartTemplate">
<v-selectpage <v-selectpage
@@ -56,9 +56,9 @@
<el-table <el-table
:data="batchEndpoint.tableData" :data="batchEndpoint.tableData"
:height="'calc(100% - 400px)'"
:class="showError?'error' : ''" :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> border>
<el-table-column <el-table-column
v-for="(item, index) in endpointTableTitle" v-for="(item, index) in endpointTableTitle"
@@ -350,6 +350,9 @@ export default {
this.prevent_opt.save = false this.prevent_opt.save = false
if (response.code === 200) { if (response.code === 200) {
// this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') }) // 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) this.esc(true, response.data)
} else { } else {
this.$message.error(response.msg) this.$message.error(response.msg)

2
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -107,7 +107,7 @@
<div :key="index" class="import-result-block"> <div :key="index" class="import-result-block">
<div class="import-result-item"> <div class="import-result-item">
<div class="line-num">{{$t('overall.result.line',[item.lineNo])}}</div> <div class="line-num">{{$t('overall.result.line',[item.lineNo])}}</div>
<div>{{item.errorMsg}}</div> <div>{{item.info}} {{item.errorMsg}}</div>
</div> </div>
</div> </div>
</template> </template>