From ed713cd3030c97c5a904b9c3f87bdae200b9bcc0 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 14 Sep 2022 10:15:35 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2195=20feat=EF=BC=9Amodule=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

---
 .../common/bottomBox/tabs/endpointTabNew.vue  |  2 +-
 .../common/popBox/topToolMoreOptions.vue      | 20 +++++++++----------
 .../src/components/page/alert/alertRule.vue   |  2 --
 .../page/config/template/chartTemp.vue        |  2 --
 .../page/monitor/module/moduleList.vue        |  2 --
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
index 86f9a0f77..482eb0228 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -62,7 +62,7 @@ import alertSilenceBox from '@/components/common/rightBox/alertSilenceBox'
 import detailViewRightMixin from '@/components/common/mixin/detailViewRightMixin'
 
 export default {
-  name: 'terminalLogTab',
+  name: 'endpointTabNew',
   mixins: [dataListMixin, subDataListMixin, detailViewRightMixin],
   components: {
     nzBottomDataList,
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index c24dc5a05..eee759b86 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -238,17 +238,17 @@ export default {
     language () { return this.$store.getters.getLanguage },
     // 显示新版导入
     importType () {
-      const arr = ['/asset/asset/import']
+      const arr = ['/asset/asset/import', '/monitor/module/import']
       return arr.some(item => item === this.importUrl)
     },
     // 已存在的内容处理方式
     showEexisted () {
-      const arr = ['/asset/asset/import']
+      const arr = ['/asset/asset/import', '/monitor/module/import']
       return arr.some(item => item === this.importUrl)
     },
     // 遇到错误是否继续导入
     showIgnoreError () {
-      const arr = ['/asset/asset/import']
+      const arr = ['/asset/asset/import', '/monitor/module/import']
       return arr.some(item => item === this.importUrl)
     },
     // 是否同步更新关联的dashboard
@@ -258,7 +258,7 @@ export default {
     },
     // 是否同步更新关联的endpoint
     showSyncEndpoint () {
-      const arr = ['/asset/asset/import']
+      const arr = ['/asset/asset/import', '/monitor/module/import']
       return arr.some(item => item === this.importUrl)
     }
   },
@@ -272,9 +272,9 @@ export default {
         format: 1,
         templateFormat: 1, // 模板格式
         existed: 0, // 已存在的内容处理方式
-        ignoreError: Boolean(0), // 遇到错误是否继续导入
-        syncDashboard: Boolean(0), // 是否同步更新关联的dashboard
-        syncEndpoint: Boolean(0) // 是否同步更新关联的endpoint
+        ignoreError: 0, // 遇到错误是否继续导入
+        syncDashboard: 0, // 是否同步更新关联的dashboard
+        syncEndpoint: 0 // 是否同步更新关联的endpoint
       },
       existedArr: [
         { name: this.$t('overall.error'), value: 0 },
@@ -424,9 +424,9 @@ export default {
           this.importBox.format = 1
           this.importBox.templateFormat = 1 // 模板格式
           this.importBox.existed = 0// 已存在的内容处理方式
-          this.importBox.ignoreError = Boolean(0) // 遇到错误是否继续导入
-          this.importBox.syncDashboard = Boolean(0) // 是否同步更新关联的dashboard
-          this.importBox.syncEndpoint = Boolean(0)// 是否同步更新关联的endpoint
+          this.importBox.ignoreError = 0 // 遇到错误是否继续导入
+          this.importBox.syncDashboard = 0 // 是否同步更新关联的dashboard
+          this.importBox.syncEndpoint = 0 // 是否同步更新关联的endpoint
         })
       }, 200)
     },
diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index b4d0f6165..8133c204e 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -154,7 +154,6 @@
 </template>
 <script>
 import bus from '@/libs/bus'
-import exportXLSX from '@/components/common/exportXLSX'
 import alertRuleBox from '@/components/common/rightBox/alertRuleBox'
 import deleteButton from '@/components/common/deleteButton'
 import nzDataList from '@/components/common/table/nzDataList'
@@ -175,7 +174,6 @@ export default {
     alertRuleBox,
     alertRuleTable,
     nzDataList,
-    'export-excel': exportXLSX,
     topToolMoreOptions,
     alertSilenceBox,
     nzDetailView,
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 43ad82314..d812092b4 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -108,7 +108,6 @@
 </template>
 
 <script>
-import exportXLSX from '@/components/common/exportXLSX'
 import deleteButton from '@/components/common/deleteButton'
 import dataListMixin from '@/components/common/mixin/dataList'
 import chartTmplTable from '@/components/common/table/settings/chartTmplTable'
@@ -122,7 +121,6 @@ export default {
   components: {
     deleteButton,
     chartTmplTable,
-    'export-excel': exportXLSX,
     topToolMoreOptions,
     chartRightBox
   },
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index 991aad461..2a76e82fd 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -162,7 +162,6 @@ import moduleBox from '@/components/common/rightBox/moduleBox'
 import nzDataList from '@/components/common/table/nzDataList'
 import dataListMixin from '@/components/common/mixin/dataList'
 import moduleTable from '@/components/common/table/settings/moduleTable'
-import exportXLSX from '@/components/common/exportXLSX'
 import alertSilenceBox from '@/components/common/rightBox/alertSilenceBox'
 import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions'
 import nzDetailView from '@/components/common/detailView/nzDetailView'
@@ -178,7 +177,6 @@ export default {
     moduleBox,
     deleteButton,
     moduleTable,
-    'export-excel': exportXLSX,
     alertSilenceBox,
     topToolMoreOptions,
     nzDetailView,