From c99e345b384a3a9a6bde52f104f5eaaa36029eb8 Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 27 Dec 2022 16:17:50 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2480=20fix=EF=BC=9A=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E6=97=A0=E5=86=85=E5=AE=B9=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/bottomBox/tabs/panelTabNew.vue | 8 ++++---- .../src/components/common/popBox/selectDashboard.vue | 8 ++++---- .../components/common/popBox/topToolMoreOptions.vue | 4 ++-- .../common/table/alert/alertMessageTable.vue | 4 ++-- .../components/common/table/alert/alertRuleTable.vue | 2 +- .../src/components/common/table/settings/dcTable.vue | 2 +- .../src/components/page/alert/alertMessage.vue | 5 +++-- nezha-fronted/src/components/page/alert/alertRule.vue | 2 ++ nezha-fronted/src/components/page/asset/asset.vue | 2 ++ nezha-fronted/src/components/page/config/dc.vue | 2 ++ nezha-fronted/src/components/page/config/ipam.vue | 1 + nezha-fronted/src/components/page/config/model.vue | 3 ++- .../src/components/page/config/recordRule.vue | 1 + .../components/page/config/template/dashboardTemp.vue | 1 + .../src/components/page/config/template/exprTemp.vue | 1 + nezha-fronted/src/components/page/dashboard/panel.vue | 4 ++-- .../components/page/monitor/endpoint/endpointList.vue | 2 ++ .../src/components/page/monitor/module/moduleList.vue | 11 ++++++----- 18 files changed, 39 insertions(+), 24 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue index de9477fd9..90c29683c 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue @@ -98,13 +98,13 @@
- - -
@@ -617,7 +617,7 @@ export default { this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) this.variables = this.$loadsh.get(this.panelData, '[0].param.variables') this.getData(this.filter) - }else { + } else { this.chartListLoading = false } } else { diff --git a/nezha-fronted/src/components/common/popBox/selectDashboard.vue b/nezha-fronted/src/components/common/popBox/selectDashboard.vue index ef205be92..1f659d4fa 100644 --- a/nezha-fronted/src/components/common/popBox/selectDashboard.vue +++ b/nezha-fronted/src/components/common/popBox/selectDashboard.vue @@ -36,9 +36,9 @@ {{node.label}} - + - +
{{$t('overall.edit')}}
@@ -75,9 +75,9 @@ {{node.label}} - + - +
{{$t('overall.edit')}}
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index 2e1bd3a8c..da589ba18 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -5,10 +5,10 @@ - +
{{$t('dashboard.panel.editPanelTitle')}}
- +
{{!panelLock ? $t("overall.locked") : $t("overall.unlocked")}}
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index 25a6acdd0..2895f40ce 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -106,13 +106,13 @@
{{$t('overall.option')}}
- +
- {{$t('overall.delete')}} + {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index 687bcd356..11d9ba9b7 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -33,6 +33,7 @@ export-url="/monitor/endpoint/export" import-url="/monitor/endpoint/import" @afterImport="getTableData" + v-has="['monitor_endpoint_add','monitor_endpoint_edit']" > @@ -101,6 +102,7 @@ export-url="/monitor/endpoint/export" import-url="/monitor/endpoint/import" @afterImport="getTableData" + v-has="['monitor_endpoint_add','monitor_endpoint_edit','monitor_endpoint_delete']" > @@ -82,8 +83,7 @@ @getTableData="getTableData" >