diff --git a/nezha-fronted/src/components/chart/chart/chartGroup.vue b/nezha-fronted/src/components/chart/chart/chartGroup.vue
index 0e20aa002..eb12424e2 100644
--- a/nezha-fronted/src/components/chart/chart/chartGroup.vue
+++ b/nezha-fronted/src/components/chart/chart/chartGroup.vue
@@ -54,14 +54,14 @@ export default {
},
initChart () {
- setTimeout(() => {
- this.dataList = this.dataList.map(item => {
- return {
- ...item
- // hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件
- }
- })
- }, 100)
+ // setTimeout(() => {
+ // this.dataList = this.dataList.map(item => {
+ // return {
+ // ...item
+ // // hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件
+ // }
+ // })
+ // }, 100)
}
},
watch: {
diff --git a/nezha-fronted/src/components/chart/chart/chartLog.vue b/nezha-fronted/src/components/chart/chart/chartLog.vue
index ecf06825d..969baf067 100644
--- a/nezha-fronted/src/components/chart/chart/chartLog.vue
+++ b/nezha-fronted/src/components/chart/chart/chartLog.vue
@@ -37,7 +37,7 @@
style="height: 100%"
:show-header="false"
ref="logTable"
- class="nz-table2"
+ class="nz-table-list"
size="mini"
v-if="tableData.length"
>
diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue
index 15f066536..6c82459a4 100644
--- a/nezha-fronted/src/components/chart/chart/chartMap.vue
+++ b/nezha-fronted/src/components/chart/chart/chartMap.vue
@@ -195,7 +195,7 @@ export default {
-
${self.$t('guide.agent')} ${self.$t('overall.normal')}
+
${self.$t('guide.agent')} ${self.$t('config.agent.up')}
@@ -203,7 +203,7 @@ export default {
${dcStat.agent.up}
-
${self.$t('guide.agent')} ${self.$t('overall.unusual')}
+
${self.$t('guide.agent')} ${self.$t('asset.down')}
diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue
index 4a0aec166..67513d763 100644
--- a/nezha-fronted/src/components/chart/chart/chartStat.vue
+++ b/nezha-fronted/src/components/chart/chart/chartStat.vue
@@ -4,7 +4,7 @@
class="chart-stat-item"
v-for="(item,index) in statData"
:key="index"
- @mouseenter="statMouseEnter(item)"
+ @mouseenter="statMouseEnter(item,$event)"
@mouseleave="statMouseleave(item)"
:class="statData.length===1 ?'only-stat' : ''"
:style="{
@@ -163,18 +163,42 @@ export default {
this.tooltip.x = e.pageX + 15
}
},
- statMouseEnter (that) {
+ statMouseEnter (that, e) {
this.tooltip.title = that.legend
this.tooltip.value = that.showValue
this.tooltip.mapping = that.mapping
this.tooltip.show = true
+ this.$nextTick(() => {
+ const windowWidth = window.innerWidth// 窗口宽度
+ const windowHeight = window.innerHeight// 窗口高度
+ const box = document.getElementById(`chart-canvas-tooltip-${this.chartId}`)
+ if (box) {
+ const boxWidth = box.offsetWidth
+ const boxHeight = box.offsetHeight
+ if (e.pageX < (windowWidth / 2)) { // 说明鼠标在左边放不下提示框
+ this.tooltip.x = e.pageX + 15
+ } else {
+ this.tooltip.x = e.pageX - boxWidth - 15
+ }
+ if (e.pageY + 50 + boxHeight < windowHeight) { // 说明鼠标上面放不下提示框
+ this.tooltip.y = e.pageY + 15
+ } else {
+ this.tooltip.y = e.pageY - boxHeight - 10
+ }
+ } else {
+ this.tooltip.y = e.pageY + 15
+ this.tooltip.x = e.pageX + 15
+ }
+ })
},
statMouseleave (taht) {
this.tooltip.show = false
},
getLayout () {
- this.boxWidth = this.$refs['chart-stat-box'].offsetWidth - 3 * this.boxPadding
- this.boxHeight = this.$refs['chart-stat-box'].offsetHeight - 3 * this.boxPadding
+ try {
+ this.boxWidth = this.$refs['chart-stat-box'].offsetWidth - 3 * this.boxPadding
+ this.boxHeight = this.$refs['chart-stat-box'].offsetHeight - 3 * this.boxPadding
+ } catch (error) {}
return new Promise(resolve => {
let rateMax = 0
let col = 0
diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index 2212ac35e..6ef5c3a24 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -1,5 +1,5 @@
-
+
{
- return Number(a[0]) - Number(b[0])
- })
+ const timeSorted = this.$loadsh.sortBy(datas, function (o) { return o[0] })
const valueSorted = datas.sort((a, b) => {
const a1 = isNaN(a[1]) && !a[1] ? 0 : Number(a[1])
const b1 = isNaN(b[1]) && !b[1] ? 0 : Number(b[1])
diff --git a/nezha-fronted/src/components/chart/chart/chartTopology.vue b/nezha-fronted/src/components/chart/chart/chartTopology.vue
index 247dc62c0..30bd99f42 100644
--- a/nezha-fronted/src/components/chart/chart/chartTopology.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTopology.vue
@@ -1,6 +1,13 @@
+
enter.append('g').attr('class', 'node')
- .attr('id', function (d) { return 'node' + d.id })
+ .attr('id', function (child) {
+ return 'node' + child.id
+ }
+ )
.call(drag(simulation))
.on('mouseleave', nodeMouseout)
.on('click', showChildren),
@@ -497,7 +518,9 @@ export default {
.data(nodes)
.join(
enter => enter.append('g').attr('class', 'node')
- .attr('id', function (d) { return 'node' + d.id })
+ .attr('id', function (child) {
+ return 'node' + child.id
+ })
.call(drag(simulation))
.on('mouseleave', nodeMouseout)
.on('click', showChildren),
@@ -526,6 +549,7 @@ export default {
simulation.nodes(nodes)
simulation.force('link').links(links)
simulation.restart().tick()
+ self.data.nodes = nodes
}
}
@@ -536,6 +560,10 @@ export default {
if (document.getElementById('#circle' + d.id)) {
return
}
+ box.attr('id', 'node' + d.id)
+ if (document.getElementById('node' + d.id)) {
+ document.getElementById('node' + d.id).innerHTML = ''
+ }
box.append('circle')
.attr('r', d.radius)
.attr('fill', d.color)
@@ -670,11 +698,63 @@ export default {
},
upDate () {
+ },
+ graphIconEnter (item) {
+ const svg = d3.select('#svgHex' + this.chartId)
+ const node = svg.selectAll('.node')
+ const linkCopy = svg.selectAll('line')
+ node.transition().attr('style', function (d) {
+ let str = 'opacity:'
+ if (d.type === item.type) {
+ str += 1
+ } else {
+ str += 0.05
+ }
+ return str + ';cursor:pointer'
+ }).duration(300)
+ linkCopy.transition().attr('style', function (d) {
+ let str = 'opacity:'
+ str += 0.05
+ return str + ';cursor:pointer'
+ }).duration(300)
+ },
+ graphIconLeave (item) {
+ const svg = d3.select('#svgHex' + this.chartId)
+ const node = svg.selectAll('.node')
+ const linkCopy = svg.selectAll('line')
+ node.transition().attr('style', function (d) {
+ let str = 'opacity:'
+ str += 1
+ return str + ';cursor:pointer'
+ }).duration(300)
+ linkCopy.transition().attr('style', function (d) {
+ let str = 'opacity:'
+ str += 1
+ return str + ';cursor:pointer'
+ }).duration(300)
+ }
+ },
+ watch: {
+ 'data.nodes': {
+ handler (n) {
+ this.graphIconArr = []
+ this.data.nodes.forEach(item => {
+ if (this.graphIconArr.indexOf(item.type) === -1) {
+ this.graphIconArr.push(item.type)
+ }
+ })
+ this.graphIconArr = this.graphIconArr.map(item => {
+ return this.nzIcon.find(nzIcon => nzIcon.type === item)
+ })
+ },
+ // deep: true,
+ immediate: true
}
},
created () {
},
mounted () {
+
},
beforeDestroy () {
}
diff --git a/nezha-fronted/src/components/chart/chart/grid/GridItem.vue b/nezha-fronted/src/components/chart/chart/grid/GridItem.vue
index 976249924..8a7598335 100644
--- a/nezha-fronted/src/components/chart/chart/grid/GridItem.vue
+++ b/nezha-fronted/src/components/chart/chart/grid/GridItem.vue
@@ -182,6 +182,11 @@ export default {
i: {
required: true
},
+ isGroup: {
+ type: Boolean,
+ required: false,
+ default: false
+ },
dragIgnoreFrom: {
type: String,
required: false,
@@ -699,12 +704,16 @@ export default {
// (l - m) / (c + m) = x
// x = (left - margin) / (coldWidth + margin)
let x = Math.round((left - this.margin[0]) / (colWidth + this.margin[0]))
- let y = (top - this.margin[1]) / (this.rowHeight + this.margin[1])
+ let y = ''
+ if (this.isGroup) {
+ y = Math.round((top - this.margin[1]) / (this.rowHeight + this.margin[1]))
+ } else {
+ y = (top - this.margin[1]) / (this.rowHeight + this.margin[1])
+ }
// Capping
x = Math.max(Math.min(x, this.cols - this.innerW), 0)
y = Math.max(Math.min(y, this.maxRows - this.innerH), 0)
-
return { x, y }
},
// Helper for generating column width
diff --git a/nezha-fronted/src/components/chart/chart/line-chart-block.vue b/nezha-fronted/src/components/chart/chart/line-chart-block.vue
index 4b45429bf..828f15c46 100644
--- a/nezha-fronted/src/components/chart/chart/line-chart-block.vue
+++ b/nezha-fronted/src/components/chart/chart/line-chart-block.vue
@@ -56,11 +56,11 @@
@@ -110,7 +110,7 @@
{{chartDetail? chartDetail.name : '--' }}
-
{{$t('overall.manageIp')}}
+
{{$t('asset.manageIp')}}
{{chartDetail ? chartDetail.manageIp : '--'}}
@@ -40,15 +40,15 @@
{{chartDetail.dc ? chartDetail.dc.name : '--'}}
-
{{$t('overall.cabinet')}}
+
{{$t('asset.cabinet')}}
{{chartDetail.cabinet ? chartDetail.cabinet.name : '--'}}
-
{{$t('overall.brand')}}
+
{{$t('asset.brand')}}
{{chartDetail.brand ? chartDetail.brand.name : '--'}}
-
{{$t('overall.model')}}
+
{{$t('asset.model')}}
{{chartDetail.model ? chartDetail.model.name : '--'}}