地图绘制 添加 信号机设备里 信号机型号（signalModel） 字段

更改 进路编辑里 信号是否开放绿灯字段 为 信号显示（aspect） 字段

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',

src/i18n/langs/zh/map.js

@@ -565,6 +565,7 @@ export default {
     verifyMapName: '地图名称重复，您确认发布此地图将会覆盖公共地图？',
     arcApproachSectionList: '联锁自动追踪接近区段',
     greenOpen: '信号开放绿灯(否则黄灯)',
+    signalColor:'信号灯显示',
     psdList: '站台屏蔽门',
     espList: '站台紧急停车按钮',
     interlockingBlocks: '联锁区段',

src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue

@@ -60,11 +60,21 @@
             @click="hover('endSignalCode')"
           >{{ $t('map.activate') }}</el-button>
         </el-form-item>
-        <el-form-item :label="$t('map.greenOpen') + ':'" prop="greenOpen">
+        <!-- <el-form-item :label="$t('map.greenOpen') + ':'" prop="greenOpen">
           <el-radio-group v-model="addModel.greenOpen">
             <el-radio :label="true">{{ $t('map.are') }}</el-radio>
             <el-radio :label="false">{{ $t('map.deny') }}</el-radio>
           </el-radio-group>
+        </el-form-item> -->
+        <el-form-item :label="$t('map.signalColor') + ':'" prop="aspect">
+          <el-select v-model="addModel.aspect">
+            <el-option
+              v-for="item in aspectList"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item :label="$t('map.physicalSection') +':'" prop="routeSectionList">
           <el-select v-model="addModel.routeSectionList" multiple filterable> <!--  111 -->
@@ -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: [], // 进路侧防道岔列表

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'; // 灯柱类型

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' }