From acb63a1a8a17f92f018bdb95c3be6fb92bf239d7 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 15 Jul 2022 10:19:15 +0800 Subject: [PATCH] stage --- src/jmapNew/shape/graph/SignalButton/index.js | 44 +- .../theme/datie_jd1a/menus/menuButton.vue | 48 +- src/utils/baseUrl.js | 4 +- .../newMapdraft/mapoperate/signalButton.vue | 733 ++++++++++-------- 4 files changed, 513 insertions(+), 316 deletions(-) diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index a533eafb0..d263556f3 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -3,6 +3,7 @@ import Rect from 'zrender/src/graphic/shape/Rect'; import Line from 'zrender/src/graphic/shape/Line'; import Text from 'zrender/src/graphic/Text'; import Arc from 'zrender/src/graphic/shape/Arc'; +import Circle from 'zrender/src/graphic/shape/Circle'; import store from '@/store/index'; export default class SignalButton extends Group { @@ -43,7 +44,48 @@ export default class SignalButton extends Group { } }); this.add(this.arcShape); - } else { + } else if (model.buttonShape === 'roundWithDock') { //TODO 通过线路配置(this.style)和按钮类型(type)判断 + const circle1 = new Circle({ + zlevel: this.zlevel, + z: this.z + 2, + shape: { + cx: this.model.position.x + 7, + cy: this.model.position.y + 7, + r: 7 + }, + style: { + stroke: '#69666E', + lineWidth: 1, + fill: fillColor + } + }) + const circle2 = new Circle({ + zlevel: this.zlevel, + z: this.z + 1, + shape: { + cx: this.model.position.x + 7, + cy: this.model.position.y + 9, + r: 8 + }, + style: { + fill: '#000' + } + }) + const circle3 = new Circle({ + zlevel: this.zlevel, + z: this.z, + shape: { + cx: this.model.position.x + 7, + cy: this.model.position.y + 9, + r: 9 + }, + style: { + fill: '#eee' + } + }) + this.arcShape = circle1 + this.add(circle1).add(circle2).add(circle3) + } else { this.rectButton = new Rect({ zlevel: this.zlevel, z: this.z, diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue index 461c38c4a..6b23c903e 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue @@ -50,13 +50,59 @@ - +
+ + + + + +