From f2d5a7a2695bf8905331354132e1cbe4436f8b3d Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 27 Mar 2023 11:11:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?NEZ-2733=20=20feat=EF=BC=9A=2022.10?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=9A=90=E8=97=8F=20process,network=20?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/bottomBox/bottomBox.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index 16eb567b9..86135c39e 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -257,7 +257,8 @@ export default { }, assetTabs () { const hasSub = this.obj && this.obj.childrenNum - const hasProcess = this.obj && this.obj.clientState == '1' + // const hasProcess = this.obj && this.obj.clientState == '1' + const hasProcess = false const hasVays = this.obj && this.obj.model.tsgAppliance == '1' const tabs = [ { prop: 'panelTab', name: this.$t('overall.dashboard') }, From beae2e1748a46a3b1c28f68aa2c5bafb97c6213f Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 6 Apr 2023 10:55:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?NEZ-2749=20=20fix=EF=BC=9A=20=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=20=E9=BB=98=E8=AE=A4=E7=BC=A9=E6=94=BE=E7=9A=84?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=20=E6=9C=80=E5=B0=8F=E5=80=BC=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BB=8E=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chart/chartMap.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue index 1665c83b0..cf49c3a0e 100644 --- a/nezha-fronted/src/components/chart/chart/chartMap.vue +++ b/nezha-fronted/src/components/chart/chart/chartMap.vue @@ -124,8 +124,8 @@ export default { this.map = new maplibregl.Map({ container: mapId, style: mapStyle, - maxZoom: 7, - minZoom: 1, + maxZoom: mapConfig.maxZoom || 7, + minZoom: mapConfig.minZoom || 7, renderWorldCopies: false, maxBounds: [[-179, -85], [179, 85]], hash: false, From ee995e0ee3bc9dcfb3d634d37328079e23d82c96 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 6 Apr 2023 10:57:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?NEZ-2749=20=20fix=EF=BC=9A=20=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=20=E9=BB=98=E8=AE=A4=E7=BC=A9=E6=94=BE=E7=9A=84?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=20=E6=9C=80=E5=B0=8F=E5=80=BC=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BB=8E=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chart/chartMap.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue index cf49c3a0e..63804daaa 100644 --- a/nezha-fronted/src/components/chart/chart/chartMap.vue +++ b/nezha-fronted/src/components/chart/chart/chartMap.vue @@ -125,7 +125,7 @@ export default { container: mapId, style: mapStyle, maxZoom: mapConfig.maxZoom || 7, - minZoom: mapConfig.minZoom || 7, + minZoom: mapConfig.minZoom || 1, renderWorldCopies: false, maxBounds: [[-179, -85], [179, 85]], hash: false,