diff --git a/src/api/simulation.js b/src/api/simulation.js index 6e76e9a69..6f5a56f8b 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -621,9 +621,9 @@ export function getPlcGateway(group) { // }); // } -export function handlerIbpEvent(group, button) { +export function handlerIbpEvent(group, button, stationCode) { return request({ - url: `/simulation/${group}/ibp/${button}`, + url: `/simulation/${group}/ibp/${button}?stationCode=${stationCode}`, method: 'put' }); } diff --git a/src/iscs/iscs.js b/src/iscs/iscs.js index 67fad973e..5128cd07b 100644 --- a/src/iscs/iscs.js +++ b/src/iscs/iscs.js @@ -131,7 +131,6 @@ class Iscs { updateIscsData(store.state.iscs, elem); const oDevice = this.iscsDevice[code] || deviceFactory(type, elem); const nDevice = deviceFactory(type, Object.assign(oDevice.model || {}, elem)); - console.log(nDevice, '****', this.iscsDevice[code]); delete this.iscsDevice[code]; this.$painter.delete(oDevice); if (!elem._dispose) { diff --git a/src/iscs/shape/communicationButcher.js b/src/iscs/shape/communicationButcher.js index 30aa4e6fc..c3cdf93b4 100644 --- a/src/iscs/shape/communicationButcher.js +++ b/src/iscs/shape/communicationButcher.js @@ -174,16 +174,18 @@ export default class CommunicationButcher extends Group { lineWidth: 1 } }); - // x: this.model.width / 4 * 3, - // y: this.model.width / 8, - // width: this.model.width / 7, - // height: this.model.width / 12 this.line9 = new Line({ zlevel: this.zlevel, z: this.z + 1, shape: { x1: this.model.width * 3 / 4, - y1: this.model.width * 10 / 48 + y1: this.model.width / 6, + x2: this.model.width * 25 / 28, + y2: this.model.width / 6 + }, + style: { + stroke: '#000', + lineWidth: 1 } }); this.grouper.add(this.rect1); @@ -197,8 +199,8 @@ export default class CommunicationButcher extends Group { this.grouper.add(this.line6); this.grouper.add(this.line7); this.grouper.add(this.line8); + this.grouper.add(this.line9); this.add(this.grouper); - console.log(this.grouper, '-----------'); } setState(model) { if (model.state === 'normal') { diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue index e9d16c2b4..c680dc108 100644 --- a/src/views/ibp/ibpsystem/index.vue +++ b/src/views/ibp/ibpsystem/index.vue @@ -191,7 +191,7 @@ export default { onMouseDown(em) { if (em.deviceModel.mean) { if (IbpOperation[em.deviceModel.mean]) { - handlerIbpEvent(this.$route.query.group, IbpOperation[em.deviceModel.mean].event); + handlerIbpEvent(this.$route.query.group, IbpOperation[em.deviceModel.mean].event, this.stationCode); } } }, diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue index 29048ee12..2a7e4aa25 100644 --- a/src/views/iscs/iscsDesign/demonList.vue +++ b/src/views/iscs/iscsDesign/demonList.vue @@ -454,47 +454,47 @@ export default { }, { name: '自动售检票/门禁', - mode: '', - id: '', - type: '', + mode: 'fafc', + id: 'fafc', + type: 'totalSystem', children: [ { name: '自动售检票系统', - mode: '', - id: '', - type: '' + mode: 'autoTicket', + id: 'autoTicket', + type: 'interface' }, { name: '门禁系统', - mode: '', - id: '', - type: '' + mode: 'entranceGuard', + id: 'entranceGuard', + type: 'interface' } ] }, { name: '火灾报警系统', - mode: '', - id: '', - type: '', + mode: 'ffas', + id: 'ffas', + type: 'totalSystem', children: [ { name: '火灾报警系统-FAS联动', - mode: '', - id: '', - type: '' + mode: 'linkage', + id: 'linkage', + type: 'interface' }, { name: '火灾报警系统-站厅层', - mode: '', - id: '', - type: '' + mode: 'stationHall', + id: 'stationHall', + type: 'interface' }, { name: '火灾报警系统-站台层', - mode: '', - id: '', - type: '' + mode: 'platform', + id: 'platform', + type: 'interface' }, { name: '火灾报警系统-区间', diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/communicationButcher.vue b/src/views/iscs/iscsDraw/iscsCommonElem/communicationButcher.vue index c47f5e446..b4352126c 100644 --- a/src/views/iscs/iscsDraw/iscsCommonElem/communicationButcher.vue +++ b/src/views/iscs/iscsDraw/iscsCommonElem/communicationButcher.vue @@ -28,7 +28,7 @@ export default { return { form:{ code: '', - width: 20, + width: 50, x: 10, y: 10 }, @@ -96,7 +96,7 @@ export default { this.showDeleteButton = false; this.form = { code: '', - width: 20, + width: 50, x: 10, y: 10 };