From b05d71667e0108bac3d0232493c040d1b31afb57 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 17 Dec 2019 15:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=BD=A6=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/mapoperate/train/create.vue   |  4 ++
 .../newMapdraft/mapoperate/train/index.vue    |  2 +-
 .../newMapdraft/mapoperate/trainwindow.vue    | 64 ++++++++-----------
 3 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/train/create.vue b/src/views/newMap/newMapdraft/mapoperate/train/create.vue
index 91eb1ea9e..a914c4053 100644
--- a/src/views/newMap/newMapdraft/mapoperate/train/create.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/train/create.vue
@@ -45,6 +45,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import { getUID } from '@/jmapNew/utils/Uid';
 
 export default {
@@ -70,6 +71,9 @@ export default {
         };
     },
     computed: {
+        ...mapGetters('map', [
+            'trainList'
+        ]),
         rules() {
             return {
                 range: [
diff --git a/src/views/newMap/newMapdraft/mapoperate/train/index.vue b/src/views/newMap/newMapdraft/mapoperate/train/index.vue
index 4e9f34139..de0e20055 100644
--- a/src/views/newMap/newMapdraft/mapoperate/train/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/train/index.vue
@@ -102,7 +102,7 @@ export default {
             }
         },
         create(list) {
-            this.$emit('addOrUpdateMapModel', list);
+            this.$emit('updateMapModel', list);
         },
         // 修改对象
         edit(elem) {
diff --git a/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue b/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
index f03e7c110..ee3efcef3 100644
--- a/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
@@ -118,8 +118,8 @@ export default {
             field: '',
             addModel: {
                 pointY: '',
-                width: '',
-                height: '',
+                width: 40,
+                height: 15,
                 modelList: []
             },
             mergeRules: {
@@ -289,6 +289,13 @@ export default {
                             _dispose: true
                         });
                     });
+                    this.sectionList.forEach(elem => {
+                        if (elem.trainWindowCode) {
+                            const section = deepAssign({}, elem);
+                            section.trainWindowCode = '';
+                            remove.push(section);
+                        }
+                    });
                     this.$emit('updateMapModel', remove);
                 }
             }).catch(() => {
@@ -298,24 +305,10 @@ export default {
         // 一键创建车次窗
         createTrainWindow() {
             const models = [];
-            const switchSectionList = [];
-            // const PhysicalSectionList = [];
-            this.addList = [];
-            const remove = []; // 清空所有车次窗
-            if (this.trainWindowList && this.trainWindowList.length) {
-                this.trainWindowList.forEach(elem => {
-                    remove.push({
-                        _type: 'TrainWindow',
-                        code: elem.code,
-                        _dispose: true
-                    });
-                });
-                this.$emit('updateMapModel', remove);
-            }
-
+            this.addList = []; // 为生成名字 code需要list
             if (this.sectionList && this.sectionList.length) {
                 this.sectionList.forEach(elem => {
-                    if (elem.type !== '04' && !elem.isSwitchSection && (elem.logicSectionNum.length == 0 || elem.logicSectionNum.length == 1 && elem.logicSectionNum[0] == 0)) {
+                    if (elem.type !== '04' && !elem.isSwitchSection && !elem.trainWindowCode && (elem.logicSectionNum.length == 0 || elem.logicSectionNum.length == 1 && elem.logicSectionNum[0] == 0)) {
                         const triangle = new JTriangle(elem.points[0], elem.points[elem.points.length - 1]);
                         const param = this.createModel({
                             triangle: triangle,
@@ -323,36 +316,19 @@ export default {
                         });
                         models.push(param);
                         const section = deepAssign(elem, { trainWindowCode: param.code });
-                        // if (section.type == '02') {
-                        //     if (!switchSectionList.find(ele => { return ele.code == section.parentCode; })) {
-                        //         const sectionParent = deepAssign({}, this.$store.getters['map/getDeviceByCode'](section.parentCode));
-                        //         sectionParent['trainWindowCode'] = section.trainWindowCode;
-                        //         switchSectionList.push(sectionParent);
-                        //     }
-                        // }
-                        switchSectionList.push(section);
+                        models.push(section);
                         this.addList.push(param);
-                    } else if (elem.type === '04') {
+                    } else if (elem.type === '04' && !elem.trainWindowCode) {
                         const param = this.createModel({
                             section: elem
                         });
                         models.push(param);
                         const section = deepAssign(elem, { trainWindowCode: param.code });
-                        switchSectionList.push(section);
+                        models.push(section);
                         this.addList.push(param);
                     }
                 });
             }
-            switchSectionList.forEach(elem => {
-                if (elem.type === '04') {
-                    elem.relevanceSectionList.forEach(item => {
-                        const section = deepAssign({}, this.$store.getters['map/getDeviceByCode'](item));
-                        section['trainWindowCode'] = elem.trainWindowCode;
-                        models.push(section);
-                    });
-                }
-                models.push(elem);
-            });
 
             this.$emit('updateMapModel', models);
         },
@@ -375,7 +351,17 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    _that.$emit('updateMapModel', {...selected, _dispose: true});
+                    const models = [];
+                    this.sectionList.forEach(elem => {
+                        if (elem.trainWindowCode == selected.code) {
+                            const section = deepAssign({}, elem);
+                            section.trainWindowCode = '';
+                            models.push(section);
+                        }
+                    });
+                    models.push(deepAssign(selected, { _dispose: true }));
+                    console.log(models);
+                    _that.$emit('updateMapModel', models);
                     _that.deviceSelect();
                 }).catch(() => {
                     _that.$message.info(this.$t('tip.cancelledDelete'));