diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 16d508dcd..be6a38981 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1178,7 +1178,7 @@ li { border-radius: 2px; padding: 12px; margin-top: 10px; - height: 180px; + height: 184px; .import-result-item { display: flex; margin-bottom: 5px; @@ -1430,6 +1430,9 @@ li { .transparent-pop{ //防止popover的提示框挡住页面元素无法操作 pointer-events: none; } +.el-dialog__headerbtn{ + border: none !important; +} .chart-no-data{ position: absolute; diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index d5ed257b4..aed757410 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -32,10 +32,35 @@ width="580px" :modal-append-to-body="false" @close="closeDialog" - :class="{'import-failContent-dialog':importBox.type==3&&importResult.failContent!=undefined}" + :class="{'import-failContent-dialog':importBox.type==3&&resultNew}" class="nz-dialog"> + + +
+
+ +
{{$t('overall.importTip')}}
+ +
{{$t('overall.dragFileTip')}},{{$t('overall.or')}} {{$t('overall.clickUpload')}}
+
+
+ +
+ -
+
@@ -125,7 +150,7 @@
-
+
@@ -181,7 +206,7 @@
-
+
@@ -335,6 +360,18 @@ export default { }, computed: { language () { return this.$store.getters.getLanguage }, + // 是否展示新版导入 + importNew () { + // chartTemplate dashboard asset endpoint导入样式维持原状 + const arr = ['/visual/panel/import', '/asset/asset/import', '/monitor/endpoint/import'] + return !arr.some(item => item === this.importUrl) + }, + // 是否展示新版导入结果 + resultNew () { + // model module rule dc cabinet ip subnet record + const arr = ['/asset/model/import', '/monitor/module/import', '/alert/rule/import', '/dc/import', '/dc/cabinet/import', '/ipam/ip/import', '/ipam/subnet/import', '/record/rule/import'] + return arr.some(item => item === this.importUrl) + }, // 是否同步更新关联的dashboard showSyncDashboard () { // asset endpoint model