From 2513973a54418075be88a4298bbee5805eb1816b Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 2 Sep 2020 14:51:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9ass?= =?UTF-8?q?et=E6=97=B6=EF=BC=8Cmodel=E7=9A=84usize=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/rightBox/assetBox.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue index 198ad8b78..1c7142246 100644 --- a/nezha-fronted/src/components/common/rightBox/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue @@ -267,6 +267,7 @@ this.editAsset.accounts.length > 0 && (this.accountType = this.editAsset.accounts[0].protocol); } this.$set(this.editAsset, "modelId", n.model.id); + this.modelSize = n.model.usize; let initLocationData={ idc: n.idc, cabinet: n.cabinet, From 93906e9b3c703c26e54bca852128d19cffb266fb Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 2 Sep 2020 15:53:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4promServer=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=20type=E4=B8=8B=E6=8B=89=E9=80=89=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/rightBox/promServerBox.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/nezha-fronted/src/components/common/rightBox/promServerBox.vue b/nezha-fronted/src/components/common/rightBox/promServerBox.vue index 0f225eef4..81cf1919e 100644 --- a/nezha-fronted/src/components/common/rightBox/promServerBox.vue +++ b/nezha-fronted/src/components/common/rightBox/promServerBox.vue @@ -44,7 +44,6 @@ v-model="editPromServer.type" placeholder="" size="small" - popper-class="config-dropdown" :options="$CONSTANTS.promServer.theData" :props="{ multiple: false, checkStrictly: false ,emitPath:false}" clearable> From b4e3adad0f3c00cfee0f6e0c3994fee93c04462c Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 2 Sep 2020 16:55:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dpreview=E5=8F=8A?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=B7=E6=96=B0=E6=97=B6=EF=BC=8C=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=97=B6=E9=97=B4=E6=9C=AA=E8=AE=A1=E7=AE=97=E6=97=B6?= =?UTF-8?q?=E5=8C=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/charts/chart-list.vue | 2 +- .../src/components/charts/chartPreview.vue | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 57977005d..fc6dfc3e4 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -831,7 +831,7 @@ let startTime = ''; let endTime = ''; if (filterType === 'refresh') {//刷新 - const now = new Date(); + const now = new Date(bus.computeTimezone(new Date().getTime())); const origin = new Date(this.filter.end_time); const numInterval = now.getTime() - origin.getTime(); if (numInterval >= 60000) {//大于1分钟，则start、end均往后移numInterval，否则时间不变 diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index 81d644f4c..e5bfec31a 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -205,7 +205,10 @@ showLegend:true, tableShow:true, urlShow:true, - searchTime: [new Date().setHours(new Date().getHours()-1),new Date()], + searchTime: [ + new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1), + new Date(bus.computeTimezone(new Date().getTime())) + ], //oldSearchTime:[], minHeight:200, chartSpaceHeight:5,//top-border: 1,bottom-border: 1,padding-bottome:3 @@ -221,7 +224,10 @@ // 全屏查看 show(chartInfo) { this.isError = false; - this.searchTime = [new Date().setHours(new Date().getHours()-1),new Date()]; + this.searchTime = [ + new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1), + new Date(bus.computeTimezone(new Date().getTime())) + ]; this.chart = JSON.parse(JSON.stringify(chartInfo)); let chartType= chartInfo.type; @@ -242,7 +248,6 @@ chartContainerId = 'chartAlertListPreview'; } - console.log('previewChart',this.chart,chartContainerId) //设置高度 chart-table this.$nextTick(() => { //const chartBox = document.getElementById('chartPreviewDailog'); @@ -264,7 +269,6 @@ tableBox.style.height = `${height-this.titleHeight-this.pageHeight-25}px`;//-75-32+25 }else{ const chartDiv = document.getElementById(chartContainerId); - console.log('container div',chartDiv) chartDiv.style.height = `${height-this.chartSpaceHeight-this.titleHeight-15}px`; } }); @@ -361,7 +365,7 @@ let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss'); let endTime = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss'); if(!startTime || !endTime){//如果时间为空，则默认取最近1小时 - let now = new Date(); + let now = new Date(bus.computeTimezone(new Date().getTime())); startTime = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss'); endTime = bus.timeFormate(now.setHours(now.getHours()-1), 'yyyy-MM-dd hh:mm:ss'); this.searchTime[0] = startTime; From 20f5887e86a19cc88fbe66a65dc0ccec204eabd0 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 2 Sep 2020 17:41:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dpreview=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E9=80=89=E6=8B=A9=E6=97=B6=E9=97=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/page/dashboard/chartBox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index 1a33fb165..0ee04b00f 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -49,7 +49,7 @@ } .z-top { - z-index: 2900; + /*z-index: 2900;*/ }