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

src/views/newMap/newMapdraft/mapoperate/espDraft.vue

@@ -157,7 +157,7 @@ export default {
         create() {
             const arr = [];
             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]);
                     arr.push({
                         _type: 'Esp',

src/views/newMap/newMapdraft/mapoperate/stationstand.vue

@@ -97,7 +97,8 @@ export default {
             'stationList',
             'stationStandList',
             'sectionList',
-            'psdList'
+            'psdList',
+            'espList'
         ]),
         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: '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: 'small', label: '是否小型站台:', type: 'checkbox' }
+                            { prop: 'small', label: '是否小型站台:', type: 'checkbox', disabled: true }
                         ]
                     },
                     map: {
@@ -329,6 +330,13 @@ export default {
                             param.position.y = this.addModel.pointY + (this.addModel.height / 2) + space;
                         }
                         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;
                     models.push(section);
@@ -340,11 +348,12 @@ export default {
             // 创建新站台的时候，判断该站台对应的车站是否集中站，如果不是集中站，判断该车站是否被控制
             // 被控制的车站数据
             let beCentralizedStation = {};
-            this.stationList.forEach(data=>{
+            this.stationList.some(data=>{
                 if (data.centralized) {
                     if (data.code == this.addModel.stationCode) {
                         beCentralizedStation = {};
-                        return data.code;
+                        beCentralizedStation[this.addModel.stationCode] = data.code;
+                        return true;
                     }
                     data.chargeStationCodeList.forEach(charge=>{
                         beCentralizedStation[charge] = data.code;
@@ -372,7 +381,14 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).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();
                     this.$refs.dataform.resetFields();
                 }).catch(() => {