diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 97114632d..4a4ceb173 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -314,7 +314,7 @@ export default {
this.deviceShow = false;
}
},
- /* 设置仿真初始时间以及运行状态 */
+ /* 地图根据仿真group获取仿真基础信息 */
async loadSimulationInfo() {
const resp = await getSimulationInfoNew(this.group);
if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 53992e82f..914c81a73 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -5,26 +5,28 @@
- 退出
- 退出
-
- {{ $t('joinTraining.initialize') }}
- {{ $t('joinTraining.drivingByPlan') }}
+ 退出
+ 退出
+
+
+ {{ $t('joinTraining.initialize') }}
+ {{ $t('joinTraining.drivingByPlan') }}
+
+
+ {{ '剩余时间:' + countdownTime }}
+ 开始
+ 提交
+
+
+ {{ $t('display.demon.deviceView') }}
+
+ {{ jl3dname }}
+
+ {{ $t('display.demon.passengerflow') }}
+ 生成二维码
+ 成员管理
+ 设备管理
-
- {{ '剩余时间:' + countdownTime }}
- 开始
- 提交
-
-
- {{ $t('display.demon.deviceView') }}
-
- {{ jl3dname }}
-
- {{ $t('display.demon.passengerflow') }}
- 生成二维码
- 成员管理
- 设备管理
diff --git a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
index 1c94e57b2..aee5463a6 100644
--- a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
@@ -285,7 +285,7 @@ export default {
{ prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.centralizedStationList },
{ prop: 'interlockStationCode', label: '所属联锁站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.ciStationList},
{ prop: 'uniqueName', label: this.$t('map.signalUniqueName'), type: 'input' },
- { prop: 'sectionCode', label: this.$t('map.belongsSection'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.signalSectionList },
+ { prop: 'sectionCode', label: this.$t('map.belongsSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.signalSectionList, hover: this.hover, buttonType: 'signalSection', buttonShowType: this.signalSectionShow },
{ prop: 'sectionOffset', label: this.$t('map.signalOffset'), type: 'number', min: 0, placeholder: this.$t('tip.meter') }
]
@@ -326,6 +326,9 @@ export default {
{ required: true, message: this.$t('rules.signalGuidePositionY'), trigger: 'blur' }
]
};
+ },
+ signalSectionShow() {
+ return this.field == 'signalSection';
}
},
mounted() {
@@ -344,6 +347,10 @@ export default {
});
},
methods: {
+ hover(field) {
+ this.field = field == this.field ? '' : field;
+ this.signalSectionCode(this.field);
+ },
deviceChange(code) {
this.$emit('setCenter', code);
this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
@@ -363,6 +370,11 @@ export default {
this.activeName = 'second';
this.field = '';
this.$emit('deviceSelect', '');
+ } else if (selected && selected._type === 'Section' && this.field == 'signalSection') {
+ this.editModel.sectionCode = selected.code;
+ this.activeName = 'first';
+ this.field = '';
+ this.$emit('deviceSelect', '');
}
},
updateMapModel(data) {
diff --git a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
index 58be132e2..c0c493018 100644
--- a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
@@ -124,7 +124,7 @@ export default {
{ prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
{ prop: 'width', label: this.$t('map.stationstandWidth'), type: 'number', min: 0, max: 2000, placeholder: 'px' },
{ prop: 'height', label: this.$t('map.stationstandHeight'), type: 'number', min: 0, max: 2000, placeholder: 'px' },
- { prop: 'standTrackCode', label: '站台轨:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.PhysicalSectionList, disabled: true},
+ { prop: 'standTrackCode', label: '站台轨:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.PhysicalSectionList, hover: this.hover, buttonType: 'stationStandCode', buttonShowType: this.stationStandCodeShow },
{ prop: 'right', label: '行驶方向:', type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.isRightList },
{ prop: 'defaultReentryStrategy', label: '默认折返策略:', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.reentryStrategyList },
{ prop: 'small', label: '是否小型站台:', type: 'checkbox', disabled: true },
@@ -260,6 +260,9 @@ export default {
},
PhysicalSectionList() {
return this.sectionList.filter(elem => elem.type === '01');
+ },
+ stationStandCodeShow() {
+ return this.field === 'stationStandCode';
}
},
mounted() {
@@ -312,6 +315,11 @@ export default {
this.activeName = 'first';
this.field = '';
this.hover(this.field);
+ } else if (selected && selected._type === 'Section' && this.field == 'stationStandCode') {
+ this.editModel.standTrackCode = selected.code;
+ this.activeName = 'first';
+ this.field = '';
+ this.hover(this.field);
}
},
create() {