diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue index 5f4f4d1af..276a35fb4 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue @@ -122,7 +122,9 @@ export default { typeData: [], dcData: [], snmpCredentialData: [], - fieldGroupData: [] + fieldGroupData: [], + needAlertDaysData: true, + trendKey: 'assetId' } }, methods: { @@ -239,6 +241,25 @@ export default { for (let i = 0; i < response.data.list.length; i++) { response.data.list[i].status = response.data.list[i].status + '' } + if (this.needAlertDaysData) { + response.data.list.forEach(item => { + item.trendLoading = true + item.alertDaysData = [ + { + metric: { priority: 'P1' }, + values: [[0, 0]] + }, + { + metric: { priority: 'P2' }, + values: [[0, 0]] + }, + { + metric: { priority: 'P3' }, + values: [[0, 0]] + } + ] + }) + } this.tableData = response.data.list this.pageObj.total = response.data.total if (!this.scrollbarWrap) { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue index 69c9e5ca3..d09520fc7 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue @@ -117,7 +117,9 @@ export default { disabled: false } ] - } + }, + needAlertDaysData: true, + trendKey: 'cabinetId' } }, created () { @@ -148,6 +150,25 @@ export default { for (let i = 0; i < response.data.list.length; i++) { response.data.list[i].status = response.data.list[i].status + '' } + if (this.needAlertDaysData) { + response.data.list.forEach(item => { + item.trendLoading = true + item.alertDaysData = [ + { + metric: { priority: 'P1' }, + values: [[0, 0]] + }, + { + metric: { priority: 'P2' }, + values: [[0, 0]] + }, + { + metric: { priority: 'P3' }, + values: [[0, 0]] + } + ] + }) + } this.tableData = response.data.list this.pageObj.total = response.data.total if (!this.scrollbarWrap) { diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index 97a446913..942645b84 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -102,6 +102,25 @@ export default { for (let i = 0; i < response.data.list.length; i++) { response.data.list[i].status = response.data.list[i].status + '' } + if (this.needAlertDaysData) { + response.data.list.forEach(item => { + item.trendLoading = true + item.alertDaysData = [ + { + metric: { priority: 'P1' }, + values: [[0, 0]] + }, + { + metric: { priority: 'P2' }, + values: [[0, 0]] + }, + { + metric: { priority: 'P3' }, + values: [[0, 0]] + } + ] + }) + } this.tableData = response.data.list const globalSearchId = this.$store.getters.getGlobalSearchId let detailViewRightObj = '' diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js index d8141975c..abba627b9 100644 --- a/nezha-fronted/src/components/common/mixin/table.js +++ b/nezha-fronted/src/components/common/mixin/table.js @@ -103,6 +103,20 @@ export default { arr.unshift(obj) } return arr + }, + tooltipHover (item, flag, e) { + if (e) { + const dom = e.currentTarget + const position = dom.getBoundingClientRect() + item.left = position.left + this.$set(item, 'left', position.left) + if (position.top > window.innerHeight / 2) { + this.$set(item, 'top', position.top - 55) + } else { + this.$set(item, 'top', position.top + 30) + } + this.$set(item, 'alertNumtooltipShow', flag) + } } }, watch: { diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue index 248d16eb6..eddb9ff04 100644 --- a/nezha-fronted/src/components/common/table/asset/assetTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue @@ -347,20 +347,6 @@ export default { this.$set(item, 'loading', loading) // this.$set(this.tableData,index,item);// 调用父组件 }, - tooltipHover (item, flag, e) { - if (e) { - const dom = e.currentTarget - const position = dom.getBoundingClientRect() - item.left = position.left - this.$set(item, 'left', position.left) - if (position.top > window.innerHeight / 2) { - this.$set(item, 'top', position.top - 100) - } else { - this.$set(item, 'top', position.top + 30) - } - this.$set(item, 'alertNumtooltipShow', flag) - } - }, returnCabinet (start, end) { // 返回机柜u位信息 if (!start || !end) { return '' diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue index c02838aea..87b355273 100644 --- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue +++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue @@ -26,7 +26,20 @@ {{scope.row.assetNum ? scope.row.assetNum : 0}} @@ -65,15 +78,18 @@