From 294c8437d919119a50bb7869200b33e17f77a476 Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 14 Sep 2022 17:05:23 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2196=20feat=EF=BC=9AEndpoint=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=85=A5=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/stylus/main.scss | 1 + .../common/popBox/topToolMoreOptions.vue | 35 ++++++++++--------- .../page/monitor/endpoint/endpointList.vue | 15 ++++---- .../page/monitor/project/projectList.vue | 6 ++-- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index a13dcc7ef..331c58266 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1215,6 +1215,7 @@ li { } .result-success-txt{ margin-top: 10px; + color: $--color-text-primary; } } .result-body{ diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index eee759b86..d04ac8f76 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -24,6 +24,7 @@ +
@@ -57,7 +58,7 @@
-
+
+
@@ -170,7 +172,7 @@
{{$t('overall.result.successfully')}}
{{$t('overall.result.imported')}} - {{importResult.successNum}} + {{importResult.successNum}} {{$t('overall.result.records')}}
@@ -238,26 +240,31 @@ export default { language () { return this.$store.getters.getLanguage }, // 显示新版导入 importType () { - const arr = ['/asset/asset/import', '/monitor/module/import'] + // asset module endpoint + const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import'] return arr.some(item => item === this.importUrl) }, // 已存在的内容处理方式 showEexisted () { - const arr = ['/asset/asset/import', '/monitor/module/import'] + // asset module endpoint + const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import'] return arr.some(item => item === this.importUrl) }, // 遇到错误是否继续导入 showIgnoreError () { - const arr = ['/asset/asset/import', '/monitor/module/import'] + // asset module endpoint + const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import'] return arr.some(item => item === this.importUrl) }, // 是否同步更新关联的dashboard showSyncDashboard () { - const arr = ['/asset/asset/import'] + // asset endpoint + const arr = ['/asset/asset/import', '/monitor/endpoint/import'] return arr.some(item => item === this.importUrl) }, // 是否同步更新关联的endpoint showSyncEndpoint () { + // asset module const arr = ['/asset/asset/import', '/monitor/module/import'] return arr.some(item => item === this.importUrl) } @@ -673,16 +680,13 @@ export default { const split = '-' const date = new Date() const year = date.getFullYear() - const month = this.formatNum(date.getMonth() + 1) - const day = this.formatNum(date.getDate()) - const hours = this.formatNum(date.getHours()) - const minutes = this.formatNum(date.getMinutes()) - const seconds = this.formatNum(date.getSeconds()) + const month = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + const hours = String(date.getHours()).padStart(2, '0') + const minutes = String(date.getMinutes()).padStart(2, '0') + const seconds = String(date.getSeconds()).padStart(2, '0') return year + split + month + split + day + ' ' + hours + split + minutes + split + seconds }, - formatNum (num) { - return num > 9 ? num : '0' + num - }, editPanel () { this.$get('visual/panel/' + this.params.panelId).then(res => { if (res.code === 200) { @@ -744,6 +748,3 @@ export default { } } - diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index 4182faf4f..8ea580f9d 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -86,8 +86,7 @@ - - - + + + + +
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue index 3694e967b..473bdfe0f 100644 --- a/nezha-fronted/src/components/page/monitor/project/projectList.vue +++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue @@ -11,8 +11,7 @@ @search="search" >