fix 修改aseet页面 alertmessage部分列不显示的问题
This commit is contained in:
@@ -50,6 +50,7 @@
|
|||||||
@tableDataSort="tableDataSort"
|
@tableDataSort="tableDataSort"
|
||||||
@deleteMessage="deleteMessage"
|
@deleteMessage="deleteMessage"
|
||||||
ref="alertListTable"
|
ref="alertListTable"
|
||||||
|
:form="'chartList'"
|
||||||
></alertMessageTable>
|
></alertMessageTable>
|
||||||
<Pagination :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination" :append-to-body="false" pop-class="out-popper-fix"></Pagination>
|
<Pagination :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination" :append-to-body="false" pop-class="out-popper-fix"></Pagination>
|
||||||
</div>
|
</div>
|
||||||
@@ -69,6 +70,7 @@
|
|||||||
@tableDataSort="tableDataSort"
|
@tableDataSort="tableDataSort"
|
||||||
@deleteMessage="deleteMessage"
|
@deleteMessage="deleteMessage"
|
||||||
ref="alertListScreenTable"
|
ref="alertListScreenTable"
|
||||||
|
:form="'chartList'"
|
||||||
></alertMessageTable>
|
></alertMessageTable>
|
||||||
<Pagination :pageObj="screenPageObj" @pageNo='screenPageNo' @pageSize='screenPageSize' ref="Pagination" ></Pagination>
|
<Pagination :pageObj="screenPageObj" @pageNo='screenPageNo' @pageSize='screenPageSize' ref="Pagination" ></Pagination>
|
||||||
<loading :ref="'localLoadingScreen'+chartIndex"></loading>
|
<loading :ref="'localLoadingScreen'+chartIndex"></loading>
|
||||||
|
|||||||
@@ -233,7 +233,8 @@
|
|||||||
loading:{},
|
loading:{},
|
||||||
tableHeight:{},
|
tableHeight:{},
|
||||||
tableId:{},
|
tableId:{},
|
||||||
projectAlertId:{}
|
projectAlertId:{},
|
||||||
|
from:{}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
vm = this;
|
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)
|
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))
|
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
|
||||||
: this.tableTitle;
|
: this.tableTitle;
|
||||||
@@ -893,6 +895,15 @@
|
|||||||
? JSON.parse(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;
|
: 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>
|
</script>
|
||||||
|
|||||||
@@ -27,9 +27,9 @@
|
|||||||
:tableId="tableId"
|
:tableId="tableId"
|
||||||
@tableDataSort="tableDataSort"
|
@tableDataSort="tableDataSort"
|
||||||
@deleteMessage="deleteMessage"
|
@deleteMessage="deleteMessage"
|
||||||
|
:from="'alertMessageTab'"
|
||||||
></alertMessageTable>
|
></alertMessageTable>
|
||||||
<Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
|
<Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
|
||||||
|
|
||||||
<element-set
|
<element-set
|
||||||
v-if="showElementSet"
|
v-if="showElementSet"
|
||||||
v-clickoutside="elementsetHide"
|
v-clickoutside="elementsetHide"
|
||||||
@@ -510,7 +510,6 @@
|
|||||||
}, 1000);
|
}, 1000);
|
||||||
},
|
},
|
||||||
promQueryParamConvert(obj) {
|
promQueryParamConvert(obj) {
|
||||||
console.log(obj)
|
|
||||||
return "(" + obj.alertRule.expr + ") and (" + function(){
|
return "(" + obj.alertRule.expr + ") and (" + function(){
|
||||||
let q = "{";
|
let q = "{";
|
||||||
for (let k in obj.labels) {
|
for (let k in obj.labels) {
|
||||||
@@ -645,6 +644,8 @@
|
|||||||
this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList")
|
this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList")
|
||||||
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList"))
|
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList"))
|
||||||
: this.tableTitle;
|
: this.tableTitle;
|
||||||
|
console.log( this.tablelable);
|
||||||
|
console.log( this.dropCol)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -38,6 +38,7 @@
|
|||||||
:tableId="tableId"
|
:tableId="tableId"
|
||||||
@tableDataSort="tableDataSort"
|
@tableDataSort="tableDataSort"
|
||||||
@deleteMessage="deleteMessage"
|
@deleteMessage="deleteMessage"
|
||||||
|
:form="'chartList'"
|
||||||
></alertMessageTable>
|
></alertMessageTable>
|
||||||
<div class="pagination-bottom" v-show="!showSubList">
|
<div class="pagination-bottom" v-show="!showSubList">
|
||||||
<Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
|
<Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
|
||||||
|
|||||||
Reference in New Issue
Block a user