From ea138e7f3cf274f36f79927b16552feca51bc7ee Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 7 May 2020 09:42:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?iscs=E7=B3=BB=E7=BB=9F=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9C=BA=E7=94=B5=E4=B8=8B=E7=9A=84=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iscs/iscsSystem/groupNav.vue | 54 +++++++++++++++++++++++++- src/views/iscs/iscsSystem/menuBar.vue | 10 +++-- src/views/iscs/iscsSystem/nav.vue | 54 +++++++++++++++++++++++++- 3 files changed, 111 insertions(+), 7 deletions(-) diff --git a/src/views/iscs/iscsSystem/groupNav.vue b/src/views/iscs/iscsSystem/groupNav.vue index 5c73571b6..f4815f08d 100644 --- a/src/views/iscs/iscsSystem/groupNav.vue +++ b/src/views/iscs/iscsSystem/groupNav.vue @@ -74,14 +74,64 @@ export default { name: '机电', // 未知子菜单 children: [ { - name: '控制模式', + name: '大系统', + type: 'bigSystem', + showType: ['center', 'local'] + }, + { + name: '小系统', + type: 'smallSystem', + showType: ['center', 'local'] + }, + { + name: '水系统', + type: 'waterSystem', + showType: ['center', 'local'] + }, + { + name: '照明', + type: 'lighting', + showType: ['center', 'local'] + }, + { + name: '电-扶梯', + type: 'electricEscalator', + showType: ['center', 'local'] + }, + { + name: '给排水', + type: 'waterSupply', + showType: ['center', 'local'] + }, + { + name: '模式', type: 'controlBAS', showType: ['center', 'local'] }, { - name: '控制权限', + name: '隧道通风', + type: 'tunnelVentilation', + showType: ['center', 'local'] + }, + { + name: '时刻表', + type: 'schedules', + showType: ['center', 'local'] + }, + { + name: '权限交接', type: 'controlPermissionBAS', showType: ['center', 'local'] + }, + { + name: '传感器', + type: 'sensor', + showType: ['center', 'local'] + }, + { + name: '车站网络', + type: 'stationNetwork', + showType: ['center', 'local'] } ] }, { diff --git a/src/views/iscs/iscsSystem/menuBar.vue b/src/views/iscs/iscsSystem/menuBar.vue index 51a2028fe..f017a23af 100644 --- a/src/views/iscs/iscsSystem/menuBar.vue +++ b/src/views/iscs/iscsSystem/menuBar.vue @@ -23,8 +23,7 @@ :id="getDomId(child)" :key="j" class="menu-li" - @mouseenter="selectedClassB(child, j)" - @mouseleave="tempClassB = -1" + @click.stop="selectedClassB(child, j)" >
@@ -324,7 +323,12 @@ export default { this.popupMenuB(item, index); }, popupMenuB(item, index) { - this.tempClassB = index; + if (item.children) { + this.tempClassB = index; + } else { + this.tempClassB = -1; + } + }, // 弹出顶部菜单操作 popupMenuA(item, index) { diff --git a/src/views/iscs/iscsSystem/nav.vue b/src/views/iscs/iscsSystem/nav.vue index 9b3cb24a6..abd59f6fe 100644 --- a/src/views/iscs/iscsSystem/nav.vue +++ b/src/views/iscs/iscsSystem/nav.vue @@ -71,14 +71,64 @@ export default { name: '机电', // 未知子菜单 children: [ { - name: '控制模式', + name: '大系统', + type: 'bigSystem', + showType: ['center', 'local'] + }, + { + name: '小系统', + type: 'smallSystem', + showType: ['center', 'local'] + }, + { + name: '水系统', + type: 'waterSystem', + showType: ['center', 'local'] + }, + { + name: '照明', + type: 'lighting', + showType: ['center', 'local'] + }, + { + name: '电-扶梯', + type: 'electricEscalator', + showType: ['center', 'local'] + }, + { + name: '给排水', + type: 'waterSupply', + showType: ['center', 'local'] + }, + { + name: '模式', type: 'controlBAS', showType: ['center', 'local'] }, { - name: '控制权限', + name: '隧道通风', + type: 'tunnelVentilation', + showType: ['center', 'local'] + }, + { + name: '时刻表', + type: 'schedules', + showType: ['center', 'local'] + }, + { + name: '权限交接', type: 'controlPermissionBAS', showType: ['center', 'local'] + }, + { + name: '传感器', + type: 'sensor', + showType: ['center', 'local'] + }, + { + name: '车站网络', + type: 'stationNetwork', + showType: ['center', 'local'] } ] }, { From ed3f1cee82e6ba6a55159c1b1fa2df9a4ba93ef0 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 7 May 2020 10:16:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?iscs=E8=B0=83=E6=95=B4&=E6=96=B0=E7=89=88?= =?UTF-8?q?=E8=80=83=E8=AF=95=E5=AE=9E=E8=AE=AD=E7=B1=BB=E5=9E=8B=E5=8C=B9?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs/constant/deviceRender.js | 9 +- src/iscs/constant/deviceType.js | 3 +- src/iscs/shape/button.js | 61 +++++++ src/iscs/utils/parser.js | 6 + src/views/exam/detail/examDetail.vue | 2 +- src/views/iscs/iscsDesign/demonList.vue | 4 +- .../iscs/iscsDraw/iscsCommonElem/button.vue | 167 ++++++++++++++++++ .../iscs/iscsDraw/iscsCommonElem/line.vue | 56 +++--- .../iscs/iscsDraw/iscsCommonElem/rect.vue | 60 +++---- .../iscs/iscsDraw/iscsCommonElem/text.vue | 54 +++--- 10 files changed, 332 insertions(+), 90 deletions(-) create mode 100644 src/iscs/shape/button.js create mode 100644 src/views/iscs/iscsDraw/iscsCommonElem/button.vue diff --git a/src/iscs/constant/deviceRender.js b/src/iscs/constant/deviceRender.js index fa6334e35..b337c0244 100644 --- a/src/iscs/constant/deviceRender.js +++ b/src/iscs/constant/deviceRender.js @@ -219,6 +219,13 @@ deviceRender[deviceType.ArcStatus] = { _type: deviceType.ArcStatus, zlevel: 1, z: 4 -} +}; + +/** 按钮 */ +deviceRender[deviceType.IscsButton] = { + _type: deviceType.IscsButton, + zlevel: 1, + z: 4 +}; export default deviceRender; diff --git a/src/iscs/constant/deviceType.js b/src/iscs/constant/deviceType.js index 57836dfe3..617515a96 100644 --- a/src/iscs/constant/deviceType.js +++ b/src/iscs/constant/deviceType.js @@ -33,7 +33,8 @@ const deviceType = { FasBrakeMachine:'FasBrakeMachine', Staircase:'Staircase', SingleStaircase: 'SingleStaircase', - ArcStatus: 'ArcStatus' + ArcStatus: 'ArcStatus', + IscsButton: 'IscsButton' }; export default deviceType; diff --git a/src/iscs/shape/button.js b/src/iscs/shape/button.js new file mode 100644 index 000000000..d29fcc56a --- /dev/null +++ b/src/iscs/shape/button.js @@ -0,0 +1,61 @@ +import Group from 'zrender/src/container/Group'; +import Rect from 'zrender/src/graphic/shape/Rect'; +import Text from 'zrender/src/graphic/Text'; + +export default class Button 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.buttonRect = new Rect({ + zlevel: model.zlevel, + z: model.z, + shape: { + x: 0, + y: 0, + width: model.width, + height: model.height + }, + style: { + fill: model.fillColor, + stroke: model.strokeColor, + lineWidth: model.borderWidth + } + }); + this.buttonText = new Text({ + zlevel: model.zlevel, + z: model.z, + style: { + x: model.width / 2, + y: model.height / 2, + fontWeight: 'normal', + fontSize: model.height - 2, + fontFamily: 'consolas', + text: model.context, + textFill: model.textFill, + textAlign: 'center', + textPosition: 'inside', + textVerticalAlign: 'middle', + textLineHeight: model.height + } + }); + this.grouper.add(this.buttonRect); + this.grouper.add(this.buttonText); + this.add(this.grouper); + } + setModel(dx, dy) { + this.model.point.x += dx; + this.model.point.y += dy; + } +} diff --git a/src/iscs/utils/parser.js b/src/iscs/utils/parser.js index c303abfff..ba66d18a1 100644 --- a/src/iscs/utils/parser.js +++ b/src/iscs/utils/parser.js @@ -148,6 +148,9 @@ export function parser(data) { zrUtil.each(data.singleStaircaseList || [], elem=> { iscsDevice[elem.code] = deviceFactory(deviceType.SingleStaircase, elem); }); + zrUtil.each(data.iscsButtonList || [], elem=> { + iscsDevice[elem.code] = deviceFactory(deviceType.IscsButton, elem); + }); } return iscsDevice; @@ -275,6 +278,9 @@ export function updateIscsData(state, device) { case deviceType.ArcStatus: updateIscsListByDevice(state, 'arcStatusList', device); break; + case deviceType.IscsButton: + updateIscsListByDevice(state, 'iscsButtonList', device); + break; } // store.dispatch('iscs/setIscsData', state.iscs); } diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue index 410fb5326..670199055 100644 --- a/src/views/exam/detail/examDetail.vue +++ b/src/views/exam/detail/examDetail.vue @@ -217,7 +217,7 @@ export default { this.examDetails.examDefinitionRulesVOList[index].name = v.name; if (res.operateType) { this.trainingOperateTypeMap[res.trainingType].forEach(item => { - if (item.code == res.operateType) { + if ((item.code || item.value) === res.operateType) { this.examDetails.examDefinitionRulesVOList[index].name = `${this.examDetails.examDefinitionRulesVOList[index].name}-${item.name || item.label}`; return; } diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue index ef24f2e33..414f0f070 100644 --- a/src/views/iscs/iscsDesign/demonList.vue +++ b/src/views/iscs/iscsDesign/demonList.vue @@ -85,13 +85,13 @@ export default { type: 'system', children: [ { - name: '站台报警', + name: '站厅报警', mode: 'fas', id: '11', type: 'interface' }, { - name: '站厅报警', + name: '站台报警', mode: 'fas', id: '12', type: 'interface' diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/button.vue b/src/views/iscs/iscsDraw/iscsCommonElem/button.vue new file mode 100644 index 000000000..de882d517 --- /dev/null +++ b/src/views/iscs/iscsDraw/iscsCommonElem/button.vue @@ -0,0 +1,167 @@ + + + + diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/line.vue b/src/views/iscs/iscsDraw/iscsCommonElem/line.vue index ddf88e1cc..d54e30d2d 100644 --- a/src/views/iscs/iscsDraw/iscsCommonElem/line.vue +++ b/src/views/iscs/iscsDraw/iscsCommonElem/line.vue @@ -1,31 +1,31 @@ + diff --git a/src/views/iscs/iscsSystem/config/index.vue b/src/views/iscs/iscsSystem/config/index.vue index a47a57e76..7154a59b8 100644 --- a/src/views/iscs/iscsSystem/config/index.vue +++ b/src/views/iscs/iscsSystem/config/index.vue @@ -24,6 +24,7 @@ +
@@ -52,6 +53,7 @@ import AFC from './afc/afc'; import stationHallACS from './acs/stationHallACS'; import standACS from './acs/standACS'; import doorFG from './fg/doorFG'; +import Sensor from './bas/sensor'; export default { components: { @@ -78,7 +80,8 @@ export default { AFC, stationHallACS, standACS, - doorFG + doorFG, + Sensor }, data() { return { diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue index 7f37633fa..89242aacf 100644 --- a/src/views/iscsSystem/index.vue +++ b/src/views/iscsSystem/index.vue @@ -167,8 +167,6 @@ export default { }, reSize() { this.$nextTick(() => { - this.width = this.$store.state.config.width; - this.height = this.$store.state.config.height; this.$iscs && this.$iscs.resize({ width: this.width, height: this.height }); }); },