diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index f10e7a188..ac7aa38da 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1272,7 +1272,7 @@ li { } } } -.import-result-dialog{ +.import-failContent-dialog{ .el-dialog__header{ padding: 14px; border-bottom: 1px solid $--border-color-light; diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index 5ff601fd3..18a9cc86a 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -32,7 +32,7 @@ width="580px" :modal-append-to-body="false" @close="closeDialog" - :class="{'import-result-dialog':importBox.type==3}" + :class="{'import-failContent-dialog':importBox.type==3&&importResult.failContent!=undefined}" class="nz-dialog">
@@ -124,8 +124,61 @@
- -
+ +
+
+
+
+
+ + {{$t('overall.result.successNum',{successNum:importResult.successNum})}}
+
+
+ + {{$t('overall.result.failedNum',{failedNum:importResult.failNum,total:importResult.totalNum})}} +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
{{$t('overall.result.successfully')}}
+
+ {{$t('overall.result.imported')}} + {{importResult.successNum}} + {{$t('overall.result.records')}} +
+
+
+ +
+ + +
@@ -181,7 +234,7 @@
-
+
@@ -214,15 +267,13 @@ -
+ @@ -456,7 +507,7 @@ export default { this.importResult = null this.importFileList = [] this.importFile = null - this.importBox.value = 1 + this.importBox.type = 1 this.importBox.record = 'all' this.importBox.format = 1 this.importBox.templateFormat = 1 // 模板格式 diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index 07dd3d94b..222a68041 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -217,7 +217,7 @@
-
+