From 40cb954be49523d5ba6ce326d79b881ac5826c6d Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 2 Dec 2019 15:25:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/config/skinCode/fuzhou_01.js | 8 +- src/jmapNew/shape/StationControl/index.js | 306 +++++++++--------- .../newMapdraft/mapoperate/stationcontrol.vue | 74 +++-- 3 files changed, 201 insertions(+), 187 deletions(-) diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js index 5a640b4e3..9dec277f5 100644 --- a/src/jmap/config/skinCode/fuzhou_01.js +++ b/src/jmap/config/skinCode/fuzhou_01.js @@ -242,7 +242,13 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 - textVerticalAlign: 'top' // 字体垂直对齐 + textVerticalAlign: 'top', // 字体垂直对齐 + centerControlText: '中控', // 中控文字内容 + substationControlText: '站控', // 站控文字内容 + emergencyControlText:'紧急站控', // 紧急站控文字内容 + interconnectedControlText:'连锁控' // 连锁控文字内容 + // stationCenterControlText: '站中控', // 站中控文字内容 + // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 2, // 控制模式灯个数 diff --git a/src/jmapNew/shape/StationControl/index.js b/src/jmapNew/shape/StationControl/index.js index 953981194..1dd6b2fb2 100644 --- a/src/jmapNew/shape/StationControl/index.js +++ b/src/jmapNew/shape/StationControl/index.js @@ -9,158 +9,162 @@ import EMouse from './EMouse'; /** 控制模式*/ export default class StationControl extends Group { - constructor(model, style) { - super(); - this.selected = false; - this._code = model.code; - this._type = model._type; - this.zlevel = model.zlevel; - this.z = 1; - this.model = model; - this.style = style; - this.create(); - this.createMouseEvent(); - this.setState(model); - } + constructor(model, style) { + super(); + this.selected = false; + this._code = model.code; + this._type = model._type; + this.zlevel = model.zlevel; + this.z = 1; + this.model = model; + this.style = style; + this.create(); + this.createMouseEvent(); + this.setState(model); + } - create() { - const model = this.model; - // 紧急站控 - if (this.style.StationControl.lamp.emergencyControlShow) { - this.emergencyControl = new ESingleControl({ - _subType: 'emergency', - style: this.style, - zlevel: this.zlevel, - z: this.z, - point: { - x: model.position.x - this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x, - y: model.position.y + this.style.StationControl.lamp.offset.y - }, - context: model.jjzkContent, - pop: false - }); - this.add(this.emergencyControl); - } - // 中控按钮 - if (this.style.StationControl.lamp.centerControlShow) { - this.centerControl = new ESingleControl({ - _subType: 'center', - style: this.style, - zlevel: this.zlevel, - z: this.z, - point: { - x: model.position.x - this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x, - y: model.position.y + this.style.StationControl.lamp.offset.y - }, - context: model.zokContent, - pop: false - }); - this.add(this.centerControl); - } - // 站控按钮 - if (this.style.StationControl.lamp.substationControlShow) { - this.substationControl = new ESingleControl({ - _subType: 'substation', - style: this.style, - zlevel: this.zlevel, - z: this.z, - point: { - x: model.position.x + this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x, - y: model.position.y + this.style.StationControl.lamp.offset.y - }, - context: model.zakContent, - pop: false - }); - this.add(this.substationControl); - } - // 联锁控 - if (this.style.StationControl.lamp.interconnectedControlShow) { - this.interconnectedControl = new ESingleControl({ - _subType: 'interconnected', - style: this.style, - zlevel: this.zlevel, - z: this.z, - point: { - x: model.position.x + this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x, - y: model.position.y + this.style.StationControl.lamp.offset.y - }, - context: model.lskContent || '联锁控', - pop: false - }); - this.add(this.interconnectedControl); - } - // 箭头 - if (this.style.StationControl.arrow.show) { - const point = arrow(this.model.position.x, this.model.position.y + this.style.StationControl.lamp.radiusR / 2, this.style.StationControl.lamp.distance / 6, this.style.StationControl.lamp.radiusR * 0.8); - this.arrowsControl = new EArrow({ - zlevel: this.zlevel, - z: this.z, - style: this.style, - count: this.count, - drict: 1, - point: point, - x: model.position.x + this.style.StationControl.lamp.offset.x, - y: model.position.y + this.style.StationControl.lamp.radiusR / 2 + this.style.StationControl.lamp.offset.y, - fill: this.style.StationControl.lamp.grayColor, - lineWidth: 1, - stroke: this.style.sidelineColor - }); - this.add(this.arrowsControl); - } - } + create() { + const model = this.model; + // 紧急站控 + if (this.style.StationControl.lamp.emergencyControlShow) { + this.emergencyControl = new ESingleControl({ + _subType: 'emergency', + style: this.style, + zlevel: this.zlevel, + z: this.z, + point: { + x: model.position.x - this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x, + y: model.position.y + this.style.StationControl.lamp.offset.y + }, + context: this.style.StationControl.text.emergencyControlText, + // model.jjzkContent, + pop: false + }); + this.add(this.emergencyControl); + } + // 中控按钮 + if (this.style.StationControl.lamp.centerControlShow) { + this.centerControl = new ESingleControl({ + _subType: 'center', + style: this.style, + zlevel: this.zlevel, + z: this.z, + point: { + x: model.position.x - this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x, + y: model.position.y + this.style.StationControl.lamp.offset.y + }, + context: this.style.StationControl.text.centerControlText, + // model.zokContent, + pop: false + }); + this.add(this.centerControl); + } + // 站控按钮 + if (this.style.StationControl.lamp.substationControlShow) { + this.substationControl = new ESingleControl({ + _subType: 'substation', + style: this.style, + zlevel: this.zlevel, + z: this.z, + point: { + x: model.position.x + this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x, + y: model.position.y + this.style.StationControl.lamp.offset.y + }, + context: this.style.StationControl.text.substationControlText, + // model.zakContent + pop: false + }); + this.add(this.substationControl); + } + // 联锁控 + if (this.style.StationControl.lamp.interconnectedControlShow) { + this.interconnectedControl = new ESingleControl({ + _subType: 'interconnected', + style: this.style, + zlevel: this.zlevel, + z: this.z, + point: { + x: model.position.x + this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x, + y: model.position.y + this.style.StationControl.lamp.offset.y + }, + // context: model.lskContent || '联锁控', + context:this.style.StationControl.text.interconnectedControlText || '联锁控', + pop: false + }); + this.add(this.interconnectedControl); + } + // 箭头 + if (this.style.StationControl.arrow.show) { + const point = arrow(this.model.position.x, this.model.position.y + this.style.StationControl.lamp.radiusR / 2, this.style.StationControl.lamp.distance / 6, this.style.StationControl.lamp.radiusR * 0.8); + this.arrowsControl = new EArrow({ + zlevel: this.zlevel, + z: this.z, + style: this.style, + count: this.count, + drict: 1, + point: point, + x: model.position.x + this.style.StationControl.lamp.offset.x, + y: model.position.y + this.style.StationControl.lamp.radiusR / 2 + this.style.StationControl.lamp.offset.y, + fill: this.style.StationControl.lamp.grayColor, + lineWidth: 1, + stroke: this.style.sidelineColor + }); + this.add(this.arrowsControl); + } + } - // 设置状态 - setState(model) { - switch (model.status) { - case '00': // 无状态 - this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor); - this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor); - this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor); - break; - case '01': // 中控 - this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor); - this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor); - this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.greenColor); - break; - case '02': // 站控 - this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor); - this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.yellowColor); - this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor); - break; - case '03': // 紧急站控 - this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.redColor); - this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor); - this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor); - break; - } - } + // 设置状态 + setState(model) { + switch (model.status) { + case '00': // 无状态 + this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor); + this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor); + this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor); + break; + case '01': // 中控 + this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor); + this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor); + this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.greenColor); + break; + case '02': // 站控 + this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor); + this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.yellowColor); + this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor); + break; + case '03': // 紧急站控 + this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.redColor); + this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor); + this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor); + break; + } + } - /** 按钮是否按下*/ - isPop(e) { - for (var i = 0; i < this.childCount(); i++) { - var rect = this.childAt(i).getBoundingRect(); - if (rect.contain(e.offsetX, e.offsetY) && this.childAt(i).pop) { - return true; - } - } - } - createMouseEvent() { - if (this.style.ZcControl.mouseOverStyle) { - this.mouseEvent = new EMouse(this); - this.add(this.mouseEvent); - this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); }); - this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); }); - } - } - getShapeTipPoint() { - if (this.stationControl) { - var distance = 2; - var rect = this.stationControl.getBoundingRect(); - return { - x: rect.x + rect.width / 2, - y: rect.y - distance - }; - } - return null; - } + /** 按钮是否按下*/ + isPop(e) { + for (var i = 0; i < this.childCount(); i++) { + var rect = this.childAt(i).getBoundingRect(); + if (rect.contain(e.offsetX, e.offsetY) && this.childAt(i).pop) { + return true; + } + } + } + createMouseEvent() { + if (this.style.ZcControl.mouseOverStyle) { + this.mouseEvent = new EMouse(this); + this.add(this.mouseEvent); + this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); }); + this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); }); + } + } + getShapeTipPoint() { + if (this.stationControl) { + var distance = 2; + var rect = this.stationControl.getBoundingRect(); + return { + x: rect.x + rect.width / 2, + y: rect.y - distance + }; + } + return null; + } } diff --git a/src/views/newMap/newMapdraft/mapoperate/stationcontrol.vue b/src/views/newMap/newMapdraft/mapoperate/stationcontrol.vue index a074e67ec..65d39aad2 100644 --- a/src/views/newMap/newMapdraft/mapoperate/stationcontrol.vue +++ b/src/views/newMap/newMapdraft/mapoperate/stationcontrol.vue @@ -8,7 +8,7 @@
- {{ $t('map.updateObj') }} + {{ $t('map.deleteObj') }}
@@ -68,13 +68,13 @@ export default { x: 0, y: 0 }, - stationCode: '', - zokContent: '', - zakContent: '', - jjzkContent: '', - zbjkContent: '', - zzkContent: '', - lskContent: '' + stationCode: '' + // zokContent: '', + // zakContent: '', + // jjzkContent: '', + // zbjkContent: '', + // zzkContent: '', + // lskContent: '' }, addModel: { stationCode: '' @@ -104,21 +104,21 @@ export default { name: this.$t('map.drawData'), item: [ { prop: 'code', label: this.$t('map.stationControlCode'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.stationControlList, change: true, deviceChange: this.deviceChange }, - { prop: 'zokContent', label: this.$t('map.zokContent'), type: 'input' }, - { prop: 'zakContent', label: this.$t('map.zakContent'), type: 'input' }, - { prop: 'jjzkContent', label: this.$t('map.jjzkContent'), type: 'input' }, - { prop: 'zzkContent', label: this.$t('map.zzkContent'), type: 'input' }, - { prop: 'lskContent', label: `${this.$t('map.interconnected')}:`, type: 'input' }, + // { prop: 'zokContent', label: this.$t('map.zokContent'), type: 'input' }, + // { prop: 'zakContent', label: this.$t('map.zakContent'), type: 'input' }, + // { prop: 'jjzkContent', label: this.$t('map.jjzkContent'), type: 'input' }, + // { prop: 'zzkContent', label: this.$t('map.zzkContent'), type: 'input' }, + // { prop: 'lskContent', label: `${this.$t('map.interconnected')}:`, type: 'input' }, { prop: 'position', label: this.$t('map.stationControlPosition'), type: 'coordinate', width: '150px', children: [ - { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' }, - { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' } + { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px', change:true, deviceChange:this.updateView }, + { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px', change:true, deviceChange:this.updateView } ] } ] }, map: { name: this.$t('map.mapData'), item: [ - { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList } + { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, change: true, deviceChange:this.updateView} ] } } @@ -133,18 +133,18 @@ export default { stationCode: [ { required: true, message: this.$t('rules.stationControlStationCode'), trigger: 'change' } ], - zokContent: [ - { required: true, message: this.$t('rules.stationControlZokContent'), trigger: 'blur' } - ], - zakContent: [ - { required: true, message: this.$t('rules.stationControlZakContent'), trigger: 'blur' } - ], - jjzkContent: [ - { required: true, message: this.$t('rules.stationControlJjzkContent'), trigger: 'blur' } - ], - zzkContent: [ - { required: true, message: this.$t('rules.stationControlZzkContent'), trigger: 'blur' } - ], + // zokContent: [ + // { required: true, message: this.$t('rules.stationControlZokContent'), trigger: 'blur' } + // ], + // zakContent: [ + // { required: true, message: this.$t('rules.stationControlZakContent'), trigger: 'blur' } + // ], + // jjzkContent: [ + // { required: true, message: this.$t('rules.stationControlJjzkContent'), trigger: 'blur' } + // ], + // zzkContent: [ + // { required: true, message: this.$t('rules.stationControlZzkContent'), trigger: 'blur' } + // ], 'position.x': [ { required: true, message: this.$t('rules.stationControlPositionX'), trigger: 'blur' } ], @@ -172,6 +172,10 @@ export default { deviceChange(code) { this.$emit('setCenter', code); this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code)); + this.edit(); + }, + updateView() { + this.edit(); }, deviceSelect(selected) { this.$refs.dataform.resetFields(); @@ -190,13 +194,13 @@ export default { const uid = getUID('StationControl'); const model = { _type: 'StationControl', - code: uid, - zokContent: '中控', - zbjkContent: '总报警', - zakContent: '站控', - jjzkContent: '紧急站控', - zzkContent: '站中控按钮', - lskContent: '连锁控' + code: uid + // zokContent: '中控', + // zbjkContent: '总报警', + // zakContent: '站控', + // jjzkContent: '紧急站控', + // zzkContent: '站中控按钮', + // lskContent: '连锁控' }; this.stationList.forEach(elem => { if (elem.code === this.addModel.stationCode) { From 5aaea642df2f165b5e6c4feeab1de8e1d5ab8cda Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 2 Dec 2019 15:33:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/config/skinCode/bejing_01.js | 8 +++++++- src/jmap/config/skinCode/chengdu_03.js | 8 +++++++- src/jmap/config/skinCode/chengdu_04.js | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/jmap/config/skinCode/bejing_01.js b/src/jmap/config/skinCode/bejing_01.js index 4b5f409ca..03380ce75 100644 --- a/src/jmap/config/skinCode/bejing_01.js +++ b/src/jmap/config/skinCode/bejing_01.js @@ -259,7 +259,13 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 控制模式字体颜色 fontWeight: 'normal', // 控制模式字体粗细 textAlign: 'middle', // 控制模式水平对齐 - textVerticalAlign: 'top' // 控制模式垂直对齐 + textVerticalAlign: 'top', // 控制模式垂直对齐 + centerControlText: '中控', // 中控文字内容 + substationControlText: '站控', // 站控文字内容 + emergencyControlText:'紧急站控', // 紧急站控文字内容 + interconnectedControlText:'连锁控' // 连锁控文字内容 + // stationCenterControlText: '站中控', // 站中控文字内容 + // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 3, // 控制模式灯个数 diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js index b05cb22fe..7e6608788 100644 --- a/src/jmap/config/skinCode/chengdu_03.js +++ b/src/jmap/config/skinCode/chengdu_03.js @@ -263,7 +263,13 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 - textVerticalAlign: 'top' // 字体垂直对齐 + textVerticalAlign: 'top', // 字体垂直对齐 + centerControlText: '中控', // 中控文字内容 + substationControlText: '站控', // 站控文字内容 + emergencyControlText:'紧急站控', // 紧急站控文字内容 + interconnectedControlText:'连锁控' // 连锁控文字内容 + // stationCenterControlText: '站中控', // 站中控文字内容 + // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 4, // 控制模式的个数 diff --git a/src/jmap/config/skinCode/chengdu_04.js b/src/jmap/config/skinCode/chengdu_04.js index d369c45cf..0954cce01 100644 --- a/src/jmap/config/skinCode/chengdu_04.js +++ b/src/jmap/config/skinCode/chengdu_04.js @@ -260,7 +260,13 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 - textVerticalAlign: 'top' // 字体垂直对齐 + textVerticalAlign: 'top', // 字体垂直对齐 + centerControlText: '中控', // 中控文字内容 + substationControlText: '站控', // 站控文字内容 + emergencyControlText:'紧急站控', // 紧急站控文字内容 + interconnectedControlText:'连锁控' // 连锁控文字内容 + // stationCenterControlText: '站中控', // 站中控文字内容 + // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 4, // 控制模式的个数 From cee4a7a3967255c0463ee99b50da666393ff8eb1 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 2 Dec 2019 16:19:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/zh/map.js | 2 +- src/jmap/config/skinCode/bejing_01.js | 8 +------- src/jmap/config/skinCode/chengdu_03.js | 6 ------ src/jmap/config/skinCode/chengdu_04.js | 8 +------- src/jmap/config/skinCode/fuzhou_01.js | 8 +------- src/jmapNew/config/skinCode/bejing_01.js | 8 +++++++- src/jmapNew/config/skinCode/chengdu_03.js | 8 +++++++- src/jmapNew/config/skinCode/chengdu_04.js | 8 +++++++- src/jmapNew/config/skinCode/fuzhou_01.js | 8 +++++++- src/jmapNew/shape/StationControl/index.js | 1 + 10 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index 869041043..52fccfb56 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -241,7 +241,7 @@ export default { displayAxleCounter: '是否显示计轴:', displayLogicalExtents: '是否显示逻辑区段:', displayLogicalWxtentNames: '是否显示逻辑区段名称:', - 1: '是否站台轨:', + isStandTrack: '是否站台轨:', standTrackName: '站台轨名称:', standTrackNamePosition: '站台轨名称偏移量:', relStandCode: '站台编码:', diff --git a/src/jmap/config/skinCode/bejing_01.js b/src/jmap/config/skinCode/bejing_01.js index 03380ce75..4b5f409ca 100644 --- a/src/jmap/config/skinCode/bejing_01.js +++ b/src/jmap/config/skinCode/bejing_01.js @@ -259,13 +259,7 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 控制模式字体颜色 fontWeight: 'normal', // 控制模式字体粗细 textAlign: 'middle', // 控制模式水平对齐 - textVerticalAlign: 'top', // 控制模式垂直对齐 - centerControlText: '中控', // 中控文字内容 - substationControlText: '站控', // 站控文字内容 - emergencyControlText:'紧急站控', // 紧急站控文字内容 - interconnectedControlText:'连锁控' // 连锁控文字内容 - // stationCenterControlText: '站中控', // 站中控文字内容 - // generalAlarmControlText: '总报警' // 总报警文字内容 + textVerticalAlign: 'top' // 控制模式垂直对齐 }, lamp: { count: 3, // 控制模式灯个数 diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js index 7e6608788..6106b0359 100644 --- a/src/jmap/config/skinCode/chengdu_03.js +++ b/src/jmap/config/skinCode/chengdu_03.js @@ -264,12 +264,6 @@ class SkinCode extends defaultStyle { fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 textVerticalAlign: 'top', // 字体垂直对齐 - centerControlText: '中控', // 中控文字内容 - substationControlText: '站控', // 站控文字内容 - emergencyControlText:'紧急站控', // 紧急站控文字内容 - interconnectedControlText:'连锁控' // 连锁控文字内容 - // stationCenterControlText: '站中控', // 站中控文字内容 - // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 4, // 控制模式的个数 diff --git a/src/jmap/config/skinCode/chengdu_04.js b/src/jmap/config/skinCode/chengdu_04.js index 0954cce01..d369c45cf 100644 --- a/src/jmap/config/skinCode/chengdu_04.js +++ b/src/jmap/config/skinCode/chengdu_04.js @@ -260,13 +260,7 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 - textVerticalAlign: 'top', // 字体垂直对齐 - centerControlText: '中控', // 中控文字内容 - substationControlText: '站控', // 站控文字内容 - emergencyControlText:'紧急站控', // 紧急站控文字内容 - interconnectedControlText:'连锁控' // 连锁控文字内容 - // stationCenterControlText: '站中控', // 站中控文字内容 - // generalAlarmControlText: '总报警' // 总报警文字内容 + textVerticalAlign: 'top' // 字体垂直对齐 }, lamp: { count: 4, // 控制模式的个数 diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js index 9dec277f5..5a640b4e3 100644 --- a/src/jmap/config/skinCode/fuzhou_01.js +++ b/src/jmap/config/skinCode/fuzhou_01.js @@ -242,13 +242,7 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 - textVerticalAlign: 'top', // 字体垂直对齐 - centerControlText: '中控', // 中控文字内容 - substationControlText: '站控', // 站控文字内容 - emergencyControlText:'紧急站控', // 紧急站控文字内容 - interconnectedControlText:'连锁控' // 连锁控文字内容 - // stationCenterControlText: '站中控', // 站中控文字内容 - // generalAlarmControlText: '总报警' // 总报警文字内容 + textVerticalAlign: 'top' // 字体垂直对齐 }, lamp: { count: 2, // 控制模式灯个数 diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index 4b5f409ca..03380ce75 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -259,7 +259,13 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 控制模式字体颜色 fontWeight: 'normal', // 控制模式字体粗细 textAlign: 'middle', // 控制模式水平对齐 - textVerticalAlign: 'top' // 控制模式垂直对齐 + textVerticalAlign: 'top', // 控制模式垂直对齐 + centerControlText: '中控', // 中控文字内容 + substationControlText: '站控', // 站控文字内容 + emergencyControlText:'紧急站控', // 紧急站控文字内容 + interconnectedControlText:'连锁控' // 连锁控文字内容 + // stationCenterControlText: '站中控', // 站中控文字内容 + // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 3, // 控制模式灯个数 diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index b05cb22fe..7e6608788 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -263,7 +263,13 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 - textVerticalAlign: 'top' // 字体垂直对齐 + textVerticalAlign: 'top', // 字体垂直对齐 + centerControlText: '中控', // 中控文字内容 + substationControlText: '站控', // 站控文字内容 + emergencyControlText:'紧急站控', // 紧急站控文字内容 + interconnectedControlText:'连锁控' // 连锁控文字内容 + // stationCenterControlText: '站中控', // 站中控文字内容 + // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 4, // 控制模式的个数 diff --git a/src/jmapNew/config/skinCode/chengdu_04.js b/src/jmapNew/config/skinCode/chengdu_04.js index d369c45cf..0954cce01 100644 --- a/src/jmapNew/config/skinCode/chengdu_04.js +++ b/src/jmapNew/config/skinCode/chengdu_04.js @@ -260,7 +260,13 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 - textVerticalAlign: 'top' // 字体垂直对齐 + textVerticalAlign: 'top', // 字体垂直对齐 + centerControlText: '中控', // 中控文字内容 + substationControlText: '站控', // 站控文字内容 + emergencyControlText:'紧急站控', // 紧急站控文字内容 + interconnectedControlText:'连锁控' // 连锁控文字内容 + // stationCenterControlText: '站中控', // 站中控文字内容 + // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 4, // 控制模式的个数 diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index 5a640b4e3..9dec277f5 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -242,7 +242,13 @@ class SkinCode extends defaultStyle { fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 textAlign: 'middle', // 字体水平对齐 - textVerticalAlign: 'top' // 字体垂直对齐 + textVerticalAlign: 'top', // 字体垂直对齐 + centerControlText: '中控', // 中控文字内容 + substationControlText: '站控', // 站控文字内容 + emergencyControlText:'紧急站控', // 紧急站控文字内容 + interconnectedControlText:'连锁控' // 连锁控文字内容 + // stationCenterControlText: '站中控', // 站中控文字内容 + // generalAlarmControlText: '总报警' // 总报警文字内容 }, lamp: { count: 2, // 控制模式灯个数 diff --git a/src/jmapNew/shape/StationControl/index.js b/src/jmapNew/shape/StationControl/index.js index 1dd6b2fb2..c1f5c6f32 100644 --- a/src/jmapNew/shape/StationControl/index.js +++ b/src/jmapNew/shape/StationControl/index.js @@ -24,6 +24,7 @@ export default class StationControl extends Group { } create() { + debugger; const model = this.model; // 紧急站控 if (this.style.StationControl.lamp.emergencyControlShow) {