From 88c327698fe2cf91ea5e9fb5b6b11ac0ecd94e85 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 27 Aug 2021 10:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=BF=A1=E5=8F=B7=E6=9C=BA=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E9=87=8C=20=E4=BF=A1=E5=8F=B7=E6=9C=BA=E5=9E=8B?= =?UTF-8?q?=E5=8F=B7=EF=BC=88signalModel=EF=BC=89=20=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E8=BF=9B=E8=B7=AF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=87=8C=20=E4=BF=A1=E5=8F=B7=E6=98=AF=E5=90=A6=E5=BC=80?= =?UTF-8?q?=E6=94=BE=E7=BB=BF=E7=81=AF=E5=AD=97=E6=AE=B5=20=E4=B8=BA=20?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=98=BE=E7=A4=BA=EF=BC=88aspect=EF=BC=89=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/map.js | 1 + src/i18n/langs/zh/map.js | 1 + .../dataRelation/routeoperate/route.vue | 20 +++++++++++++++++-- .../newMap/newMapdraft/mapoperate/models.js | 1 + .../newMapdraft/mapoperate/signal/index.vue | 6 ++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js index 309e17e3f..4f297efd3 100644 --- a/src/i18n/langs/en/map.js +++ b/src/i18n/langs/en/map.js @@ -569,6 +569,7 @@ export default { verifyMapName: 'Map name repeated, you confirm that publishing this map will overwrite the public map?', arcApproachSectionList: 'Interlock automatically tracks the approach section', greenOpen: 'Signal green light', + signalColor:'Signal display', psdList: 'Platform screen door', espList: 'Platform emergency stop button', interlockingBlocks: 'Interlocking blocks', diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index b96f03105..2c50fd2f9 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -565,6 +565,7 @@ export default { verifyMapName: '地图名称重复，您确认发布此地图将会覆盖公共地图？', arcApproachSectionList: '联锁自动追踪接近区段', greenOpen: '信号开放绿灯(否则黄灯)', + signalColor:'信号灯显示', psdList: '站台屏蔽门', espList: '站台紧急停车按钮', interlockingBlocks: '联锁区段', diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue index 548165caf..033b584bd 100644 --- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue @@ -60,11 +60,21 @@ @click="hover('endSignalCode')" >{{ $t('map.activate') }} - + + + + + @@ -223,6 +233,11 @@ export default { { name: '定位', code: true }, { name: '反位', code: false } ], + aspectList:[ + { name: '绿', code: 'G' }, + { name: '黄', code: 'Y' }, + { name: '月白', code: ' W' } + ], addModel: { mapId: '', code: '', @@ -235,7 +250,8 @@ export default { turnBack: false, // 是否折返进路 startSignalCode: '', // 始端信号机 endSignalCode: '', // 终端信号机 - greenOpen: true, // 是否开放绿灯 + // greenOpen: true, // 是否开放绿灯 + aspect:'', routeSectionList: [], // 进路物理区段 routeSwitchList: [], // 进路道岔列表 routeFlankProtectionList: [], // 进路侧防道岔列表 diff --git a/src/views/newMap/newMapdraft/mapoperate/models.js b/src/views/newMap/newMapdraft/mapoperate/models.js index ae352df3f..33586451a 100644 --- a/src/views/newMap/newMapdraft/mapoperate/models.js +++ b/src/views/newMap/newMapdraft/mapoperate/models.js @@ -61,6 +61,7 @@ class Model { this.code = ''; this.name = ''; this.type = 'PROTECTION'; + this.signalModel = 'R'; this.uniqueName = ''; this.nameShow = true; this.lampPostType = '01'; // 灯柱类型 diff --git a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue index 545b0084e..4af1059ef 100644 --- a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue @@ -68,6 +68,11 @@ export default { { code: 'ARRIVAL', name: '进站信号机' }, { code: 'EXIT', name: '出站信号机' } ], + signalModelList:[ + { code: 'RGY', name: '红绿黄三灯信号机'}, + { code: 'R', name: '单红灯信号机'}, + { code: 'BW', name: '蓝白调车信号机'} + ], field:'', editModel: getModel('Signal'), centralizedStationList: [], // 设备集中站列表 @@ -115,6 +120,7 @@ export default { { prop: 'code', label: this.$t('map.signalCodeColon'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.signalList, deviceChange: this.deviceChange }, { prop: 'name', label: this.$t('map.signalNameColon'), type: 'input' }, { prop: 'type', label: '信号机类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.signalTypeList}, + { prop: 'signalModel', label: '信号机型号:', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.signalModelList}, { prop: 'position', label: '信号机坐标:', type: 'coordinate', width: '140px', 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' }