fix 修改aseet页面 alertmessage部分列不显示的问题

This commit is contained in:
zhangyu
2020-08-04 16:00:38 +08:00
parent c2b4471620
commit bb027f37e3
5 changed files with 24 additions and 1046 deletions

View File

@@ -50,6 +50,7 @@
@tableDataSort="tableDataSort"
@deleteMessage="deleteMessage"
ref="alertListTable"
:form="'chartList'"
></alertMessageTable>
<Pagination :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination" :append-to-body="false" pop-class="out-popper-fix"></Pagination>
</div>
@@ -69,6 +70,7 @@
@tableDataSort="tableDataSort"
@deleteMessage="deleteMessage"
ref="alertListScreenTable"
:form="'chartList'"
></alertMessageTable>
<Pagination :pageObj="screenPageObj" @pageNo='screenPageNo' @pageSize='screenPageSize' ref="Pagination" ></Pagination>
<loading :ref="'localLoadingScreen'+chartIndex"></loading>

View File

@@ -233,7 +233,8 @@
loading:{},
tableHeight:{},
tableId:{},
projectAlertId:{}
projectAlertId:{},
from:{}
},
data() {
vm = this;
@@ -886,6 +887,7 @@
});
}
});
if(this.from=='alertMessage' || this.from=='chartList'){
this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
: this.tableTitle;
@@ -893,6 +895,15 @@
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
: this.tableTitle;
}
if(this.from=='alertMessageTab'){
this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList")
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList"))
: this.tableTitle;
this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList")
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList"))
: this.tableTitle;
}
}
}
</script>

View File

@@ -27,9 +27,9 @@
:tableId="tableId"
@tableDataSort="tableDataSort"
@deleteMessage="deleteMessage"
:from="'alertMessageTab'"
></alertMessageTable>
<Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
<element-set
v-if="showElementSet"
v-clickoutside="elementsetHide"
@@ -510,7 +510,6 @@
}, 1000);
},
promQueryParamConvert(obj) {
console.log(obj)
return "(" + obj.alertRule.expr + ") and (" + function(){
let q = "{";
for (let k in obj.labels) {
@@ -645,6 +644,8 @@
this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList")
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList"))
: this.tableTitle;
console.log( this.tablelable);
console.log( this.dropCol)
}
}
</script>

File diff suppressed because it is too large Load Diff

View File

@@ -38,6 +38,7 @@
:tableId="tableId"
@tableDataSort="tableDataSort"
@deleteMessage="deleteMessage"
:form="'chartList'"
></alertMessageTable>
<div class="pagination-bottom" v-show="!showSubList">
<Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>