joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

Browse Source
This commit is contained in:
joylink_cuiweidong 2019-12-19 13:14:40 +08:00
commit fb7618c8ee
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/newMap/newMapdraft/mapoperate/espDraft.vue
View File

@ -157,7 +157,7 @@ export default {
create() { create() {
const arr = []; const arr = [];
this.stationStandList.forEach(item => { this.stationStandList.forEach(item => {
if (item.visible && !this.hasPSD(item)) { if (item.visible && !item.small && !this.hasPSD(item)) {
const uid = getUID('Esp', [...this.espList, ...arr]); const uid = getUID('Esp', [...this.espList, ...arr]);
arr.push({ arr.push({
_type: 'Esp', _type: 'Esp',

21
src/views/newMap/newMapdraft/mapoperate/stationstand.vue
View File

@ -97,7 +97,8 @@ export default {
'stationList', 'stationList',
'stationStandList', 'stationStandList',
'sectionList', 'sectionList',
'psdList' 'psdList',
'espList'
]), ]),
form() { form() {
const form = { const form = {
@ -121,7 +122,7 @@ export default {
{ prop: 'height', label: this.$t('map.stationstandHeight'), 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: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.PhysicalSectionList, hover: this.hover, buttonType: 'editSectionSelectCode', buttonShowType: this.isButtonTypeES }, { prop: 'standTrackCode', label: '站台轨:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.PhysicalSectionList, hover: this.hover, buttonType: 'editSectionSelectCode', buttonShowType: this.isButtonTypeES },
{ prop: 'right', label: '行驶方向:', type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.isRightList }, { prop: 'right', label: '行驶方向:', type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.isRightList },
{ prop: 'small', label: '是否小型站台:', type: 'checkbox' } { prop: 'small', label: '是否小型站台:', type: 'checkbox', disabled: true }
] ]
}, },
map: { map: {
@ -329,6 +330,13 @@ export default {
param.position.y = this.addModel.pointY + (this.addModel.height / 2) + space; param.position.y = this.addModel.pointY + (this.addModel.height / 2) + space;
} }
models.push(param); models.push(param);
const espUid = getUID('Esp', this.espList); // 创建紧急停车按钮
models.push({
_type: 'Esp',
code: espUid,
name: `Esp${this.espList.length + 1}`,
standCode: Standuid
});
} }
section.standTrack = true; section.standTrack = true;
models.push(section); models.push(section);
@ -373,7 +381,14 @@ export default {
cancelButtonText: this.$t('tip.cancel'), cancelButtonText: this.$t('tip.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
_that.$emit('updateMapModel', {...selected, _dispose: true}); const models = [];
models.push(deepAssign(selected, { _dispose: true }));
this.espList.forEach(item => {
if (item.standCode == selected.code) {
models.push(deepAssign(item, { _dispose: true }));
}
});
_that.$emit('updateMapModel', models);
_that.deviceSelect(); _that.deviceSelect();
this.$refs.dataform.resetFields(); this.$refs.dataform.resetFields();
}).catch(() => { }).catch(() => {