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

fix: 修复alert-msg图表改变时间不生效的问题

Browse Source
This commit is contained in:
chenjinsong
2020-05-15 17:24:32 +08:00
parent a460c442c2
commit 23648d10be
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
View File

@@ -215,6 +215,7 @@
legend: [], legend: [],
sameLabels: ['instance','module','project','asset','endpoint','datacenter'], sameLabels: ['instance','module','project','asset','endpoint','datacenter'],
searchTime: [new Date().setHours(new Date().getHours() - 1), new Date()], searchTime: [new Date().setHours(new Date().getHours() - 1), new Date()],
currentMsg: {},
defaultSearchValue: this.obj.alertNum ? 1 : 0, defaultSearchValue: this.obj.alertNum ? 1 : 0,
showElementSet: false, showElementSet: false,
@@ -477,7 +478,7 @@
} }
}) })
}, },
queryChartDate(obj) { queryChartDate() {
let start = this.searchTime[0]?this.searchTime[0]:this.getTime(-1, 'h'); let start = this.searchTime[0]?this.searchTime[0]:this.getTime(-1, 'h');
let end = this.searchTime[1]?this.searchTime[1]:this.getTime(0, 'h') let end = this.searchTime[1]?this.searchTime[1]:this.getTime(0, 'h')
this.searchTime = [start, end]; this.searchTime = [start, end];
@@ -493,7 +494,7 @@
step='30m'; step='30m';
} }
let axiosArr=[]; let axiosArr=[];
let paramStr = JSON.stringify(this.promQueryParamConvert(obj)); let paramStr = JSON.stringify(this.promQueryParamConvert(this.currentMsg));
axiosArr.push(axios.get("/prom/api/v1/query_range?query="+paramStr.substring(1, paramStr.length-1).replace(/\+/g, "%2B").replace(/ /g, "%20").replace(/\\/g, "")+"&start="+this.$stringTimeParseToUnix(start)+"&end="+this.$stringTimeParseToUnix(end)+"&step="+step)); axiosArr.push(axios.get("/prom/api/v1/query_range?query="+paramStr.substring(1, paramStr.length-1).replace(/\+/g, "%2B").replace(/ /g, "%20").replace(/\\/g, "")+"&start="+this.$stringTimeParseToUnix(start)+"&end="+this.$stringTimeParseToUnix(end)+"&step="+step));
this.legend = []; this.legend = [];
this.chartDatas = []; this.chartDatas = [];
@@ -554,9 +555,10 @@
this.chartDatas = []; this.chartDatas = [];
this.legend = []; this.legend = [];
this.graphShow = true; this.graphShow = true;
this.currentMsg = obj;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.messageChart.startLoading(); this.$refs.messageChart.startLoading();
this.queryChartDate(obj); this.queryChartDate();
}); });
}, },
dialogClose() { dialogClose() {

9
nezha-fronted/src/components/page/alert/list.vue
View File

@@ -257,6 +257,7 @@
sameLabels: ['instance','module','project','asset','endpoint','datacenter'], sameLabels: ['instance','module','project','asset','endpoint','datacenter'],
legend: [], legend: [],
searchTime: [new Date().setHours(new Date().getHours() - 1), new Date()], searchTime: [new Date().setHours(new Date().getHours() - 1), new Date()],
currentMsg: {},
tableId: 'alertListTable', //需要分页的table的id，用于记录每页数量 tableId: 'alertListTable', //需要分页的table的id，用于记录每页数量
showTopBtn: false, showTopBtn: false,
@@ -470,7 +471,7 @@
this.$store.commit('setHeaderTable', data); this.$store.commit('setHeaderTable', data);
this.tablelable = data; this.tablelable = data;
}, },
queryChartDate(obj) { queryChartDate() {
let start = this.searchTime[0]?this.searchTime[0]:this.getTime(-1, 'h'); let start = this.searchTime[0]?this.searchTime[0]:this.getTime(-1, 'h');
let end = this.searchTime[1]?this.searchTime[1]:this.getTime(0, 'h') let end = this.searchTime[1]?this.searchTime[1]:this.getTime(0, 'h')
this.searchTime = [start, end]; this.searchTime = [start, end];
@@ -486,7 +487,7 @@
step='30m'; step='30m';
} }
let axiosArr=[]; let axiosArr=[];
let paramStr = JSON.stringify(this.promQueryParamConvert(obj)); let paramStr = JSON.stringify(this.promQueryParamConvert(this.currentMsg));
axiosArr.push(axios.get("/prom/api/v1/query_range?query="+paramStr.substring(1, paramStr.length-1).replace(/\+/g, "%2B").replace(/ /g, "%20").replace(/\\/g, "")+"&start="+this.$stringTimeParseToUnix(start)+"&end="+this.$stringTimeParseToUnix(end)+"&step="+step)); axiosArr.push(axios.get("/prom/api/v1/query_range?query="+paramStr.substring(1, paramStr.length-1).replace(/\+/g, "%2B").replace(/ /g, "%20").replace(/\\/g, "")+"&start="+this.$stringTimeParseToUnix(start)+"&end="+this.$stringTimeParseToUnix(end)+"&step="+step));
this.legend = []; this.legend = [];
this.chartDatas = []; this.chartDatas = [];
@@ -522,7 +523,6 @@
chartData.data = queryData.values.map((dpsItem, dpsIndex) => { chartData.data = queryData.values.map((dpsItem, dpsIndex) => {
return [bus.computeTimezone(dpsItem[0]) * 1000, parseFloat(dpsItem[1]).toFixed(2)]; return [bus.computeTimezone(dpsItem[0]) * 1000, parseFloat(dpsItem[1]).toFixed(2)];
}); });
console.info(chartData)
this.chartDatas.push(chartData); this.chartDatas.push(chartData);
} }
} else { } else {
@@ -547,9 +547,10 @@
this.chartDatas = []; this.chartDatas = [];
this.legend = []; this.legend = [];
this.graphShow = true; this.graphShow = true;
this.currentMsg = obj;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.messageChart.startLoading(); this.$refs.messageChart.startLoading();
this.queryChartDate(obj); this.queryChartDate();
}); });
}, },
dialogClose() { dialogClose() {