From 01a3394ffa497819fc826c59ee6988fcb49e913f Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 28 Aug 2020 11:06:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aendpoint=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/project/popData/endpointTable.vue | 284 +++++++++++++++++- .../common/project/popData/lineChart.vue | 5 + .../common/project/popData/totalChart.vue | 6 +- .../components/common/project/topology.vue | 4 +- 4 files changed, 290 insertions(+), 9 deletions(-) diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue index 1f3048b41..decb34362 100644 --- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue +++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue @@ -1,13 +1,287 @@ + diff --git a/nezha-fronted/src/components/common/project/popData/lineChart.vue b/nezha-fronted/src/components/common/project/popData/lineChart.vue index 5037a6181..841c3d494 100644 --- a/nezha-fronted/src/components/common/project/popData/lineChart.vue +++ b/nezha-fronted/src/components/common/project/popData/lineChart.vue @@ -1388,6 +1388,11 @@ } }, + getNewTime(time, num) { + const date = new Date(time); + const newDate = new Date(parseInt(date.getTime(), 10) + num); + return bus.timeFormate(newDate, 'yyyy-MM-dd hh:mm:ss'); + }, // 获取格式 getNumStr(num) { if (num >= 1000) { diff --git a/nezha-fronted/src/components/common/project/popData/totalChart.vue b/nezha-fronted/src/components/common/project/popData/totalChart.vue index a488b61f3..b610da1f0 100644 --- a/nezha-fronted/src/components/common/project/popData/totalChart.vue +++ b/nezha-fronted/src/components/common/project/popData/totalChart.vue @@ -63,8 +63,6 @@ this.getData(item1, '', ''); }) }); - this.$set(this.filter, "start_time", bus.timeFormate(new Date().getTime()-60*60*1000, "yyyy-MM-dd hh:mm:ss")); - this.$set(this.filter, "end_time", bus.timeFormate(new Date().getTime(), "yyyy-MM-dd hh:mm:ss")); this.$set(this.filter, "panelId", this.projectId); }, methods:{ @@ -85,7 +83,9 @@ }, //获取图表数据 getData(chartInfo, pos, filterType){ - let startTime = this.filter.start_time + this.$set(this.filter, "start_time", bus.timeFormate(new Date().getTime()-60*60*1000, "yyyy-MM-dd hh:mm:ss")); + this.$set(this.filter, "end_time", bus.timeFormate(new Date().getTime(), "yyyy-MM-dd hh:mm:ss")); + let startTime = this.filter.start_time; let endTime = this.filter.end_time; let step = bus.getStep(startTime, endTime); chartInfo.loading=true; diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue index 71528267a..8fd566b36 100644 --- a/nezha-fronted/src/components/common/project/topology.vue +++ b/nezha-fronted/src/components/common/project/topology.vue @@ -104,7 +104,7 @@ -
endpoint
+ endpoint
@@ -126,12 +126,14 @@ import TotalChart from "./popData/totalChart"; import alertTable from "./popData/alertTable"; import assetTable from "./popData/assetTable"; + import endpointTable from "./popData/endpointTable"; export default { name:"topology", components: { TotalChart, alertTable, assetTable, + endpointTable, 'add-model':addNode, 'add-line':addLine, 'popDataMain':popDataMain,