diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index 48fda71bf..baf465be0 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -377,6 +377,7 @@ export default { icon: 'icon-rect', data: { text: 'rect', + type: 0, rect: { width: 100, height: 100 @@ -396,6 +397,7 @@ export default { name: 'rectangleImg2', icon: 'icon-rect', data: { + type: 0, text: 'rect', rect: { width: 100, @@ -416,6 +418,7 @@ export default { name: 'rectangleImg2', icon: 'icon-rect', data: { + type: 0, text: 'rect', rect: { width: 100, @@ -848,7 +851,7 @@ export default { // data = JSON.parse(localStorage.getItem('topoData')) if (!res.data.topo || !data.pens) { data = { - bkColor: '#FFFFFF00', + background: '#FFFFFF00', gridSize: 10, gridColor: '#ededed', lineWidth: 1, @@ -930,8 +933,8 @@ export default { if (!data.bkImage) { data.bkImage = undefined } - if (data.bkColor === '#FFFFFF') { - data.bkColor = '#FFFFFF00' + if (data.background === '#FFFFFF') { + data.background = '#FFFFFF00' } if (!res.data.topo.newData) { data.pens = this.$loadsh.orderBy(data.pens, 'type', 'desc') // 先处理线 再处理点 因为新版本 将连线开始结束放在的 点上控制 @@ -1731,13 +1734,13 @@ export default { // 联动 project changeProjectTitle () { const data = getTopology(this.topologyIndex).data() - this.topologyInfo = { - fontSize: data.data.fontSize, - align: data.data.align, - fontColor: data.data.fontColor, - opacity: data.data.opacity, - name: data.name - } + // this.topologyInfo = { + // fontSize: data.data.fontSize, + // align: data.data.align, + // fontColor: data.data.fontColor, + // opacity: data.data.opacity, + // name: data.name + // } }, /* tools 方法 */ diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 9c9b82d37..a78bfdea6 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -914,7 +914,7 @@
-
@@ -1174,7 +1174,7 @@ export default { topologyData: { data: { name: '', - bkColor: '#FFFFFF', + background: '#FFFFFF', bkImage: '', lineName: 'curve', lineWidth: 1, @@ -1701,13 +1701,14 @@ export default { } else { this.topologyData.data[key] = val } - Object.keys(this.topologyData.data).forEach((key1) => { - if (key1 === 'projectInfo' || key1 === 'alertInfo' || key1 === 'fontSize' || key1 === 'align' || key1 === 'textColor' || key1 === 'opacity') { - getTopology(this.index).data().data[key1] = this.topologyData.data[key1] - } else { - getTopology(this.index).data()[key1] = this.topologyData.data[key1] - } - }) + // Object.keys(this.topologyData.data).forEach((key1) => { + // if (key1 === 'projectInfo' || key1 === 'alertInfo' || key1 === 'fontSize' || key1 === 'align' || key1 === 'textColor' || key1 === 'opacity') { + // getTopology(this.index).data().data[key1] = this.topologyData.data[key1] + // } else { + // getTopology(this.index).data()[key1] = this.topologyData.data[key1] + // } + // }) + getTopology(this.index).setBackgroundColor(this.topologyData.data.background) getTopology(this.index).render() this.$emit('changeProjectTitle') }, diff --git a/nezha-fronted/src/components/common/project/L5/services/canvas.js b/nezha-fronted/src/components/common/project/L5/services/canvas.js index 09a1a7efe..46c121b75 100644 --- a/nezha-fronted/src/components/common/project/L5/services/canvas.js +++ b/nezha-fronted/src/components/common/project/L5/services/canvas.js @@ -28,6 +28,7 @@ export const Tools = [ type: 0, data: { text: 'rect', + type: 0, width: 100, height: 100, paddingLeft: 10, @@ -43,6 +44,7 @@ export const Tools = [ type: 0, data: { text: 'rectangle', + type: 0, width: 200, height: 50, paddingLeft: 10, @@ -62,6 +64,7 @@ export const Tools = [ type: 0, data: { text: 'circle', + type: 0, width: 100, height: 100, name: 'circle', @@ -74,6 +77,7 @@ export const Tools = [ type: 0, data: { text: 'triangle', + type: 0, width: 100, height: 100, name: 'triangle' @@ -85,6 +89,7 @@ export const Tools = [ type: 0, data: { text: 'diamond', + type: 0, width: 100, height: 100, name: 'diamond' @@ -96,6 +101,7 @@ export const Tools = [ type: 0, data: { text: 'pentagon', + type: 0, width: 100, height: 100, name: 'pentagon' @@ -107,6 +113,7 @@ export const Tools = [ type: 0, data: { text: 'hexagon', + type: 0, width: 100, height: 100, paddingTop: 10, @@ -120,6 +127,7 @@ export const Tools = [ type: 0, data: { text: 'pentagram', + type: 0, width: 100, height: 100, name: 'pentagram' diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 1a6dc01ef..c127de7d6 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -861,7 +861,7 @@ export default { // data = JSON.parse(localStorage.getItem('topoData')) if (!res.data.topo || !data.pens) { data = { - bkColor: '#FFFFFF00', + background: '#FFFFFF00', gridSize: 10, gridColor: '#ededed', lineWidth: 1, @@ -984,8 +984,8 @@ export default { if (!data.bkImage) { data.bkImage = undefined } - if (data.bkColor === '#FFFFFF') { - data.bkColor = '#FFFFFF00' + if (data.background === '#FFFFFF') { + data.background = '#FFFFFF00' } Promise.all(promiseArr).then(res => { res[0].data.list.forEach((module, index) => { @@ -2206,13 +2206,13 @@ export default { // 联动 project changeProjectTitle () { const data = getTopology(this.topologyIndex).data() - this.topologyInfo = { - fontSize: data.data.fontSize, - align: data.data.align, - fontColor: data.data.fontColor, - opacity: data.data.opacity, - name: data.name - } + // this.topologyInfo = { + // fontSize: data.data.fontSize, + // align: data.data.align, + // fontColor: data.data.fontColor, + // opacity: data.data.opacity, + // name: data.name + // } }, /* tools 方法 */