From 35062498f6f4e24544f196d62f69c5480682bd31 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Fri, 30 Apr 2021 15:12:34 +0800 Subject: [PATCH 01/19] =?UTF-8?q?fix:=20settings=20=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rightBox/administration/assetTypeBox.vue | 2 +- .../components/common/rightBox/agentBox.vue | 2 +- .../common/rightBox/assetMetaBox.vue | 257 ++++++++---------- .../src/components/common/rightBox/dcBox.vue | 2 +- .../common/rightBox/exprTmplBox.vue | 2 +- .../src/components/common/rightBox/mibBox.vue | 2 +- .../common/rightBox/snmpCredentialBox.vue | 24 +- .../components/page/dashboard/chartBox.vue | 2 +- 8 files changed, 135 insertions(+), 158 deletions(-) diff --git a/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue b/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue index ea6bac563..e35c6e724 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue @@ -33,7 +33,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/agentBox.vue b/nezha-fronted/src/components/common/rightBox/agentBox.vue index cac6d6fb9..ca96dc14b 100644 --- a/nezha-fronted/src/components/common/rightBox/agentBox.vue +++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue @@ -2,7 +2,7 @@
-
{{editPromServer.id ? ($t("config.promServer.editProm") + " ID:" + editPromServer.id) : $t("config.promServer.createProm")}}
+
{{editPromServer.id ? ($t("config.promServer.editProm") + " ID:" + editPromServer.id) : $t("config.promServer.createProm")}}
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue index aa46030e5..a9f80bfa5 100644 --- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue @@ -1,152 +1,129 @@ diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue index 60b24a453..8f8b98ba1 100644 --- a/nezha-fronted/src/components/common/table/settings/projectTable.vue +++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue @@ -4,6 +4,7 @@ ref="dataTable" :data="tableData" :height="height" + style="width: calc(100% - 25px)" border @header-dragend="dragend" @sort-change="tableDataSort" diff --git a/nezha-fronted/src/components/page/monitor/project/project.vue b/nezha-fronted/src/components/page/monitor/project/project.vue index 9b6ea756e..65425bd05 100644 --- a/nezha-fronted/src/components/page/monitor/project/project.vue +++ b/nezha-fronted/src/components/page/monitor/project/project.vue @@ -549,13 +549,6 @@ export default { } } }, - getUserData () { - this.$get('sys/user/list').then(response => { - if (response.code === 200) { - this.userData = response.data.list - } - }) - }, // 刷新拓扑图 visNetworkReload () { this.$refs.facade.$refs.visNetwork.reload() @@ -617,7 +610,6 @@ export default { if (pageSize) { this.endpointPageObj.pageSize = pageSize } - this.getUserData() }, mounted () { // 初始化表头 diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue index c82b6208f..acecf780a 100644 --- a/nezha-fronted/src/components/page/monitor/project/projectList.vue +++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue @@ -23,9 +23,10 @@ v-loading="slotProps.loading" :api="url" :custom-table-title="tools.customTableTitle" - :height="mainTableHeight" + :height="projectTableHeight" :table-data="tableData" :tableId="tableId" + style="padding-right: 0" @del="del" @edit="edit" @orderBy="tableDataSort" @@ -35,7 +36,8 @@ @@ -68,6 +70,7 @@ export default { name: '', remark: '' }, + projectTableHeight: 'calc(100% - 58px)', tableId: 'projectTable', queryPermission: 'account_view', searchMsg: { // 给搜索框子组件传递的信息 @@ -140,8 +143,8 @@ export default { diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue index 87f6adbc9..ec2277db1 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue @@ -1,38 +1,45 @@