gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-1029 fix： topology bug修改

Browse Source
This commit is contained in:
zhangyu
2021-09-26 12:56:50 +08:00
parent 5879ca0c8a
commit 61c2259cdd
2 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
nezha-fronted/src/components/common/ChartDiagram/diagram.vue
View File

@@ -21,7 +21,7 @@
<el-collapse-item :title="item.group" :name="item.group">
<template slot="title">
<div style="display: flex;width: 100%;">
<i class="nz-icon nz-icon-arrow-right"></i> <div style="flex: 1">{{item.group}}</div> <i class="nz-icon nz-icon-delete title-delete" @click="tooltipDeleteTitle(item)"></i>
<i class="nz-icon nz-icon-caret-right"></i> <div style="flex: 1">{{item.group}}</div> <i class="nz-icon nz-icon-delete title-delete" @click="tooltipDeleteTitle(item)"></i>
</div>
</template>
<div v-for="(btn, i) in item.children" :key="'info2'+'-'+index+'-'+i" class="buttons" :title="btn.data.text">
@@ -738,10 +738,9 @@ export default {
// }
// getTopology(this.topologyIndex).fitView();
this.oldTopologyData = JSON.stringify(getTopology(this.topologyIndex).data)
this.winResize()
this.getNodesArr()
})
}
this.winResize()
})
})
},
@@ -1573,21 +1572,22 @@ export default {
if (res.code == 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.uploadPicShow = false
this.$get('monitor/project/topo/icon', { id: res.data.id }).then(iconInfo => {
this.dealImg(`monitor/project/topo/icon/${res.data.id}/1`).then((data, header) => {
const group = this.tools.find(tool => tool.group === this.uploadPic.unit)
this.iconArray.push({
...iconInfo.data.list[0],
image: data
})
if (group) {
group.children.push({
...imageTemp2,
data: {
...imageTemp2.data,
text: res.data.imageName,
image: data.data,
image: data,
imageId: res.data.id,
unit: this.uploadPic.unit,
rect: {
width: data.width,
height: data.height
}
unit: this.uploadPic.unit
}
})
} else {
@@ -1598,18 +1598,15 @@ export default {
data: {
...imageTemp2.data,
text: res.data.imageName,
image: data.data,
image: data,
imageId: res.data.id,
unit: this.uploadPic.unit,
rect: {
width: data.width,
height: data.height
}
unit: this.uploadPic.unit
}
}]
})
}
})
})
} else {
this.$message.error(res.msg)
}
@@ -1732,6 +1729,7 @@ export default {
imgArr.push({ ...item })
})
Promise.all(promiseArr).then((res2, header) => {
// console.log(res2)
this.iconArray = [...res.data.list]
this.iconArray.forEach((item, index) => {
item.image = res2[index].data
@@ -2052,7 +2050,7 @@ export default {
winResize () {
setTimeout(() => {
const domRect = getTopology(this.topologyIndex).divLayer.canvas.getBoundingClientRect()
const domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect()
getTopology(this.topologyIndex).canvasPos = domRect
if (this.fromOverView) {
getTopology(this.topologyIndex).open(this.oldTopologyData)

8
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -1138,7 +1138,7 @@ export default {
onMessage (event, data, e) {
// console.log('onMessage', event, data)
// console.log(getTopology(this.topologyIndex))
// this.notModuleIDArr=[];
this.notModuleIDArr = []
// this.toolShow.attr = false
// this.toolShow.topTool = false
// this.$nextTick(() => {
@@ -1583,8 +1583,13 @@ export default {
if (res.code == 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.uploadPicShow = false
this.$get('monitor/project/topo/icon', { id: res.data.id }).then(iconInfo => {
this.dealImg(`monitor/project/topo/icon/${res.data.id}/1`).then((data, header) => {
const group = this.tools.find(tool => tool.group === this.uploadPic.unit)
this.iconArray.push({
...iconInfo.data.list[0],
image: data
})
if (group) {
group.children.push({
...imageTemp,
@@ -1612,6 +1617,7 @@ export default {
})
}
})
})
} else {
this.$message.error(res.msg)
}