diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index 61ca2c24b..eef23e904 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -491,7 +491,7 @@ export default { id: 'endpoint', title: this.$t('project.topology.endpoint') }, - { top: '-40px', left: '19px', className: 'nz-icon-asset', id: 'asset', title: this.$t('project.topology.asset') }, + { top: '-40px', left: '19px', className: 'nz-icon-asset', id: 'asset', title: this.$t('asset.asset') }, { top: '-4px', left: '40px', className: '', id: 'other', title: '' }, { top: '30px', left: '19px', className: '', id: 'other', title: '' }, { top: '30px', left: '-21px', className: 'nz-icon-info-normal', id: 'info', title: this.$t('project.topology.info') }, diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index 8e3777488..fc6fb446c 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -232,22 +232,22 @@ export default { ] }, model: [ - { prop: 'asset', name: this.$t('guide.asset'), active: true } + { prop: 'asset', name: this.$t('asset.asset'), active: true } ], dc: { cabinet: [ { prop: 'cabinet', name: this.$t('asset.cabinet'), active: true }, - { prop: 'asset', name: this.$t('guide.asset'), active: false }, + { prop: 'asset', name: this.$t('asset.asset'), active: false }, { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false } ], asset: [ { prop: 'cabinet', name: this.$t('asset.cabinet'), active: false }, - { prop: 'asset', name: this.$t('guide.asset'), active: true }, + { prop: 'asset', name: this.$t('asset.asset'), active: true }, { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false } ], alertMessage: [ { prop: 'cabinet', name: this.$t('asset.cabinet'), active: false }, - { prop: 'asset', name: this.$t('guide.asset'), active: false }, + { prop: 'asset', name: this.$t('asset.asset'), active: false }, { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true } ] }, diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue index 3942a70e3..e231864f8 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue @@ -206,7 +206,7 @@ export default { show: true, width: '120' }, { - label: this.$t('guide.asset'), + label: this.$t('asset.asset'), prop: 'asset', show: true, minWidth: '400' diff --git a/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue b/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue index 70a4c54a8..436c42e04 100644 --- a/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue @@ -83,7 +83,7 @@ export default { minWidth: 100, sortable: 'custom' }, { - label: this.$t('guide.asset'), + label: this.$t('asset.asset'), prop: 'assetNum', show: true, minWidth: 90, diff --git a/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue b/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue index 99200e811..d7b5cee91 100644 --- a/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue @@ -80,7 +80,7 @@ export default { sortable: 'custom' }, { - label: this.$t('guide.asset'), + label: this.$t('asset.asset'), prop: 'asset', show: true, minWidth: 90, diff --git a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue index 543243ff4..9a6db8843 100644 --- a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue +++ b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue @@ -216,22 +216,22 @@ export default { ] }, model: [ - { prop: 'asset', name: this.$t('guide.asset'), active: true } + { prop: 'asset', name: this.$t('asset.asset'), active: true } ], dc: { cabinet: [ { prop: 'cabinet', name: this.$t('asset.cabinet'), active: true }, - { prop: 'asset', name: this.$t('guide.asset'), active: false }, + { prop: 'asset', name: this.$t('asset.asset'), active: false }, { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false } ], asset: [ { prop: 'cabinet', name: this.$t('asset.cabinet'), active: false }, - { prop: 'asset', name: this.$t('guide.asset'), active: true }, + { prop: 'asset', name: this.$t('asset.asset'), active: true }, { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false } ], alertMessage: [ { prop: 'cabinet', name: this.$t('asset.cabinet'), active: false }, - { prop: 'asset', name: this.$t('guide.asset'), active: false }, + { prop: 'asset', name: this.$t('asset.asset'), active: false }, { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true } ] } diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue index b4fee07df..c372159d0 100644 --- a/nezha-fronted/src/components/common/popBox/guide.vue +++ b/nezha-fronted/src/components/common/popBox/guide.vue @@ -94,7 +94,7 @@ export default { }, { route: '/asset', - title: this.$t('guide.asset'), + title: this.$t('asset.asset'), icon: 'nz-icon nz-icon-menu-assets', tip: this.$t('guide.assetTip'), permissionCode: 'asset_view' diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 5d0d96400..fc0f52a95 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -1482,6 +1482,16 @@ export default { // this.topologyData.data.rule= !!dataOption.rule; // this.topologyData.data.projectInfo= !!dataOption.projectInfo; // this.topologyData.data.alertInfo= !!dataOption.alertInfo; + // window.addEventListener('keydown', (e) => { + // if (e.target.className === 'cm-content cm-lineWrapping' && e.keyCode === 8) { + // if (e & e.stopPropagation) { + // e.stopPropagation() // iie 6, 7, 8 + // } else { + // window.event.cancleBubble = true + // } + // return false + // } + // }) }, updated (n, o) { if (!this.selection.pen) { // 没选中node line返回 diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue index eed552205..80deedb00 100644 --- a/nezha-fronted/src/components/common/project/popData/alertTable.vue +++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue @@ -1,7 +1,7 @@