diff --git a/src/ibp/constant/deviceRender.js b/src/ibp/constant/deviceRender.js index f4a56600e..bae17df1a 100644 --- a/src/ibp/constant/deviceRender.js +++ b/src/ibp/constant/deviceRender.js @@ -30,13 +30,6 @@ deviceRender[deviceType.Arrow] = { z: 2 }; -/** RotatingButton渲染配置*/ -deviceRender[deviceType.RotatingButton] = { - _type: deviceType.RotatingButton, - zlevel: 1, - z: 3 -}; - /** TipBox渲染配置*/ deviceRender[deviceType.TipBox] = { _type: deviceType.TipBox, diff --git a/src/ibp/constant/deviceType.js b/src/ibp/constant/deviceType.js index a61df0c64..04c906eb6 100644 --- a/src/ibp/constant/deviceType.js +++ b/src/ibp/constant/deviceType.js @@ -2,7 +2,6 @@ const deviceType = { IbpText: 'IbpText', SquareButton: 'SquareButton', Arrow: 'Arrow', - RotatingButton: 'RotatingButton', TipBox: 'TipBox', Background: 'Background', CircularLamp: 'CircularLamp', diff --git a/src/ibp/shape/factory.js b/src/ibp/shape/factory.js index 0bf72c649..4086bbe4b 100644 --- a/src/ibp/shape/factory.js +++ b/src/ibp/shape/factory.js @@ -8,7 +8,6 @@ import IbpLine from './ibpLine'; import Button from './button'; import TipBox from './ibpTipBox'; import AppendageBox from './appendageBox'; -import RotatingButton from './rotatingButton'; import Elevator from './elevator'; import Key from './key'; import TeleTerminal from './teleTerminal'; @@ -25,7 +24,6 @@ ibpShape[deviceType.IbpLine] = IbpLine; ibpShape[deviceType.SquareButton] = Button; ibpShape[deviceType.TipBox] = TipBox; ibpShape[deviceType.AppendageBox] = AppendageBox; -ibpShape[deviceType.RotatingButton] = RotatingButton; ibpShape[deviceType.Elevator] = Elevator; ibpShape[deviceType.Key] = Key; ibpShape[deviceType.TeleTerminal] = TeleTerminal; diff --git a/src/ibp/shape/rotatingButton.js b/src/ibp/shape/rotatingButton.js deleted file mode 100644 index cdfd89b58..000000000 --- a/src/ibp/shape/rotatingButton.js +++ /dev/null @@ -1,41 +0,0 @@ -import Group from 'zrender/src/container/Group'; -import Image from 'zrender/src/graphic/Image'; -import Keyhole from '@/assets/ibp_images/keyhole.png'; - -export default class RotatingButton extends Group { - constructor(device) { - super(); - this.model = device.model; - this._type = device.model._type; - this._code = device.model.code; - this.zlevel = device.model.zlevel; - this.z = device.model.z; - this.create(); - } - - create() { - const model = this.model; - this.grouper=new Group({ - id: model.code, - position: [model.point.x, model.point.y] - }); - this.rotatingButton = new Image({ - zlevel: this.zlevel, - z: this.z, - draggable: false, - style: { - image: Keyhole, - x: 0, - y: 0, - width: model.width, - height: model.width/361*336 - } - }); - this.grouper.add(this.rotatingButton); - this.add(this.grouper); - } - setModel(dx, dy) { - this.model.point.x+=dx; - this.model.point.y+=dy; - } -} diff --git a/src/ibp/utils/parser.js b/src/ibp/utils/parser.js index 31083db32..4fc52425f 100644 --- a/src/ibp/utils/parser.js +++ b/src/ibp/utils/parser.js @@ -59,10 +59,6 @@ export function parser(data) { ibpDevice[elem.code] = deviceFactory(deviceType.Arrow, elem); }, this); - zrUtil.each(data.rotatingButtonList || [], elem => { - ibpDevice[elem.code] = deviceFactory(deviceType.RotatingButton, elem); - }, this); - zrUtil.each(data.tipBoxList || [], elem => { ibpDevice[elem.code] = deviceFactory(deviceType.TipBox, elem); }, this); @@ -130,9 +126,6 @@ export function updateIbpData(device) { case deviceType.Arrow : updateIbpListByDevice(ibpData, 'arrowList', device); break; - case deviceType.RotatingButton : - updateIbpListByDevice(ibpData, 'rotatingButtonList', device); - break; case deviceType.TipBox : updateIbpListByDevice(ibpData, 'tipBoxList', device); break; diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue deleted file mode 100644 index 40dbdca3d..000000000 --- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - - diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue index 04fdf9771..8fa3dfd6b 100644 --- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue +++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue @@ -71,12 +71,6 @@ > -