From 37a47e4c9c0a90cd444ea95658f7ea2bef7b72eb Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Sat, 10 Oct 2020 13:12:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=98=E5=9B=BE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/keyboardController.js | 8 ++++---- .../newMap/newMapdraft/mapoperate/station.vue | 20 ++++++++++++++++--- .../newMapdraft/mapoperate/switch/create.vue | 4 ++-- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/keyboardController.js b/src/jmapNew/keyboardController.js index 24b0ca785..de0fa6146 100644 --- a/src/jmapNew/keyboardController.js +++ b/src/jmapNew/keyboardController.js @@ -14,18 +14,18 @@ class KeyboardController extends Eventful { initHandler(zr) { if (zr) { var keydownHandle = this.keydown.bind(this); - var dom = this.$zr.dom; + // var dom = this.$zr.dom; this.enable = function (opts) { opts = opts || {}; this._keyOnDownUp = opts.keyOnDownUp || true; - dom.addEventListener('keyup', keydownHandle, false); - dom.focus(); + window.addEventListener('keyup', keydownHandle, false); + // dom.focus(); }; this.disable = function () { - dom.removeEventListener('keyup', keydownHandle, false); + window.removeEventListener('keyup', keydownHandle, false); }; this.dispose = function() { diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue index 7509c36be..2f86c8252 100644 --- a/src/views/newMap/newMapdraft/mapoperate/station.vue +++ b/src/views/newMap/newMapdraft/mapoperate/station.vue @@ -26,9 +26,9 @@ - + @@ -128,6 +129,7 @@ export default { modelList: [], positionY: 0 }, + rowData: {}, skins: [], mergeRules: { positionY: [ @@ -311,6 +313,8 @@ export default { if (!this.editModel.routingStationList.includes(selected.code) && this.editModel.code != selected.code) { this.editModel.routingStationList.push(selected.code); } + } else if (selected && selected._type === 'Section' && this.field == 'standSection') { + this.$set(this.rowData, 'sectionCode', selected.code); } }, // 选择管理车站 @@ -389,7 +393,7 @@ export default { if (item.control) { model.controlModePoint = { x: sectionModel.points[0].x + (sectionModel.points[last].x - sectionModel.points[0].x) / 2, - y: sectionModel.points[0].y - this.addModel.positionY + 30 + y: sectionModel.points[0].y - this.addModel.positionY + 45 }; } models.push(model); @@ -469,6 +473,16 @@ export default { stationName: `车站 ${this.addModel.modelList.length + 1}`, control: false }); + }, + selectedSection(row) { + if (this.field !== 'standSection') { + this.hover('standSection'); + this.rowData = row; + } else if (this.rowData !== row) { + this.rowData = row; + } else { + this.hover('standSection'); + } } } }; diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue index 005064467..423b823d1 100644 --- a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue +++ b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue @@ -310,11 +310,11 @@ export default { const sectionc = this.findSectionData(sectionLists, elem.sectionCCode); if (sectiona && sectionb && sectionc) { let point = { - x: sectiona.points[sectiona.points.length - 1].x, + x: sectiona.points[sectiona.points.length - 1].x - 15, y: sectiona.points[sectiona.points.length - 1].y }; if (JSON.stringify(sectiona.points[0]) === JSON.stringify(sectionb.points[sectionb.points.length - 1])) { - point = { x: sectiona.points[0].x, y: sectiona.points[0].y }; + point = { x: sectiona.points[0].x + 15, y: sectiona.points[0].y }; } const sectionModel = getModel('Section'); const name = sectiona.name; From 48bc783755220869fad18206b5a6ea199e5b1a4f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Sat, 10 Oct 2020 13:17:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E7=BA=BF=20iscs=20?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=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/views/iscs/iscsSystem/stationNav.vue | 109 +++++++++++++++++++++-- 1 file changed, 100 insertions(+), 9 deletions(-) diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue index 237add721..3f7d08188 100644 --- a/src/views/iscs/iscsSystem/stationNav.vue +++ b/src/views/iscs/iscsSystem/stationNav.vue @@ -8,7 +8,7 @@
-
+
{{ item.name }}
@@ -16,13 +16,27 @@
-
+
-
{{ '' }}
-
{{ '' }}
+
+
+
+
+
+
+
控制中心
+
停车场
+
车辆段
- {{ '' }} +
+
+
+
+
+
+
黄山主所
+
茶亭主所
@@ -65,7 +79,7 @@ export default { name:'StationNav', data() { return { - selectStation: 'controlCenter', + selectStation: 'mainHouseOne', stationList:[], group:'', lineCode:'', @@ -256,6 +270,9 @@ export default { } } }); + if (this.$route.query.stationId) { + this.selectStation = this.$route.query.stationId; + } }, async subscribe() { this.clearSubscribe(); @@ -281,8 +298,8 @@ export default { button.active = false; this.selectChildren(child.id, false); }, - changeStation(item, index) { - this.selectStation = item.id; + changeStation(item) { + this.selectStation = item; this.selectChildren(this.$route.params.mode, false); }, selectChildren(type, isReplace = false) { // 选择菜单 @@ -355,7 +372,7 @@ export default { top: -10%; border-radius: 130%; } -.station-list-box.active{ +.station-list-box.active,.station-list-button.active{ background:#cdcd37; } .station-name{ @@ -517,4 +534,78 @@ background:rgba(231,237,253,0.9); width: 17vw; height: 100%; } +.rightButtonGroupL{ + width: 10vw; + height: 100%; + display: inline-block; + float: left; + position: relative; + border-left: 1px #000 solid; + border-right: 1px #000 solid; +} +.rightButtonGroupR{ + width: 7vw; + height: 100%; + display: inline-block; + position: relative; +} +.controlCenter,.stationDepot,.parkingLot{ + display: inline-block; + position: relative; + width: 31%; + height: 100%; + vertical-align: top; + float: left; +} +.controlCenterName{ + font-size: 12px; + position: absolute; + top: 5px; + left: 0.3vw; +} +.stationDepotName{ + font-size: 12px; + position: absolute; + top: 45px; + left: 38%; +} +.parkingLotName{ + font-size: 12px; + position: absolute; + top: 5px; + right: 11%; +} +.station-list-button{ + width: 1vw; + height: 1vw; + border-radius: 1vw; + background: #ccc; + position: absolute; + border-left: 1px #fdfdfd solid; + border-right: 1px #262626 solid; + left: 50%; + top: 21px; + transform: translateX(-47%); + cursor: pointer; +} +.mainHouseOne,.mainHouseTwo{ + display: inline-block; + position: relative; + width: 49%; + height: 100%; + vertical-align: top; + float: left; +} +.mainHouseOneName{ + font-size: 12px; + position: absolute; + top: 5px; + left: 0.3vw; +} +.mainHouseTwoName{ + font-size: 12px; + position: absolute; + top: 45px; + right: 8%; +}