diff --git a/nezha-fronted/src/components/charts/chart-detail.vue b/nezha-fronted/src/components/charts/chart-detail.vue index 50b64e3c5..e3a5b5df8 100644 --- a/nezha-fronted/src/components/charts/chart-detail.vue +++ b/nezha-fronted/src/components/charts/chart-detail.vue @@ -67,7 +67,7 @@ -
+
{{key}}
{{key}}
diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index e43d6f55c..2046dc51a 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -1298,10 +1298,10 @@ type: 'basic', data: response.data.Basic }); - response.data.Feature && detail.push({ + response.data.Attribute && detail.push({ title: vm.$t('asset.createAssetTab.featureTitle'), - type: 'feature', - data: response.data.Feature + type: 'attribute', + data: response.data.Attribute }); }(); } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue index 6d60cd415..ab08186d4 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue @@ -244,7 +244,7 @@ break; } } - this.getTableData(this.obj.id); //删除相关图表后,刷新面板数据 + // this.getTableData(this.obj.id); //删除相关图表后,刷新面板数据 } else { console.error(response.msg); this.$message.error(response.msg); diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js index 2b9370976..ec257913e 100644 --- a/nezha-fronted/src/components/common/js/tools.js +++ b/nezha-fronted/src/components/common/js/tools.js @@ -241,7 +241,7 @@ export const bottomBoxWindow = { vm.mainResizeShow = true; } } - if(parseInt(subListDom.offsetHeight) <= 100){ + if(parseInt(subListDom.style.height) <= 100){ if (vm.subResizeShow) { vm.subResizeShow = false; } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index b71a71322..c4046fb34 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -458,7 +458,7 @@ const cn = { reLoginPwdIntroduce: "请指定密码提示以便RELOGIN登录过程可自动运行", exporter: "Exporter", basicTitle:'基础信息', - featureTitle:'特征' + featureTitle:'属性' }, editAssetTab: { title: "新增资产", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 7c489f98e..3b2682692 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -472,7 +472,7 @@ const en = { sshKeyWasConfig:'SSH-KEY configured',//'SSH-KEY已配置' exporter:'Exporter', basicTitle:'Basic info', - featureTitle:'Feature', + featureTitle:'Attribute', }, editAssetTab:{ title:'New asset',//'新增资产' diff --git a/nezha-fronted/src/components/common/popBox/selectArea.vue b/nezha-fronted/src/components/common/popBox/selectArea.vue index cb921ec74..81d6923fe 100644 --- a/nezha-fronted/src/components/common/popBox/selectArea.vue +++ b/nezha-fronted/src/components/common/popBox/selectArea.vue @@ -1,5 +1,5 @@