+
{{$t('overall.existed')}}
-
+
- -
+
-
{{$t('overall.ignoreError')}}
-
@@ -348,14 +348,6 @@ export default {
deleteObjs: Array,
exportBoxShow: {
type: Boolean, default: false
- },
- // 已存在的内容处理方式
- showEexisted: {
- type: Boolean, default: true
- },
- // 遇到错误是否继续导入
- showIgnoreError: {
- type: Boolean, default: true
}
},
computed: {
@@ -492,10 +484,8 @@ export default {
this.prevent_opt.import = true
const form = new FormData()
form.append('file', this.importFile.raw)
- if (this.showEexisted) {
+ if (this.importNew) {
form.append('existed', this.importBox.existed)
- }
- if (this.showIgnoreError) {
form.append('ignoreError', Number(this.importBox.ignoreError))
}
if (this.showSyncDashboard) {
@@ -611,6 +601,7 @@ export default {
},
exportCur () {
const params = JSON.parse(JSON.stringify(this.params))
+ console.log(params)
if (this.params2) {
Object.keys(this.params2).forEach(key => {
if (params[key]) {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index caf60e9dd..d1674a492 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -33,7 +33,7 @@
diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue
index 5f4071a91..fd054c50e 100644
--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -2,7 +2,10 @@