diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss index fac1c277c..6e6585dbc 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss @@ -164,6 +164,7 @@ height: 72px; border-radius: 0 0 6px 6px; background: $--background-color-empty; + border-top: 1px solid $--border-color-light; display: flex; >div{ width: 50%; diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index 8276edeed..cf6dd0519 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -102,10 +102,10 @@ export default { if (tagKey !== '__name__') { legend += `${tagKey}="${data.metric[tagKey]}",` } - if (legend.endsWith(',')) { - legend = legend.substr(0, legend.length - 1) - } }) + if (legend.endsWith(',')) { + legend = legend.substr(0, legend.length - 1) + } if (data.metric.__name__) { legend += '}' } diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue index 03c59b7be..46d24420a 100644 --- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue +++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue @@ -64,7 +64,7 @@
- + {{getPathContent(item.key)}} @@ -396,6 +396,9 @@ export default { }, getPathContent (key) { let str = lodash.get(this.alertLabelData, key, '--') + if (key === 'alertNum') { + str += '' + } if (key === 'pingInfo.rtt' && str && str !== '--') { str += ' ms' } diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index b270ae086..5123522ed 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -544,6 +544,9 @@ export default { setLocationData ({ cabinet, dc, u }) { this.editAsset.cabinetId = cabinet ? cabinet.id : '' this.editAsset.dcId = dc ? dc.id : '' + if (this.editAsset.dcId) { + this.$refs.form.validateField('location') + } if (u) { this.editAsset.cabinetStart = u[0] this.editAsset.cabinetEnd = u[1]