From 7e80d34e5027a43ae4cb9145292e7a4334a691cb Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Sat, 20 Feb 2021 09:27:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=20=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E6=9C=BA=E5=B0=81=E9=94=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/ningbo_01.js | 26 ++-- src/jmapNew/shape/Signal/index.js | 172 ++++++++++++----------- 2 files changed, 102 insertions(+), 96 deletions(-) diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index 244de1a7c..897cb4cea 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -120,12 +120,12 @@ class SkinCode extends defaultStyle { trainPosition:{ display: false // 列车实时位置显示 }, - mouseOverStyle: { + mouseOverStyle: { borderColor: '#fff', borderBackgroundColor: '#22DFDF', textShadowColor: '#22DFDF', nameShow: true, - nameBackgroundColor: '#000', + nameBackgroundColor: '#000', lineDash: [3, 3], lineWidthMore: 2.5 } @@ -156,14 +156,16 @@ class SkinCode extends defaultStyle { borderVariable: true, // 信号灯边框可变 stopWidth: 2, // 禁止线宽度 borderWidth: 2, // 信号灯边框线宽度 - borderColor: '#3149C3', // 信号灯边框线颜色 + borderColor: '#EF0C08', // 信号灯边框线颜色 radiusR: 5, // 信号灯半径 grayColor: '#C0C0C0', // 信号灯灰色 redColor: 'red', // 信号灯红色 greenColor: 'green', // 信号灯绿色 yellowColor: 'yellow', // 信号灯黄色 whiteColor: '#FFFFFF', // 信号灯白色 - blueColor: '#0070C0' // 信号灯蓝色 + blueColor: '#0070C0', // 信号灯蓝色 + blockColor: '#339933', // 信号灯墨绿色 + blockFlash: true // 信号机封锁闪烁 }, route: { direction: false, // 自动通过方向 @@ -198,7 +200,7 @@ class SkinCode extends defaultStyle { lowButton:{ display: false // 现地 信号机按钮 }, - mouseOverStyle: { + mouseOverStyle: { borderLineColor: '#FFFFFF', borderLineDash: [3, 3], nameBackgroundColor: '#22DFDF', @@ -344,7 +346,7 @@ class SkinCode extends defaultStyle { monolock: false, // 单锁显示 block: false // 封锁显示 }, - mouseOverStyle: { + mouseOverStyle: { borderBackgroundColor: '#22DFDF', // 边框背景色 borderColor: '#fff', // 边框颜色 textShadowColor: '#22DFDF' // 字体阴影颜色 @@ -429,11 +431,11 @@ class SkinCode extends defaultStyle { fontWeight: 'normal', // 字体粗细 distance: 5 // 灯跟文字距离 }, - mouseOverStyle: { + mouseOverStyle: { borderLineColor: '#FFFFFF', borderLineDash: [3, 3], - standBackgroundColor: '#001AFC' // 深蓝色 - }, + standBackgroundColor: '#001AFC' // 深蓝色 + } // reentry: {}, // 站台折返策略 // jump: {}, // trainStop: {}, // 停车标志 @@ -543,7 +545,7 @@ class SkinCode extends defaultStyle { radiusR: 6, // 控制灯大小 controlColor: '#FFFF00' // 控制灯颜色 }, - mouseOverStyle: { + mouseOverStyle: { fontSize: 10, fontFormat: 'consolas', fontColor: '#FFF000', @@ -568,7 +570,7 @@ class SkinCode extends defaultStyle { controlColor: '#00FF00', // 控制灯颜色 activeColor:'#ff0000' // 控制灯激活颜色 }, - mouseOverStyle: { + mouseOverStyle: { fontSize: 10, fontFormat: 'consolas', fontColor: '#FFF000', @@ -590,7 +592,7 @@ class SkinCode extends defaultStyle { radiusR: 6, // 控制灯大小 controlColor: '#ECE9D8' // 控制灯颜色 }, - mouseOverStyle: { + mouseOverStyle: { fontSize: 10, fontFormat: 'consolas', fontColor: '#FFF000', diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js index 8936ef4d6..11e186f44 100644 --- a/src/jmapNew/shape/Signal/index.js +++ b/src/jmapNew/shape/Signal/index.js @@ -528,6 +528,10 @@ class Signal extends Group { this.sigBack.show(); this.sigBack.setStyle('fill', this.style.Signal.sigBack.fillColor); } + if (this.style.Signal.lamp.blockFlash ) { + this.lamps[0].setBorderColor(this.style.Signal.lamp.borderColor); + this.lamps[0].setAnimationStart(this.style.Signal.lamp.blockColor); + } } reblock() { this.sigPost.setHorColor(this.style.Signal.post.reblockHorColor); @@ -733,92 +737,92 @@ class Signal extends Group { const path = window.location.href; this.recover(); - // 只响应前端自定义类型的状态变化 - if (model._free) { - this.setAshShow() - } else { - /** 信号机进路按钮显示 */ - /** 终端信号机按钮 */ - if (model.isRouteActive) { - this.setLowButtonActive(); - } else { - this.setLowButtonRecover(); - } - model.isRouteSignal && this.setLowButtonShow(); + // 只响应前端自定义类型的状态变化 + if (model._free) { + this.setAshShow(); + } else { + /** 信号机进路按钮显示 */ + /** 终端信号机按钮 */ + if (model.isRouteActive) { + this.setLowButtonActive(); + } else { + this.setLowButtonRecover(); + } + model.isRouteSignal && this.setLowButtonShow(); - /** 设置灯的颜色 */ - model.redOpen && !model.yellowOpen && !model.greenOpen && this.close(model.logicLight); // 信号关闭 - model.greenOpen && !model.redOpen && !model.yellowOpen && this.openPositive(model.logicLight); // 信号正向开放 - model.yellowOpen && !model.redOpen && !model.greenOpen && this.openLateral(model.logicLight); // 信号侧向开放 - model.redOpen && model.yellowOpen && !model.greenOpen && this.guid(); // 引导信号显示 + /** 设置灯的颜色 */ + model.redOpen && !model.yellowOpen && !model.greenOpen && this.close(model.logicLight); // 信号关闭 + model.greenOpen && !model.redOpen && !model.yellowOpen && this.openPositive(model.logicLight); // 信号正向开放 + model.yellowOpen && !model.redOpen && !model.greenOpen && this.openLateral(model.logicLight); // 信号侧向开放 + model.redOpen && model.yellowOpen && !model.greenOpen && this.guid(); // 引导信号显示 - /** 信号机封锁 */ // 缺一个功能封锁 - model.blockade && this.block(); - model.reblockade && this.reblock(); - model.remainTime && this.showRemainTime(model.remainTime); - if (!path.includes('/map/draw')) { - // 联锁自动进路通过 - model.fleetMode && this.setAutoRouteOpen(); - // 联锁自动触发 - if (model.ciControl) { - this.setAutoTriggerOpen(); - } else { - !model.atsControl && this.setArtificialRouteClose(); /** 进路交人工控或自动控 */ - } - } - // 设置点灯类型 必须在最后设置不能放前面 logicLight 0 物理点灯 1 逻辑点灯 - if (model.logicLight) { - this.logicalLight(); // 设置逻辑点灯 - } else { - this.physicsLight(); // 设置物理点灯 - } - if (model.isStartSignal) { - this.insideTriangle && this.insideTriangle.show(); - this.lamps.forEach(item => { item.hide(); }); - this.insideTriangle.setStyle({fill: this.style.Signal.insideTriangle.startSignalColor, stroke: this.style.Signal.insideTriangle.startSignalColor}); - } else if (model.isTerminalSignal) { - this.sigPost && this.sigPost.setTerminalOptional(); - } - if (model.isCiConfirm) { - this.setCiConfirm(); - } - if (model.isRequestLock) { - this.sigBack && this.sigBack.show(); - this.sigBack && this.sigBack.animateStyle(true) - .when(0, { fill: this.style.backgroundColor }) - .when(1000, { fill: this.style.Signal.sigBack.fillColor }) - .when(2000, { fill: this.style.backgroundColor }) - .when(3000, { fill: this.style.Signal.sigBack.fillColor }) - .start(); - } - if (model.isRequestGuide) { - this.lamps && this.lamps[0] && this.lamps[0].setAnimationStart(this.style.Signal.lamp.yellowColor); - } - if (path.includes('/map/draw')) { - if (model.type == 'PASSING') { - this.lamps && this.lamps.length && this.lamps.forEach(elem => { - elem.setColor(this.style.Signal.lamp.greenColor); - }); - } else { - this.lamps && this.lamps.length && this.lamps.forEach(elem => { - elem.setColor(this.style.Signal.lamp.redColor); - }); - } - } - if ( model.level === 3 && this.style.Signal.post.mainSignalVerColor && !model.fleetMode) { - this.sigPost.setVerColor(this.style.Signal.post.mainSignalVerColor); - } else if (model.level === 1 && this.style.Signal.post.closeSignalVerColor && !model.fleetMode) { - this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor); - } else if (model.level === 2 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) { - this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor); - } - // 信号机故障 - model.fault && this.fault(); - // 设置灰显 - if (model.noStatus || model.level === 0) { - this.setAshShow(); - } - } + /** 信号机封锁 */ // 缺一个功能封锁 + model.blockade && this.block(); + model.reblockade && this.reblock(); + model.remainTime && this.showRemainTime(model.remainTime); + if (!path.includes('/map/draw')) { + // 联锁自动进路通过 + model.fleetMode && this.setAutoRouteOpen(); + // 联锁自动触发 + if (model.ciControl) { + this.setAutoTriggerOpen(); + } else { + !model.atsControl && this.setArtificialRouteClose(); /** 进路交人工控或自动控 */ + } + } + // 设置点灯类型 必须在最后设置不能放前面 logicLight 0 物理点灯 1 逻辑点灯 + if (model.logicLight) { + this.logicalLight(); // 设置逻辑点灯 + } else { + this.physicsLight(); // 设置物理点灯 + } + if (model.isStartSignal) { + this.insideTriangle && this.insideTriangle.show(); + this.lamps.forEach(item => { item.hide(); }); + this.insideTriangle.setStyle({fill: this.style.Signal.insideTriangle.startSignalColor, stroke: this.style.Signal.insideTriangle.startSignalColor}); + } else if (model.isTerminalSignal) { + this.sigPost && this.sigPost.setTerminalOptional(); + } + if (model.isCiConfirm) { + this.setCiConfirm(); + } + if (model.isRequestLock) { + this.sigBack && this.sigBack.show(); + this.sigBack && this.sigBack.animateStyle(true) + .when(0, { fill: this.style.backgroundColor }) + .when(1000, { fill: this.style.Signal.sigBack.fillColor }) + .when(2000, { fill: this.style.backgroundColor }) + .when(3000, { fill: this.style.Signal.sigBack.fillColor }) + .start(); + } + if (model.isRequestGuide) { + this.lamps && this.lamps[0] && this.lamps[0].setAnimationStart(this.style.Signal.lamp.yellowColor); + } + if (path.includes('/map/draw')) { + if (model.type == 'PASSING') { + this.lamps && this.lamps.length && this.lamps.forEach(elem => { + elem.setColor(this.style.Signal.lamp.greenColor); + }); + } else { + this.lamps && this.lamps.length && this.lamps.forEach(elem => { + elem.setColor(this.style.Signal.lamp.redColor); + }); + } + } + if ( model.level === 3 && this.style.Signal.post.mainSignalVerColor && !model.fleetMode) { + this.sigPost.setVerColor(this.style.Signal.post.mainSignalVerColor); + } else if (model.level === 1 && this.style.Signal.post.closeSignalVerColor && !model.fleetMode) { + this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor); + } else if (model.level === 2 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) { + this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor); + } + // 信号机故障 + model.fault && this.fault(); + // 设置灰显 + if (model.noStatus || model.level === 0) { + this.setAshShow(); + } + } } getBoundingRect() { From 37d44bf6d25f1526603d36e25382c33e9688892f Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Sat, 20 Feb 2021 10:42:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=8E=B0=E5=9C=B0=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/selectStation.vue | 7 +++- src/views/newMap/jlmapNew/index.vue | 33 +++++++++++-------- src/views/newMap/jointTrainingNew/index.vue | 23 ++++++++----- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/views/newMap/displayNew/selectStation.vue b/src/views/newMap/displayNew/selectStation.vue index a5ebebab8..86a53d0ec 100644 --- a/src/views/newMap/displayNew/selectStation.vue +++ b/src/views/newMap/displayNew/selectStation.vue @@ -59,7 +59,12 @@ export default { let list = []; const member = this.$store.state.training.memberData[val]; const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode); - if (station) { + const lineCode = this.$store.getters['map/lineCode']; + if ((lineCode === '02' || lineCode === '05') && station) { + this.showStation = station.code; + const showStationCode = this.stationCentralizedMap[station.code]; + this.setCenter(showStationCode); + } else if (station) { this.showStation = station.code; const showStationCode = this.stationCentralizedMap[station.code]; nameList.forEach(item => { diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 9cf11ae57..c959c7e58 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -518,21 +518,26 @@ export default { EventBus.$emit('select_DrawType', showMode); }, setShowStation(stationCode, setCenter) { - const nameList = Object.keys(this.$store.state.map.map); - let list = []; - nameList.forEach(item => { - if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) { - if (item === 'trainList') { - this.$store.state.map.map[item].forEach(elem => { - elem && list.push(elem); - }); - } else { - list = [...list, ...this.$store.state.map.map[item]]; + const lineCode = this.$store.getters['map/lineCode']; + if (lineCode === '02' || lineCode === '05') { + !setCenter && this.setCenter(stationCode); + } else { + const nameList = Object.keys(this.$store.state.map.map); + let list = []; + nameList.forEach(item => { + if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) { + if (item === 'trainList') { + this.$store.state.map.map[item].forEach(elem => { + elem && list.push(elem); + }); + } else { + list = [...list, ...this.$store.state.map.map[item]]; + } } - } - }); - this.$jlmap.updateShowStation(list, stationCode); - !setCenter && this.setCenter(stationCode); + }); + this.$jlmap.updateShowStation(list, stationCode); + !setCenter && this.setCenter(stationCode); + } }, setOffset(data, num, sum, obj) { this.$jlmap.switchScreen(data, num, sum, obj); diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index fe59b5b85..e6bd34cd1 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -529,15 +529,20 @@ export default { }, setShowStation(stationCode) { const showStation = this.centralizedStationMap[stationCode]; - const nameList = Object.keys(this.$store.state.map.map); - let list = []; - nameList.forEach(item => { - if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) { - list = [...list, ...this.$store.state.map.map[item]]; - } - }); - this.$jlmap.updateShowStation(list, showStation); - this.$jlmap.setCenter(showStation); + const lineCode = this.$store.getters['map/lineCode']; + if (lineCode === '02' || lineCode === '05') { + this.$jlmap.setCenter(showStation); + } else { + const nameList = Object.keys(this.$store.state.map.map); + let list = []; + nameList.forEach(item => { + if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) { + list = [...list, ...this.$store.state.map.map[item]]; + } + }); + this.$jlmap.updateShowStation(list, showStation); + this.$jlmap.setCenter(showStation); + } }, setStationList(map) { this.stationList = []; From 7483b1be46e5885bf6b964bc02927ad262681d9f Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Sat, 20 Feb 2021 13:28:11 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=BC=94=E7=BB=83=E7=8E=B0=E5=9C=B0=E8=AE=BE=E5=A4=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/menuDialog/areaSelection.vue | 37 ++++++++++++------- src/views/newMap/jlmapNew/index.vue | 24 ------------ src/views/newMap/jointTrainingNew/index.vue | 28 +++++++++++++- 3 files changed, 50 insertions(+), 39 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue index b5215d401..503ec168c 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue @@ -4,7 +4,7 @@ class="ningbo-01__systerm station-control" :title="title" :visible.sync="show" - width="600px" + width="650px" :before-close="doClose" :show-close="true" :z-index="2000" @@ -14,21 +14,28 @@ - - + + - - + + - - + + - - + + + - 全部申请 + 全部申请 取消全部申请 全部释放 取消全部释放 @@ -66,15 +73,17 @@ export default { doShow() { this.tableData = []; this.stationList.forEach(item => { - if (item.centralized) { - this.tableData.push(item); - } + this.tableData.push(item); }); - console.log(this.stationList, this.tableData); this.show = true; }, doClose() { this.show = false; + }, + applyAll() { + this.tableData.forEach(item => { + this.$set(item, 'apply', true); + }); } } }; diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index c959c7e58..d61381672 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -155,11 +155,6 @@ export default { $route() { this.mapViewLoaded(true); }, - '$store.state.training.prdType': function (val) { - if (val) { - this.changePrdType(val); - } - }, '$store.state.map.showCentralizedStationNum': function (val) { if (this.$store.state.map.showCentralizedStationCode) { this.setShowStation(this.$store.state.map.showCentralizedStationCode); @@ -481,25 +476,6 @@ export default { }; this.$store.dispatch('map/setMousemove'); }, - // 综合演练切换现地行调模式 - changePrdType(val) { - const nameList = Object.keys(this.$store.state.map.map || {}); - let list = []; let showMode = ''; - nameList.forEach(item => { - if (item !== 'skinVO') { - const data = this.$store.state.map.map[item]; - if (data && data.constructor === Array) { - list = [...list, ...data]; - } - } - }); - if (val === '01') { - showMode = '03'; - } else if (val === '02') { - showMode = '02'; - } - this.$jlmap.updatePrdType(list, val, showMode); - }, // 切换现地行调显示界面（绘图和预览页面下） setShowMode(showMode) { if (this.showMode !== showMode) { diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index e6bd34cd1..d3ccf6358 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -370,6 +370,7 @@ export default { this.$store.dispatch('training/setRoles', 'DISPATCHER'); this.hideIbp(); this.drivingShow = false; + this.changePrdType('02'); this.mapViewLoadedOver && this.setShowStation(''); this.jl3dmaintainershow = false; break; @@ -378,6 +379,7 @@ export default { this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR'); this.$refs.menuSchema.chiShowStation = deviceCode; this.showStation = deviceCode; + this.changePrdType('01'); this.mapViewLoadedOver && this.switchStationMode(deviceCode); this.jl3dmaintainershow = false; this.drivingShow = false; @@ -527,6 +529,24 @@ export default { this.showStation = this.centralizedStationMap[stationCode]; this.setShowStation(this.showStation); }, + changePrdType(val) { + const nameList = Object.keys(this.$store.state.map.map || {}); + let list = []; let showMode = ''; + nameList.forEach(item => { + if (item !== 'skinVO') { + const data = this.$store.state.map.map[item]; + if (data && data.constructor === Array) { + list = [...list, ...data]; + } + } + }); + if (val === '01') { + showMode = '03'; + } else if (val === '02') { + showMode = '02'; + } + this.$jlmap.updatePrdType(list, val, showMode); + }, setShowStation(stationCode) { const showStation = this.centralizedStationMap[stationCode]; const lineCode = this.$store.getters['map/lineCode']; @@ -537,7 +557,13 @@ export default { let list = []; nameList.forEach(item => { if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) { - list = [...list, ...this.$store.state.map.map[item]]; + if (item === 'trainList') { + this.$store.state.map.map[item].forEach(elem => { + elem && list.push(elem); + }); + } else { + list = [...list, ...this.$store.state.map.map[item]]; + } } }); this.$jlmap.updateShowStation(list, showStation); From 858c7dd7a7baf00fab1b52e05f67ba7ba1bc8080 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Sat, 20 Feb 2021 15:03:44 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=89=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=EF=BC=88=E6=B3=B0=E9=9B=B7=E5=85=B9=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=EF=BC=89=20=E7=B3=BB=E7=BB=9F=E6=89=A3=E8=BD=A6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE/=E5=8F=96=E6=B6=88=20=E6=93=8D=E4=BD=9C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StationStand/safeStand/ESolidStand.js | 4 +- .../menus/menuDialog/standDetain.vue | 54 ++++++++++++++----- src/scripts/cmdPlugin/CommandEnum.js | 6 +++ .../mapoperate/train/trainmodel.vue | 6 +-- 4 files changed, 52 insertions(+), 18 deletions(-) diff --git a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js index 020019751..12615edaf 100644 --- a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js +++ b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js @@ -122,10 +122,10 @@ class ESolidStand extends Group { model.trainParking && this.setColor(style.StationStand.solidStand.stopColor); // 紧急停车 model.emergencyClosed && this.setColor(style.StationStand.solidStand.spareColor); - // 系统扣车 - // model.centerHoldTrain && this.setHoldTrain('System'); // 站台扣车 (model.centerHoldTrain || model.stationHoldTrain) && this.setHoldTrain('Station'); + // 系统扣车 + model.sysHoldTrain && this.setHoldTrain('System'); } else { this.handlePassagerColor(model.num); } diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue index 5c15435ad..4f38c81b1 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue @@ -2,7 +2,7 @@ - + - 确定(O) + 确定(O) - 应用(A) + 应用(A) 关闭(C) @@ -92,6 +92,7 @@ export default { selected() { return this.$store.state.menuOperation.selected; }, + domIdChoose() { return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''; }, @@ -131,7 +132,7 @@ export default { }, doShow(data) { if (data.active == 'second') { - this.status = true; + this.judgeStatus(); } this.activeName = data.active; // 如果不是断点激活，而是第一次显示，则需要设置初始值 @@ -141,6 +142,23 @@ export default { this.$store.dispatch('training/emitTipFresh'); }); }, + changeTabs() { + if (this.activeName == 'second') { + this.judgeStatus(); + } else { + this.status = true; + } + }, + judgeStatus() { + this.status = false; + this.stationStandList.forEach(element => { + const stand = this.$store.getters['map/getDeviceByCode'](element.code); + if (stand.sysHoldTrain) { + this.status = this.status || true; + } + }); + this.status = !this.status; + }, doClose() { this.loading = false; this.dialogShow = false; @@ -148,20 +166,30 @@ export default { this.$store.dispatch('training/emitTipFresh'); }, commit(isClose = false) { - const step = { - over: true, - cmdType:this.status ? CMD.Stand.CMD_STAND_SET_HOLD_TRAIN : CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, - operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation, - param: {standCode: this.selected.code} - }; - + let step = {}; + if (this.activeName == 'first') { + step = { + over: true, + cmdType:this.status ? CMD.Stand.CMD_STAND_SET_HOLD_TRAIN : CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, + operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation, + param: {standCode: this.selected.code} + }; + } else { + step = { + over: true, + cmdType:this.status ? CMD.Stand.CMD_STAND_SYS_HOLD_TRAIN : CMD.Stand.CMD_STAND_SYS_CANCEL_HOLD_TRAIN, + operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation + }; + } this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + if (isClose) { + this.$store.dispatch('menuOperation/setSelected', {device: {}}); + } isClose && this.doClose(); } - }).catch((error) => { - console.log(error); + }).catch(() => { isClose && this.doClose(); this.$refs.noticeInfo.doShow(); }); diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index dd2855d48..ee84ad28c 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -161,6 +161,12 @@ export default { CMD_STAND_SET_HOLD_TRAIN: {value:'Stand_Set_Hold_Train', label: '设置扣车'}, /** 取消扣车 */ CMD_STAND_CANCEL_HOLD_TRAIN: {value:'Stand_Cancel_Hold_Train', label: '取消扣车'}, + + /** 设置系统扣车 */ + CMD_STAND_SYS_HOLD_TRAIN: {value:'Stand_Sys_Hold_Train', label: '设置系统扣车'}, + /** 取消系统扣车 */ + CMD_STAND_SYS_CANCEL_HOLD_TRAIN: {value:'Stand_Cancel_Sys_Hold_Train', label: '取消系统扣车'}, + /** 批量扣车 */ CMD_STAND_SET_HOLD_TRAIN_ALL: {value:'Stand_Set_Hold_Train_Batch', label: '批量扣车'}, /** 批量取消扣车 */ diff --git a/src/views/newMap/newMapdraft/mapoperate/train/trainmodel.vue b/src/views/newMap/newMapdraft/mapoperate/train/trainmodel.vue index fe9da8737..8836344ef 100644 --- a/src/views/newMap/newMapdraft/mapoperate/train/trainmodel.vue +++ b/src/views/newMap/newMapdraft/mapoperate/train/trainmodel.vue @@ -64,9 +64,9 @@ export default { formModel: { code: '', name: '', - length: 0, // 车长-- 米 - weight:1, // 车重-- 吨 - numberOfCars:1 // 车厢数量 + length: 120, // 车长-- 米 + weight:230, // 车重-- 吨 + numberOfCars:6// 车厢数量 // safeDistance: '', // maxSafeDistance: '', // averageVelocity: 0, From 86ac34e8991c5ff3f5c1bb371df496662a12d018 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Sat, 20 Feb 2021 15:05:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B3=B0=E9=9B=B7=E5=85=B9=20=E5=AE=81?= =?UTF-8?q?=E6=B3=A2=E4=B8=89=E5=8F=B7=E7=BA=BF=20=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=9D=83=E8=BD=AC=E7=A7=BB=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/jmapNew/config/skinCode/ningbo_03.js | 6 +- src/jmapNew/shape/Station/index.js | 28 +- src/jmapNew/theme/ningbo_03/menus/menuBar.vue | 294 ++++++++++-------- .../menus/menuDialog/stationRequest.vue | 57 ++-- 4 files changed, 223 insertions(+), 162 deletions(-) diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js index 15a11683b..57517f7cf 100644 --- a/src/jmapNew/config/skinCode/ningbo_03.js +++ b/src/jmapNew/config/skinCode/ningbo_03.js @@ -239,7 +239,9 @@ class SkinCode extends defaultStyle { fontWeight:'normal', // 字体粗细 textPadding:[0, 0], // 字体边距 borderColor:'', // 字体边框颜色 - textBorderWidth:0 // 字体边框宽度 + textBorderWidth:0, // 字体边框宽度 + isSpecialType:true, // 特雷兹特殊类型 + noneModeColor:'#ff0' // 无模式时字体颜色 }, kmPostShow: false, // 公里标显示 @@ -262,7 +264,7 @@ class SkinCode extends defaultStyle { lampSpace: 60 // 灯间距 }, StationControl: { - disPlayNone: true, // 不显示 + disPlayNone: true, // 不显示 text: { distance: 12, // 灯和文字之间的距离 fontSize: 12, // 字体大小 diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index 2b18bd2ff..4259c6a3b 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -385,7 +385,12 @@ export default class Station extends Group { this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor); this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色 - this.stationText.setColor('#1fdc1f'); + if (this.style.Station.stationText.isSpecialType) { + // simulationRoleList + } else { + this.stationText.setColor('#1fdc1f'); + } + this.stationControlText && this.stationControlText.setStyle({text:'CC', textFill:this.style.Station.StationControl.text.centerControlColor}); // // @@ -411,7 +416,11 @@ export default class Station extends Group { // this.subheadText && this.subheadText.setStyle('textFill', '#fff'); // } // } - this.stationText.setColor('#fff'); + if (this.style.Station.stationText.isSpecialType) { + + } else { + this.stationText.setColor('#fff'); + } } handleEmergency() { // 紧急站控 @@ -427,7 +436,11 @@ export default class Station extends Group { // this.subheadText && this.subheadText.setStyle('textFill', '#fff'); // } // } - this.stationText.setColor('#fff'); + if (this.style.Station.stationText.isSpecialType) { + + } else { + this.stationText.setColor('#fff'); + } } handleInterlock() { // 联锁控 成都三号线 @@ -448,6 +461,9 @@ export default class Station extends Group { if (this.style.Station.stationText.noneModeFlash) { this.stationText.setAnimateStyle(this.noneBeforeMode); } + if (this.style.Station.stationText.isSpecialType) { + this.stationText.setColor(this.style.Station.stationText.noneModeColor); + } } recover() { @@ -462,7 +478,11 @@ export default class Station extends Group { this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor); - this.stationText && this.stationText.stopAnimate(); + if (this.style.Station.stationText.isSpecialType) { + + } else { + this.stationText && this.stationText.stopAnimate(); + } } // 设置状态 diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue index 78e32346f..d72b16f29 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue @@ -95,9 +95,9 @@ - - - + + + @@ -203,10 +203,10 @@ export default { StandDetain, IntervalStopNumber, AllocateTime, - StationTransfer, - StationRequest, - StationDevolution, - StationReclaim, + StationTransfer, + StationRequest, + StationDevolution, + StationReclaim, StandDetail, SwitchCommand, InitializeSwitchBlock, @@ -356,7 +356,7 @@ export default { { title: '取消CBTC列车进路', click: this.cancelCbtcRoute - }, + } // { // title: 'VOBC切换', // click: this.undeveloped @@ -429,33 +429,33 @@ export default { children: [ { title: '开放/关闭', - click: this.standOpenOrClose, + click: this.standOpenOrClose, operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain, - operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot + click: this.setStandDetain, + operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot }, { title: '设置站间列车数量', - click: this.undeveloped, - operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum + click: this.undeveloped, + operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum }, { title: '分配停站时间', - click: this.setAllocateTime, - operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime + click: this.setAllocateTime, + operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime }, { title: '授权转移', - click: this.authorizeTransfer, - operate: OperationEvent.Command.commandNingBo3.line_stand_transfer + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo3.line_stand_transfer }, { title: '显示', - click: this.showStandDetail, - operate: OperationEvent.Command.commandNingBo3.line_stand_detail + click: this.showStandDetail, + operate: OperationEvent.Command.commandNingBo3.line_stand_detail } ] }, @@ -464,28 +464,28 @@ export default { operate: OperationEvent.Command.commandNingBo3.line_switch, children: [ { - title: '命令', - operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, + title: '命令', + operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, click: this.setSwitchCommand }, { - title: '封锁', - operate: OperationEvent.Command.commandNingBo3.line_switch_block, + title: '封锁', + operate: OperationEvent.Command.commandNingBo3.line_switch_block, click: this.setBlockSwitch }, { - title: '解除封锁', - operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, click: this.setUnblockSwitch }, { - title: '请求动岔/请求或授权/取消', - operate: OperationEvent.Command.commandNingBo3.line_switch_empower, + title: '请求动岔/请求或授权/取消', + operate: OperationEvent.Command.commandNingBo3.line_switch_empower, click: this.setSwitchActive }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_switch_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_switch_detail, click: this.showSwitchDetail } ] @@ -496,38 +496,38 @@ export default { children: [ { - title: '引导', - operate: OperationEvent.Command.commandNingBo3.line_signal_guide, + title: '引导', + operate: OperationEvent.Command.commandNingBo3.line_signal_guide, click: this.setSignalGuide }, { - title: '取消允许锁闭', - operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, + title: '取消允许锁闭', + operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, click: this.setSignalCanBlock }, { - title: '进路/命令', - operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, + title: '进路/命令', + operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, click: this.setRouteCommand }, { - title: '信号指示模式', - operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, + title: '信号指示模式', + operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, click: this.setSignalModel }, { - title: '封锁', - operate: OperationEvent.Command.commandNingBo3.line_signal_block, + title: '封锁', + operate: OperationEvent.Command.commandNingBo3.line_signal_block, click: this.setSignalBlock }, { - title: '解除封锁', - operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, click: this.setSignalCancelBlock }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_signal_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_signal_detail, click: this.showSignalDetail } ] @@ -537,23 +537,23 @@ export default { operate: OperationEvent.Command.commandNingBo3.line_section, children: [ { - title: '开放', - operate: OperationEvent.Command.commandNingBo3.line_section_open, + title: '开放', + operate: OperationEvent.Command.commandNingBo3.line_section_open, click: this.handleOpenSection }, { - title: '关闭', - operate: OperationEvent.Command.commandNingBo3.line_section_close, + title: '关闭', + operate: OperationEvent.Command.commandNingBo3.line_section_close, click: this.handleCloseSection }, { - title: '临时限速', - operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, + title: '临时限速', + operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, click: this.handleLimitSpeed }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_section_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_section_detail, click: this.handleSectionShow } ] @@ -727,6 +727,38 @@ export default { } ] }, + { + title: '用户权限(U)', + operate: OperationEvent.Command.mBar.userManage, + children: [ + { + title: '转移控制', + operate: OperationEvent.Command.commandNingBo3.line_user, + children: [ + { + title: '请求区域控制权', + click: this.authorizeRequest, + operate: OperationEvent.Command.commandNingBo3.line_user_request + }, + { + title: '授权转移', + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo3.line_user_transfer + }, + { + title: '下放站控', + click: this.authorizeDevolution, + operate: OperationEvent.Command.commandNingBo3.line_user_devolution + }, + { + title: '收回站控', + click: this.authorizeReclaim, + operate: OperationEvent.Command.commandNingBo3.line_user_reclaim + } + ] + } + ] + } // { // title: '视图(V)', // operate: '', @@ -919,39 +951,39 @@ export default { title: '线路(G)', operate: OperationEvent.Command.commandNingBo3.line, children: [ - { + { title: '站台', operate: OperationEvent.Command.commandNingBo3.line_stand, children: [ { title: '开放/关闭', - click: this.standOpenOrClose, + click: this.standOpenOrClose, operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain, - operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot + click: this.setStandDetain, + operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot }, { title: '设置站间列车数量', - click: this.undeveloped, - operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum + click: this.undeveloped, + operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum }, { title: '分配停站时间', - click: this.setAllocateTime, - operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime + click: this.setAllocateTime, + operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime }, { title: '授权转移', - click: this.authorizeTransfer, - operate: OperationEvent.Command.commandNingBo3.line_stand_transfer + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo3.line_stand_transfer }, { title: '显示', - click: this.showStandDetail, - operate: OperationEvent.Command.commandNingBo3.line_stand_detail + click: this.showStandDetail, + operate: OperationEvent.Command.commandNingBo3.line_stand_detail } ] }, @@ -960,99 +992,99 @@ export default { operate: OperationEvent.Command.commandNingBo3.line_switch, children: [ { - title: '命令', - operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, + title: '命令', + operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, click: this.setSwitchCommand }, { - title: '封锁', - operate: OperationEvent.Command.commandNingBo3.line_switch_block, + title: '封锁', + operate: OperationEvent.Command.commandNingBo3.line_switch_block, click: this.setBlockSwitch }, { - title: '解除封锁', - operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, click: this.setUnblockSwitch }, { - title: '请求动岔/请求或授权/取消', - operate: OperationEvent.Command.commandNingBo3.line_switch_empower, + title: '请求动岔/请求或授权/取消', + operate: OperationEvent.Command.commandNingBo3.line_switch_empower, click: this.setSwitchActive }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_switch_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_switch_detail, click: this.showSwitchDetail } ] }, - { + { title: '信号机', operate: OperationEvent.Command.commandNingBo3.line_signal, children: [ { - title: '引导', - operate: OperationEvent.Command.commandNingBo3.line_signal_guide, + title: '引导', + operate: OperationEvent.Command.commandNingBo3.line_signal_guide, click: this.setSignalGuide }, { - title: '取消允许锁闭', - operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, + title: '取消允许锁闭', + operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, click: this.setSignalCanBlock }, { - title: '进路/命令', - operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, + title: '进路/命令', + operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, click: this.setRouteCommand }, { - title: '信号指示模式', - operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, + title: '信号指示模式', + operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, click: this.setSignalModel }, { - title: '封锁', - operate: OperationEvent.Command.commandNingBo3.line_signal_block, + title: '封锁', + operate: OperationEvent.Command.commandNingBo3.line_signal_block, click: this.setSignalBlock }, { - title: '解除封锁', - operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, click: this.setSignalCancelBlock }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_signal_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_signal_detail, click: this.showSignalDetail } ] }, - { + { title: '轨道', operate: OperationEvent.Command.commandNingBo3.line_section, children: [ { - title: '开放', - operate: OperationEvent.Command.commandNingBo3.line_section_open, + title: '开放', + operate: OperationEvent.Command.commandNingBo3.line_section_open, click: this.handleOpenSection }, { - title: '关闭', - operate: OperationEvent.Command.commandNingBo3.line_section_close, + title: '关闭', + operate: OperationEvent.Command.commandNingBo3.line_section_close, click: this.handleCloseSection }, { - title: '临时限速', - operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, + title: '临时限速', + operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, click: this.handleLimitSpeed }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_section_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_section_detail, click: this.handleSectionShow } ] - }, + }, { title: '闭塞区段', operate: '', @@ -1214,9 +1246,9 @@ export default { click: this.adjustStrategy } ] - }, - { - title: '用户权限(U)', + }, + { + title: '用户权限(U)', operate: OperationEvent.Command.mBar.userManage, children: [ { @@ -1225,28 +1257,28 @@ export default { children: [ { title: '请求区域控制权', - click: this.authorizeRequest, - operate: OperationEvent.Command.commandNingBo3.line_user_request + click: this.authorizeRequest, + operate: OperationEvent.Command.commandNingBo3.line_user_request }, { title: '授权转移', - click: this.authorizeTransfer, - operate: OperationEvent.Command.commandNingBo3.line_user_transfer - }, - { + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo3.line_user_transfer + }, + { title: '下放站控', - click: this.authorizeDevolution, - operate: OperationEvent.Command.commandNingBo3.line_user_devolution - }, - { + click: this.authorizeDevolution, + operate: OperationEvent.Command.commandNingBo3.line_user_devolution + }, + { title: '收回站控', - click: this.authorizeReclaim, - operate: OperationEvent.Command.commandNingBo3.line_user_reclaim + click: this.authorizeReclaim, + operate: OperationEvent.Command.commandNingBo3.line_user_reclaim } ] - } - ] - } + } + ] + } // { // title: '视图(V)', // operate: '', @@ -1317,7 +1349,7 @@ export default { return true; }, initMenu(menu) { - const type = State2SimulationMap[this.$store.state.training.prdType]; + const type = State2SimulationMap[this.$store.state.training.prdType]; this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode); this.clickEvent(); this.closeMenu(true); @@ -1357,7 +1389,7 @@ export default { hookClick(item, event) { this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null }); if (item && typeof item.click == 'function') { - item.click(item.operate||{}); + item.click(item.operate || {}); } }, selectedClassA(item, index) { @@ -1538,10 +1570,10 @@ export default { this.$refs.stationTransfer.doShow(); } }); - }, + }, // 请求区域控制权 authorizeRequest(item) { - const operate = { + const operate = { type: 'bar', operation: item.operation }; @@ -1552,10 +1584,10 @@ export default { this.$refs.stationRequest.doShow(); } }); - }, - // 下放站控 - authorizeDevolution(item) { - const operate = { + }, + // 下放站控 + authorizeDevolution(item) { + const operate = { type: 'bar', operation: item.operation }; @@ -1566,10 +1598,10 @@ export default { this.$refs.stationDevolution.doShow(); } }); - }, - // 收回站控 - authorizeReclaim(item) { - const operate = { + }, + // 收回站控 + authorizeReclaim(item) { + const operate = { type: 'bar', operation: item.operation }; @@ -1580,7 +1612,7 @@ export default { this.$refs.stationReclaim.doShow(); } }); - }, + }, showStandDetail(item) { const operate = { type: 'bar', @@ -1632,8 +1664,8 @@ export default { if (valid) { this.closeMenu(true); this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); - // this.$refs.initializeSwitchBlock.doShow(operate); - this.$refs.switchBlock.doShow(operate); + // this.$refs.initializeSwitchBlock.doShow(operate); + this.$refs.switchBlock.doShow(operate); } }); }, diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue index 2501b63be..db1a063e5 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue @@ -12,19 +12,19 @@ :close-on-click-modal="false" > - - - - - - 所有站台(F) + + + + + + 所有站台(F)
{{ message }}
- 确定(O) + 确定(O) - 应用(A) + 应用(A) 关闭(C) @@ -46,15 +46,15 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'StationControl', components: { - NoticeInfo + NoticeInfo }, data() { return { - status: true, + status: '', operate: null, loading: false, dialogShow: false, - allChecked: false, + allChecked: false, station:{}, message:'' }; @@ -107,26 +107,31 @@ export default { 'selected': function(val) { if (val) { const sationEle = this.$store.getters['map/getDeviceByCode'](val.code); - if (this.prdType == '02') { - this.status = sationEle && sationEle.controlMode != 'Center'; - } else { - this.status = sationEle && sationEle.controlMode == 'Center'; + if (this.prdType == '01' && sationEle && sationEle.controlMode == 'Center') { + this.status = 'Center'; + } else if (this.prdType == '02' && sationEle && sationEle.controlMode != 'Center') { + this.status = 'Local'; } + // if (this.prdType == '02') { + // + // } else { + // this.status = sationEle && sationEle.controlMode == 'Center'; + // } } } }, methods: { doShow() { this.message = ''; - this.dialogShow = true; - this.$nextTick(e => { - this.$refs.table.setCurrentRow(); - this.$store.dispatch('training/emitTipFresh'); - }) + this.dialogShow = true; + this.$nextTick(e => { + this.$refs.table.setCurrentRow(); + this.$store.dispatch('training/emitTipFresh'); + }); }, doClose() { - this.dialogShow = false; - this.$refs.table.setCurrentRow(); + this.dialogShow = false; + this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('socket/shiftMsgQueue'); }, @@ -160,21 +165,23 @@ export default { }); }, commit(isClose = true) { + debugger; const val = this.selected || {}; const steps = { operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation, over: true, - param: {stationCode:val.code} + param: {stationCodes:[val.code]} }; - steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL; + // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL; + steps.cmdType = this.status == 'Center' ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL; this.$store.dispatch('training/nextNew', steps).then(({ valid }) => { if (valid) { isClose && this.doClose(); this.$emit('commandSuccess', val.code); } - }).catch((error) => { + }).catch(() => { isClose && this.doClose(); this.$refs.noticeInfo.doShow(); }); From f38c4fcb91fef8140884b0f345550ff9e8c4394d Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Sat, 20 Feb 2021 15:51:39 +0800 Subject: [PATCH 6/7] =?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/scripts/cmdPlugin/CommandEnum.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index ee84ad28c..f534f2efb 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -229,7 +229,15 @@ export default { /** 全站取消自动通过 */ CMD_STATION_CANCEL_CI_AUTO: {value: 'Station_Cancel_CI_Auto', label: '全站取消自动通过'}, /** 设置/取消强制点灯 */ - CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL: {value: 'Station_Set_Or_Cancel_Force_Physical_Signal', label: '设置/取消强制点灯'} + CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL: {value: 'Station_Set_Or_Cancel_Force_Physical_Signal', label: '设置/取消强制点灯'}, + /** 区域选择（请求区域控制权【泰雷兹】） */ + CMD_STATION_CONTROL_APPLY: {value: 'Station_Control_Apply', label: '请求区域控制权'}, + /** 授权转移 (【泰雷兹】) */ + CMD_STATION_CONTROL_TRANSFER: {value: 'Station_Control_Transfer', label: '授权转移'}, + /** 下放站控 (【泰雷兹】) */ + CMD_STATION_CONTROL_DEVOLVE: {value: 'Station_Control_Devolve', label: '下放站控'}, + /** 收回站控 (【泰雷兹】) */ + CMD_STATION_CONTROL_REVOKE: {value: 'Station_Control_Revoke', label: '收回站控'} }, // 列车 From 7413d131c323499d59f970fea6dfb1b9f422e4d7 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Sat, 20 Feb 2021 15:55:53 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_01/menus/menuBar.vue | 6 +- .../menus/menuDialog/areaSelection.vue | 115 ++++++++++++++++-- src/scripts/cmdPlugin/CommandEnum.js | 6 +- src/scripts/cmdPlugin/Handler.js | 10 +- src/scripts/cmdPlugin/OperationHandler.js | 19 +++ 5 files changed, 137 insertions(+), 19 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue index d6b4d891f..32b5ca467 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue @@ -156,6 +156,7 @@ export default { }, { title: '区域选择', + operate: OperationEvent.Station.areaSelection.mbar, click: this.selectedArea }, { @@ -362,6 +363,7 @@ export default { }, { title: '区域选择', + operate: OperationEvent.Station.areaSelection.mbar, click: this.selectedArea }, { @@ -978,8 +980,8 @@ export default { }, selectedArea(order) { const operate = { - type: 'bar' - // operation: order.operation + type: 'bar', + operation: order.operation }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue index 503ec168c..9864740aa 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue @@ -30,18 +30,22 @@ - + + + 全部申请 - 取消全部申请 - 全部释放 - 取消全部释放 - 全部强制分配 - 取消全部强制分配 - 应用 + 取消全部申请 + 全部释放 + 取消全部释放 + 全部强制分配 + 取消全部强制分配 + 应用 退出 @@ -51,6 +55,8 @@