From d52fe1828118a817e332571e4ead770fd634860c Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Mon, 7 Dec 2020 09:46:00 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E5=AE=A2=E6=B5=81=E4=B8=8A=E4=B8=8B=E8=BD=A6=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/edit/connect/getmodels.js         | 179 ------------------
 src/jlmap3d/edit/connect/testconnect.js       |  10 -
 src/jlmap3d/edit/jl3dEditorLoader.js          |   1 -
 .../jl3ddrive/moveupdate/DrivingConnectNew.js |   1 +
 .../model/traintrunk/passertrunkhuman.js      |   4 +-
 5 files changed, 4 insertions(+), 191 deletions(-)
 delete mode 100644 src/jlmap3d/edit/connect/getmodels.js
 delete mode 100644 src/jlmap3d/edit/connect/testconnect.js

diff --git a/src/jlmap3d/edit/connect/getmodels.js b/src/jlmap3d/edit/connect/getmodels.js
deleted file mode 100644
index 2a56c5714..000000000
--- a/src/jlmap3d/edit/connect/getmodels.js
+++ /dev/null
@@ -1,179 +0,0 @@
-//import request from '@/utils/request';
-
-export function getmodels(data) {
-    let postmap = {
-        id:data.mapdata.id,
-        mapId:data.mapdata.mapId,
-        assets:"null",
-        sections:"null",
-        signals:"null",
-        trains:"null",
-        stands:"null",
-        switchs:"null"
-    };
-
-    if(data.mapdata.sectionlist.sections== undefined){
-      return postmap;
-    }
-
-
-    if(data == undefined){
-
-      return postmap;
-    }else{
-      //资源
-      let assets = [];
-      for(let i=0;i<data.assetloader.modellist.length;i++){
-        let asset = {
-          id:data.assetloader.modellist[i].id,
-          name:data.assetloader.modellist[i].name,
-          deviceType:data.assetloader.modellist[i].deviceType,
-          type:data.assetloader.modellist[i].type,
-          assetUrl:data.assetloader.modellist[i].assetUrl
-        }
-        assets.push(asset);
-      }
-
-      postmap.assets = JSON.stringify(assets);
-
-      //link轨道
-      let links = [];
-      for(let i=0;i<data.mapdata.linklist.linksgroup.children.length;i++){
-        let link = {
-          uuid:data.mapdata.linklist.linksgroup.children[i].uuid,
-          code:data.mapdata.linklist.linksgroup.children[i].code,
-          name:data.mapdata.linklist.linksgroup.children[i].name,
-          lengthfact:data.mapdata.linklist.linksgroup.children[i].lengthfact,
-          position:data.mapdata.linklist.linksgroup.children[i].position,
-          rotation:data.mapdata.linklist.linksgroup.children[i].rotation,
-          scale:data.mapdata.linklist.linksgroup.children[i].scale,
-          rightlist:data.mapdata.linklist.linksgroup.children[i].rightlist,
-          leftlist:data.mapdata.linklist.linksgroup.children[i].leftlist,
-          lp:data.mapdata.linklist.linksgroup.children[i].lp,
-          rp:data.mapdata.linklist.linksgroup.children[i].rp,
-          rail:data.mapdata.linklist.linksgroup.children[i].rail,
-        }
-        links.push(link);
-      }
-      // postmap.sections.link = JSON.stringify(links);
-
-      //section隧道
-      let sections = [];
-
-      for(let i=0;i<data.mapdata.sectionlist.sections.datalist.length;i++){
-        let section = {
-          uuid:data.mapdata.sectionlist.sections.modellist[i].uuid,
-          code:data.mapdata.sectionlist.sections.modellist[i].code,
-          name:data.mapdata.sectionlist.sections.modellist[i].name,
-          lengthfact:data.mapdata.sectionlist.sections.modellist[i].lengthfact,
-          isStandTrack:data.mapdata.sectionlist.sections.modellist[i].isStandTrack,
-          relStandCode:data.mapdata.sectionlist.sections.datalist[i].relStandCode,
-          linkCode:data.mapdata.sectionlist.sections.datalist[i].linkCode,
-          rightlist:data.mapdata.sectionlist.sections.modellist[i].rightlist,
-          leftlist:data.mapdata.sectionlist.sections.modellist[i].leftlist,
-          rightpoint:data.mapdata.sectionlist.sections.modellist[i].rightpoint,
-          leftpoint:data.mapdata.sectionlist.sections.modellist[i].leftpoint,
-          rail:data.mapdata.sectionlist.sections.modellist[i].rail,
-          position:data.mapdata.sectionlist.sections.modellist[i].position,
-          rotation:data.mapdata.sectionlist.sections.modellist[i].rotation,
-          scale:data.mapdata.sectionlist.sections.modellist[i].scale
-        }
-
-        // testmesh1.position.z = link.position.z;
-
-        sections.push(section);
-      }
-          console.log(links);
-      let arrray = {
-          link:links,
-          section:sections,
-      };
-      postmap.sections = JSON.stringify(arrray);
-      //道岔
-      let switchs = [];
-
-      for(let i=0;i<data.mapdata.sectionlist.switchs.modellist.length;i++){
-        let switcha = {
-          uuid:data.mapdata.sectionlist.switchs.modellist[i].uuid,
-          code:data.mapdata.sectionlist.switchs.datalist[i].code,
-          name:data.mapdata.sectionlist.switchs.datalist[i].name,
-          alink:data.mapdata.sectionlist.switchs.datalist[i].alink,
-          blink:data.mapdata.sectionlist.switchs.datalist[i].blink,
-          clink:data.mapdata.sectionlist.switchs.datalist[i].clink,
-          paname:data.mapdata.sectionlist.switchs.datalist[i].paname,
-          pbname:data.mapdata.sectionlist.switchs.datalist[i].pbname,
-          pcname:data.mapdata.sectionlist.switchs.datalist[i].pcname,
-          pa:data.mapdata.sectionlist.switchs.datalist[i].pa,
-          pb:data.mapdata.sectionlist.switchs.datalist[i].pb,
-          pc:data.mapdata.sectionlist.switchs.datalist[i].pc,
-          position:data.mapdata.sectionlist.switchs.modellist[i].position,
-          rotation:data.mapdata.sectionlist.switchs.modellist[i].rotation,
-          scale:data.mapdata.sectionlist.switchs.modellist[i].scale
-        }
-        switchs.push(switcha);
-      }
-      postmap.switchs = JSON.stringify(switchs);
-      //信号
-      let signals = [];
-      for(let i=0;i<data.mapdata.signallist.list.length;i++){
-
-
-        let signal = {
-          uuid:data.mapdata.signallist.list[i].mesh.uuid,
-          name:data.mapdata.signallist.list[i].mesh.name,
-          modelid:data.mapdata.signallist.list[i].mesh.modelid,
-          code:data.mapdata.signallist.list[i].mesh.code,
-          position:data.mapdata.signallist.list[i].mesh.position,
-          rotation:data.mapdata.signallist.list[i].mesh.rotation,
-          scale:data.mapdata.signallist.list[i].mesh.scale,
-          virtual:data.mapdata.signallist.list[i].mesh.virtual
-        }
-
-        signals.push(signal);
-      }
-      postmap.signals = JSON.stringify(signals);
-      //车站
-      let stands = [];
-
-      for(let i=0;i<data.mapdata.stationstandlist.list.length;i++){
-        let station = {
-          uuid:data.mapdata.stationstandlist.list[i].uuid,
-          code:data.mapdata.stationstandlist.list[i].code,
-          name:data.mapdata.stationstandlist.list[i].name,
-          modelid:data.mapdata.stationstandlist.list[i].modelid,
-          position:data.mapdata.stationstandlist.list[i].mesh.position,
-          rotation:data.mapdata.stationstandlist.list[i].mesh.rotation,
-          scale:data.mapdata.stationstandlist.list[i].mesh.scale,
-          direction1:{
-            name:data.mapdata.stationstandlist.list[i].direction1.name,
-            code:null
-          },
-          direction2:{
-            name:data.mapdata.stationstandlist.list[i].direction2.name,
-            code:null
-          }
-        }
-        stands.push(station);
-      }
-        postmap.stands  = JSON.stringify(stands);
-      //列车
-      let trains = [];
-      for(let i=0;i<data.assetloader.modellist.length;i++){
-        if(data.assetloader.modellist[i].deviceType == "train"){
-          let train = {
-            id:data.assetloader.modellist[i].id,
-            name:data.assetloader.modellist[i].name,
-            deviceType:data.assetloader.modellist[i].deviceType,
-            type:data.assetloader.modellist[i].type,
-            assetUrl:data.assetloader.modellist[i].assetUrl
-          }
-
-          trains.push(train);
-        }
-      }
-      postmap.trains = JSON.stringify(trains);
-
-      return postmap;
-    }
-
-  }
diff --git a/src/jlmap3d/edit/connect/testconnect.js b/src/jlmap3d/edit/connect/testconnect.js
deleted file mode 100644
index aacafdc29..000000000
--- a/src/jlmap3d/edit/connect/testconnect.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import request from '@/utils/request';
-
-/** 获取路径单元列表*/
-export function getmodels(data) {
-	return request({
-		url: 'http://192.168.3.23:1337/model_load',
-		method: 'get',
-		params: data
-	});
-}
diff --git a/src/jlmap3d/edit/jl3dEditorLoader.js b/src/jlmap3d/edit/jl3dEditorLoader.js
index c6542c604..529fa81f8 100644
--- a/src/jlmap3d/edit/jl3dEditorLoader.js
+++ b/src/jlmap3d/edit/jl3dEditorLoader.js
@@ -10,7 +10,6 @@ import {SwitchList} from '@/jlmap3d/edit/testEditorModel/SwitchList.js';
 import {RailList} from '@/jlmap3d/edit/testEditorModel/RailList.js';
 
 import axios from 'axios';
-import {getmodels} from '@/jlmap3d/edit/connect/getmodels';
 import { Loading } from 'element-ui';
 // import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js';
 
diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
index 651fcacf9..258d26d37 100644
--- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
+++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
@@ -53,6 +53,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
 		// console.log(data);
 
 		if(data.type == "Train_Position"){
+
 			nowTrainRun(data.body);
 			return;
 		}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkhuman.js b/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkhuman.js
index f73f631b1..a7b2985ab 100644
--- a/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkhuman.js
+++ b/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkhuman.js
@@ -171,6 +171,8 @@ export function  PasserHuman() {
     // console.log(inPasser);
     // console.log(outPasser);
     // let outPassers = inNum[scope.nowTrunk].num;
+    console.log(inNum);
+      console.log(leaveNum);
     let created = 0;
     for(let i=0;i<outPasser.length;i++){
       for(let j=0;j<outPasser[i];j++){
@@ -187,7 +189,7 @@ export function  PasserHuman() {
       for(let j=0;j<inPasser[i];j++){
         setTimeout(function(){
           scope.createInPasser(humanlist,direct);
-        }, Math.random()*1000*i);
+        }, 2000+Math.random()*1000*j);
 
       }
     }

From 6995a8a962c1e8dce73b229283e8ef6e4290013a Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 7 Dec 2020 15:09:53 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A5=E5=8C=BA?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=BA=E7=9B=AE=E6=A0=87=E5=88=A0=E9=99=A4=E5=B7=A6?=
 =?UTF-8?q?=E5=8F=B3=E6=89=80=E6=9C=89=E5=85=83=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/mapoperate/ImageControl.vue   |   4 +
 .../newMap/newMapdraft/mapoperate/arrow.vue   |   4 +
 .../mapoperate/components/operateProperty.vue |   1 +
 .../newMapdraft/mapoperate/controlLamp.vue    |   4 +
 .../newMap/newMapdraft/mapoperate/counter.vue |   4 +
 .../newMapdraft/mapoperate/delayunlock.vue    |   4 +
 .../newMapdraft/mapoperate/directionRod.vue   |   8 +-
 .../newMapdraft/mapoperate/espDraft.vue       |   8 +-
 .../newMapdraft/mapoperate/floodGate.vue      |   4 +
 .../newMap/newMapdraft/mapoperate/index.vue   |  10 +-
 .../newMapdraft/mapoperate/lcControl.vue      |   4 +
 .../newMap/newMapdraft/mapoperate/line.vue    |   4 +
 .../mapoperate/outFrameControl.vue            |   4 +
 .../newMap/newMapdraft/mapoperate/power.vue   |   5 +-
 .../newMapdraft/mapoperate/psdDraft.vue       |   8 +-
 .../mapoperate/section/batchSettings.vue      | 126 ++++++++++++++++--
 .../newMapdraft/mapoperate/section/index.vue  |   3 +
 .../newMapdraft/mapoperate/signal/index.vue   |   8 +-
 .../newMapdraft/mapoperate/splitStation.vue   |   8 +-
 .../newMap/newMapdraft/mapoperate/station.vue |   5 +-
 .../newMapdraft/mapoperate/stationstand.vue   |  12 +-
 .../newMapdraft/mapoperate/switch/index.vue   |   2 +-
 .../mapoperate/switch/switchModle.vue         |   6 +-
 .../newMap/newMapdraft/mapoperate/text.vue    |   4 +
 .../newMapdraft/mapoperate/trainwindow.vue    |  12 +-
 .../newMapdraft/mapoperate/zcControl.vue      |   1 +
 26 files changed, 223 insertions(+), 40 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue b/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
index 6844d1f80..276435a5c 100644
--- a/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Resource"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -162,6 +163,9 @@ export default {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         deviceSelect(selected) {
             this.$refs.form && this.$refs.form.resetFields();
             this.$refs.make && this.$refs.make.resetFields();
diff --git a/src/views/newMap/newMapdraft/mapoperate/arrow.vue b/src/views/newMap/newMapdraft/mapoperate/arrow.vue
index 7a3187c5a..a6c202e5a 100644
--- a/src/views/newMap/newMapdraft/mapoperate/arrow.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/arrow.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Arrow"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -139,6 +140,9 @@ export default {
         clear() {
             this.addModel = getModel('Arrow');
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         create() {
             const model = deepAssign(this.addModel, {code:getUID('Arrow', this.arrowList)});
             this.$emit('updateMapModel', model);
diff --git a/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue b/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
index dd6dd7755..c9fad141e 100644
--- a/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
@@ -51,6 +51,7 @@ export default {
                         data.content = `${this.editModel.prepend}::${this.editModel.content}`;
                     }
                     this.$emit('updateMapModel', data);
+                    this.$emit('clearDeviceSelect');
                 } else {
                     this.$message('还有属性未填写，修改未生效！');
                 }
diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
index bb061bc4d..40c9aef82 100644
--- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         :type="editModel.type"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -228,6 +229,9 @@ export default {
                 this.$emit('deviceSelect', '');
             }
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         handleIndicatorLightList(indicatorLightList) {
             this.atsControlList = [];
             this.centerCommunicationList = [];
diff --git a/src/views/newMap/newMapdraft/mapoperate/counter.vue b/src/views/newMap/newMapdraft/mapoperate/counter.vue
index a14e2af63..628c30a78 100644
--- a/src/views/newMap/newMapdraft/mapoperate/counter.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/counter.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Counter"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -162,6 +163,9 @@ export default {
                 this.addModel.stationCode = selected.code;
             }
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         create() {
             const uid = getUID('Counter', this.counterList);
             const model = {
diff --git a/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue b/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
index 742e0aad4..1c3294446 100644
--- a/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="DelayUnlock"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -148,6 +149,9 @@ export default {
         deviceChange(code) {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         deviceSelect(selected) {
             this.$nextTick(() => {
                 this.$refs.form && this.$refs.form.resetFields();
diff --git a/src/views/newMap/newMapdraft/mapoperate/directionRod.vue b/src/views/newMap/newMapdraft/mapoperate/directionRod.vue
index dfcf6c757..e6ed7e030 100644
--- a/src/views/newMap/newMapdraft/mapoperate/directionRod.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/directionRod.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Resource"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -200,6 +201,9 @@ export default {
                 this.$emit('deviceSelect', '');
             }
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         hover(field) {
             this.field = field === this.field ? '' : field;
             if (this.field) {
@@ -229,8 +233,8 @@ export default {
         },
         updateMapModel(data) {
             data.uniqueCode = `${data.startStationCode}-${data.endStationCode}-${data.right}`;
-			this.$emit('updateMapModel', data);
-			this.field = '';
+            this.$emit('updateMapModel', data);
+            this.field = '';
         },
         deleteObj() {
             this.$refs.dataform.deleteObj();
diff --git a/src/views/newMap/newMapdraft/mapoperate/espDraft.vue b/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
index cd48a662c..23408cc91 100644
--- a/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Esp"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -109,6 +110,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
             // this.edit();
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         hover(field) {
             this.field = field === this.field ? '' : field;
             if (this.field) {
@@ -163,8 +167,8 @@ export default {
             }
         },
         updateMapModel(data) {
-			this.$emit('updateMapModel', data);
-			this.field = '';
+            this.$emit('updateMapModel', data);
+            this.field = '';
         },
         deleteObj() {
             this.$refs.dataform.deleteObj();
diff --git a/src/views/newMap/newMapdraft/mapoperate/floodGate.vue b/src/views/newMap/newMapdraft/mapoperate/floodGate.vue
index 57225ba0a..63b4a7c36 100644
--- a/src/views/newMap/newMapdraft/mapoperate/floodGate.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/floodGate.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Resource"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -143,6 +144,9 @@ export default {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         deviceSelect(selected) {
             this.$refs.form && this.$refs.form.resetFields();
             this.$refs.make && this.$refs.make.resetFields();
diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue
index cb94b7bf5..9396129e3 100644
--- a/src/views/newMap/newMapdraft/mapoperate/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/index.vue
@@ -3,10 +3,12 @@
     <div class="map-control">
       <div class="border-card">
         <div class="map-operate">
-          <span>
-            {{ $t('map.mapName') }}
-            <b>{{ mapInfo.name }}</b>
-          </span>
+          <div style="float: left;width: 280px;overflow: hidden;height: 17px;text-overflow: ellipsis;white-space: nowrap;">
+            <span>{{ $t('map.mapName') }}</span>
+            <el-tooltip class="item" effect="dark" :content="mapInfo.name" placement="top">
+              <b>{{ mapInfo.name }}</b>
+            </el-tooltip>
+          </div>
           <el-button v-if="isSave" type="text" style="float: right; padding: 3px 0" :disabled="$attrs.mapSaveing" @click="saveMapEvent">{{ $t('map.save') }}</el-button>
           <el-dropdown class="operate-button" trigger="click">
             <span class="el-dropdown-link">数据操作</span>
diff --git a/src/views/newMap/newMapdraft/mapoperate/lcControl.vue b/src/views/newMap/newMapdraft/mapoperate/lcControl.vue
index 25a00dd7c..e5d7f7ff5 100644
--- a/src/views/newMap/newMapdraft/mapoperate/lcControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/lcControl.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="LcControl"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -142,6 +143,9 @@ export default {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         deviceSelect(selected) {
             this.$refs.form && this.$refs.form.resetFields();
             this.$refs.make && this.$refs.make.resetFields();
diff --git a/src/views/newMap/newMapdraft/mapoperate/line.vue b/src/views/newMap/newMapdraft/mapoperate/line.vue
index 9cc7d7fbf..afc02f4ae 100644
--- a/src/views/newMap/newMapdraft/mapoperate/line.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/line.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Line"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -149,6 +150,9 @@ export default {
         });
     },
     methods: {
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         deviceChange(code) {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
diff --git a/src/views/newMap/newMapdraft/mapoperate/outFrameControl.vue b/src/views/newMap/newMapdraft/mapoperate/outFrameControl.vue
index 364442e4c..fd0f6739c 100644
--- a/src/views/newMap/newMapdraft/mapoperate/outFrameControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/outFrameControl.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="OutFrame"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -156,6 +157,9 @@ export default {
                 this.editModel = deepAssign(this.editModel, selected);
             }
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         addPoint(index) {
             const data = { x: 0, y: 0 };
             this.editModel.points.splice(index + 1, 0, data);
diff --git a/src/views/newMap/newMapdraft/mapoperate/power.vue b/src/views/newMap/newMapdraft/mapoperate/power.vue
index 5e768a019..2a6dee6f2 100644
--- a/src/views/newMap/newMapdraft/mapoperate/power.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/power.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Power"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="tabClick"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -324,8 +325,8 @@ export default {
                 } else {
                     delete data.sectionUnitList;
                 }
-				this.$emit('updateMapModel', data);
-				this.field = '';
+                this.$emit('updateMapModel', data);
+                this.field = '';
             }
         },
         deleteObj() {
diff --git a/src/views/newMap/newMapdraft/mapoperate/psdDraft.vue b/src/views/newMap/newMapdraft/mapoperate/psdDraft.vue
index 8c1abd1c5..8659367a7 100644
--- a/src/views/newMap/newMapdraft/mapoperate/psdDraft.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/psdDraft.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Psd"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -200,6 +201,9 @@ export default {
                 this.$emit('deviceSelect', '');
             }
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         deviceSelect(selected) {
             if (selected && selected._type.toUpperCase() === 'Psd'.toUpperCase()) {
                 this.$refs.dataform && this.$refs.dataform.resetFields();
@@ -235,8 +239,8 @@ export default {
             this.$refs.createForm.resetForm();
         },
         updateMapModel(data) {
-			this.$emit('updateMapModel', data);
-			this.field = '';
+            this.$emit('updateMapModel', data);
+            this.field = '';
         },
         // 批量设置
         batchSettings() {
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
index e3f9a04e7..e6f8716f5 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
@@ -3,12 +3,6 @@
     <el-collapse v-model="activeName" accordion style="margin-left: 20px">
       <el-collapse-item title="左右停车点偏移" name="1">
         <el-form label-width="200px" size="mini">
-          <!-- <el-form-item :label="$t('map.leftStopPointOffsetFromStart')" prop="leftDistance">
-            <el-input-number v-model="form.leftDistance" :min="0" />
-          </el-form-item>
-          <el-form-item :label="$t('map.rightStopPointOffsetFromTerminal')" prop="rightDistance">
-            <el-input-number v-model="form.rightDistance" :min="0" />
-          </el-form-item> -->
           <el-form-item>
             <el-button-group>
               <el-button type="primary" size="small" @click="batchSettings">{{ $t('global.set') }}</el-button>
@@ -103,6 +97,34 @@
           <el-button style="margin-left: 150px" type="primary" size="small" @click="setSwitchSectionName">设置</el-button>
         </el-button-group>
       </el-collapse-item>
+      <el-collapse-item title="批量删除区段左右元素" name="7">
+        <el-form ref="fromModel" :model="fromModel" label-width="150px" size="mini" :rules="roadRules">
+          <el-form-item label="区段:" prop="sectionCode">
+            <el-select v-model="fromModel.sectionCode" filterable>
+              <el-option
+                v-for="item in sectionList"
+                :key="item.code"
+                :label="item.name + '(' + item.code + ')'"
+                :value="item.code"
+              />
+            </el-select>
+            <el-button
+              :type="field === 'sectiondeleteCode' ? 'danger' : 'primary'"
+              size="small"
+              @click="hover('sectiondeleteCode')"
+            >{{ $t('map.activate') }}</el-button>
+          </el-form-item>
+          <el-form-item label="线路类型">
+            <el-radio v-model="fromModel.right" :label="true">右边删除</el-radio>
+            <el-radio v-model="fromModel.right" :label="false">左边删除</el-radio>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button type="primary" size="small" @click="handleAllDelete">删除</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+      </el-collapse-item>
     </el-collapse>
   </div>
 </template>
@@ -124,10 +146,6 @@ export default {
     data() {
         return {
             activeName: '',
-            // form: {
-            //     leftDistance: 0,
-            //     rightDistance: 0
-            // },
             formModel: {
                 modelList: [],
                 trainPosType: ''
@@ -136,6 +154,10 @@ export default {
                 roadType: null,
                 sectionCode: ''
             },
+            fromModel: {
+                sectionCode: '',
+                right: false
+            },
             positionTypes: [
                 { name: '上方', type: '01' },
                 { name: '下方', type: '02' }
@@ -332,6 +354,90 @@ export default {
             });
             this.$emit('updateMapModel', models);
             this.$message.success('道岔区段设置成功!');
+        },
+        handleAllDelete() {
+            const section = this.$store.getters['map/getDeviceByCode'](this.fromModel.sectionCode);
+            const index = this.fromModel.right ? section.points.length - 1 : 0;
+            const pointX = section.points[index].x;
+            const map = this.$store.state.map.map;
+            const models = [];
+            console.log(this.$store.state.map.map);
+            map.sectionList.forEach(item => {
+                if (item.type == '04') {
+                    const flag = this.fromModel.right ? item.namePosition.x >= pointX : item.namePosition.x < pointX;
+                    if (flag) {
+                        models.push(deepAssign(item, { _dispose: true }));
+                    }
+                } else {
+                    const flag = this.fromModel.right ? item.points[0].x >= pointX : item.points[0].x < pointX;
+                    if (flag) {
+                        if (item.type == '03') {
+                            const switchModel = this.$store.getters['map/getDeviceByCode'](item.relSwitchCode);
+                            models.push(deepAssign(switchModel, { _dispose: true }));
+                        }
+                        models.push(deepAssign(item, { _dispose: true }));
+                    }
+                }
+            });
+            map.lineList.forEach(item => {
+                const flag = this.fromModel.right ? item.points[0].x >= pointX : item.points[0].x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            map.trainWindowList.forEach(item => {
+                const flag = this.fromModel.right ? item.point.x > pointX : item.point.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            map.powerLineList.forEach(item => {
+                const flag = this.fromModel.right ? item.points[0].x >= pointX : item.points[0].x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            map.signalList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            map.stationList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            map.stationStandList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                    const esp = map.espList.find(ele => ele.standCode == item.code);
+                    models.push(deepAssign(esp, { _dispose: true }));
+                }
+            });
+            map.psdList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            map.textList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            if (this.fromModel.right && section.rightSectionCode) {
+                section.rightSectionCode = '';
+            }
+            if (!this.fromModel.right && section.leftSectionCode) {
+                section.leftSectionCode = '';
+            }
+            models.push(deepAssign(section, { _type: 'Section' }));
+            this.$emit('updateMapModel', models);
+            console.log(models, '批量删除');
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index f328fd171..78ae6f1c2 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -465,6 +465,9 @@ export default {
                 } else if (this.field.toUpperCase() === 'sectionRoadCode'.toUpperCase()) {
                     this.$refs.batchSettings.roadModel.sectionCode = selected.code;
                     this.activeName = 'five';
+                } else if (this.field.toUpperCase() === 'sectiondeleteCode'.toUpperCase()) {
+                    this.$refs.batchSettings.fromModel.sectionCode = selected.code;
+                    this.activeName = 'five';
                 }
             }
         },
diff --git a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
index 903aaa198..4ed37c12d 100644
--- a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Signal"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -424,6 +425,9 @@ export default {
             this.field = field == this.field ? '' : field;
             this.signalSectionCode(this.field);
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         deviceChange(code) {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
@@ -472,8 +476,8 @@ export default {
             }
         },
         updateMapModel(data) {
-			this.$emit('updateMapModel', data);
-			this.field = '';
+            this.$emit('updateMapModel', data);
+            this.field = '';
         },
         signalSectionCode(field) {
             this.field = field;
diff --git a/src/views/newMap/newMapdraft/mapoperate/splitStation.vue b/src/views/newMap/newMapdraft/mapoperate/splitStation.vue
index 44ad8380e..661fd2bc7 100644
--- a/src/views/newMap/newMapdraft/mapoperate/splitStation.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/splitStation.vue
@@ -8,6 +8,7 @@
         :rules="createRules"
         :type="editModel.type"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -142,6 +143,9 @@ export default {
                 this.editModel.type = selected._type;
             }
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         // 创建对象
         create() {
             const uid = getUID(this.addModel.type, this.splitStationList); // 根据类型写 uid 前缀命名
@@ -162,8 +166,8 @@ export default {
             this.$refs.createForm.resetForm();
         },
         updateMapModel(data) {
-			this.$emit('updateMapModel', data);
-			this.field = '';
+            this.$emit('updateMapModel', data);
+            this.field = '';
         },
         deleteObj() {
             this.$refs.dataform.deleteObj();
diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue
index ef3d2fc61..27b30f1e7 100644
--- a/src/views/newMap/newMapdraft/mapoperate/station.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/station.vue
@@ -419,8 +419,9 @@ export default {
                     const list = this.changeChargeStation(this.editModel.chargeStationCodeList);
                     const centralizedList = this.changeCentralized(this.editModel.centralized);
                     const models = [this.editModel, ...list, ...centralizedList];
-					this.$emit('updateMapModel', models);
-					this.field = '';
+                    this.$emit('updateMapModel', models);
+                    this.field = '';
+                    this.$emit('deviceSelect', '');
                 }
             });
         },
diff --git a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
index c5cbd997f..9635891f3 100644
--- a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="StationStand"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -289,6 +290,9 @@ export default {
                 this.$emit('deviceSelect', '');
             }
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         changeStation(station) {
             this.editModel.deviceStationCode = this.getDeviceStationCode(station);
         },
@@ -416,12 +420,12 @@ export default {
                         models.push(deepAssign(item, { _dispose: true }));
                     }
                 });
-				this.$emit('updateMapModel', models);
-				this.field = '';
+                this.$emit('updateMapModel', models);
+                this.field = '';
             } else {
                 // 用于更新
-				this.$emit('updateMapModel', selected);
-				this.field = '';
+                this.$emit('updateMapModel', selected);
+                this.field = '';
             }
         },
         deleteObj() {
diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/index.vue b/src/views/newMap/newMapdraft/mapoperate/switch/index.vue
index b9c67254a..43b90820f 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-tabs v-model="activeName" class="card">
     <el-tab-pane class="view-control" :label="$t('map.property')" name="first" :lazy="lazy">
-      <switch-model ref="switchModel" v-on="$listeners" @setCenter="setCenter" @clrField="field=''"/>
+      <switch-model ref="switchModel" v-on="$listeners" @setCenter="setCenter" @clrField="field=''" />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
       <create-switch ref="createSwitch" v-on="$listeners" />
diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue b/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue
index cf5d95285..293f8c42a 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue
@@ -124,15 +124,15 @@ export default {
             this.editModel = deepAssign(this.editModel, data);
         },
         updateMapModel(data) {
-			this.$emit('updateMapModel', data);
-			this.$emit('clrField');
+            this.$emit('updateMapModel', data);
+            this.$emit('clrField');
         },
         deleteObj() {
             this.$refs.dataform.deleteObj();
         },
         // 修改对象
         edit() {
-			this.$refs.dataform.edit();
+            this.$refs.dataform.edit();
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/mapoperate/text.vue b/src/views/newMap/newMapdraft/mapoperate/text.vue
index 3958d4583..d3314afcc 100644
--- a/src/views/newMap/newMapdraft/mapoperate/text.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/text.vue
@@ -8,6 +8,7 @@
         :rules="rules"
         type="Text"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
@@ -170,6 +171,9 @@ export default {
                 [this.editModel.prepend, this.editModel.content] = selected.content.split('::');
             }
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         create() {
             const model = {
                 _type: 'Text',
diff --git a/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue b/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
index f31f7ab57..2de4f2c58 100644
--- a/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
@@ -17,6 +17,7 @@
         :rules="rules"
         type="TrainWindow"
         @updateMapModel="updateMapModel"
+        @clearDeviceSelect="clearDeviceSelect"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.batchOperation')" name="second" :lazy="lazy">
@@ -202,6 +203,9 @@ export default {
         hover(field) {
             this.field = field == this.field ? '' : field;
         },
+        clearDeviceSelect() {
+            this.$emit('deviceSelect', '');
+        },
         deviceSelect(selected) {
             this.$refs.form && this.$refs.form.resetFields();
             if (selected && selected._type.toUpperCase() === 'TrainWindow'.toUpperCase()) {
@@ -354,12 +358,12 @@ export default {
                     }
                 });
                 models.push(deepAssign(selected, { _dispose: true }));
-				this.$emit('updateMapModel', models);
-				this.field = '';
+                this.$emit('updateMapModel', models);
+                this.field = '';
             } else {
                 // 用于更新
-				this.$emit('updateMapModel', selected);
-				this.field = '';
+                this.$emit('updateMapModel', selected);
+                this.field = '';
             }
         },
         editTrainWindow() {
diff --git a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
index 38c52b405..0bf3f5b50 100644
--- a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
@@ -218,6 +218,7 @@ export default {
                         models = [...models, ...arr];
                     });
                     this.$emit('updateMapModel', models);
+                    this.$emit('deviceSelect', '');
                 }
             });
         },

From 6b53bc55d6763d7ff45e91df91eef4d7caa6d15e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 7 Dec 2020 16:10:03 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8C=BA=E6=AE=B5=E5=85=B3=E8=81=94=E8=BD=A6=E6=AC=A1=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Station/index.js            |  6 +++---
 .../mapoperate/section/batchSettings.vue      |  2 --
 .../newMapdraft/mapoperate/section/index.vue  |  8 ++++++++
 .../newMapdraft/mapoperate/splitScreen.vue    | 20 ++++++++++---------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index 13ca73a0d..53dc65d24 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -13,7 +13,7 @@ import Text from 'zrender/src/graphic/Text';
 import store from '@/store/index_APP_TARGET';
 
 import EStationText from './EStationText';
-import {traverseLineElements, traverseStatusElements} from '../utils/ShapeStatusCovert';
+import { traverseLineElements } from '../utils/ShapeStatusCovert';
 
 import Vue from 'vue';
 
@@ -39,9 +39,9 @@ export default class Station extends Group {
         const model = this.model;
         const style = this.style;
 
-        // // 站台所有的绘图元素
+        // 站台所有的绘图元素
         const elementTypeList = {
-            'stationText':EStationText // 车站名称   （普通站台样式）
+            'stationText': EStationText // 车站名称   （普通站台样式）
         };
 
         // 遍历当前线路下的绘图元素 组合模式
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
index e6f8716f5..f08e1a06a 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
@@ -361,7 +361,6 @@ export default {
             const pointX = section.points[index].x;
             const map = this.$store.state.map.map;
             const models = [];
-            console.log(this.$store.state.map.map);
             map.sectionList.forEach(item => {
                 if (item.type == '04') {
                     const flag = this.fromModel.right ? item.namePosition.x >= pointX : item.namePosition.x < pointX;
@@ -437,7 +436,6 @@ export default {
             }
             models.push(deepAssign(section, { _type: 'Section' }));
             this.$emit('updateMapModel', models);
-            console.log(models, '批量删除');
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index 78ae6f1c2..1c48a5d8a 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -680,7 +680,15 @@ export default {
                     const trainWindowModel = this.$store.getters['map/getDeviceByCode'](selected.trainWindowCode);
                     trainWindowModel && models.push(deepAssign(trainWindowModel, { _dispose: true }));
                     const deleteObjAssociatedSection = this.handleDeleteSectionAssociatedSection(selected);
+                    if (selected.type == '01') {
+                        selected.logicSectionCodeList && selected.logicSectionCodeList.forEach(code => {
+                            const selectedLocl = this.$store.getters['map/getDeviceByCode'](code);
+                            const trainWindowModel = this.$store.getters['map/getDeviceByCode'](selectedLocl.trainWindowCode);
+                            trainWindowModel && models.push(deepAssign(trainWindowModel, { _dispose: true }));
+                        });
+                    }
                     models = [...models, ...deleteObjAssociatedSection];
+                    // console.log(models, '=====');
                     this.$emit('updateMapModel', models);
                     this.clear();
                 }).catch(error => {
diff --git a/src/views/newMap/newMapdraft/mapoperate/splitScreen.vue b/src/views/newMap/newMapdraft/mapoperate/splitScreen.vue
index 31e0b80d7..ceb38b4c3 100644
--- a/src/views/newMap/newMapdraft/mapoperate/splitScreen.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/splitScreen.vue
@@ -161,13 +161,15 @@ export default {
             if (data.bigScreenSplitConfig) {
                 data.bigScreenSplitConfig.forEach(item => {
                     const section = this.$store.getters['map/getDeviceByCode'](item.sectionCode);
-                    const param = {
-                        position: String(section.points[section.points.length - 1].x),
-                        name: `${section.name}(${section.code})`,
-                        offsetTop: 0,
-                        sectionCode: section.code
-                    };
-                    this.tableData.push(param);
+                    if (section) {
+                        const param = {
+                            position: String(section.points[section.points.length - 1].x),
+                            name: `${section.name}(${section.code})`,
+                            offsetTop: 0,
+                            sectionCode: section.code
+                        };
+                        this.tableData.push(param);
+                    }
                 });
 
                 this.tableData.sort((a, b) => Number(a.position) - Number(b.position)); // 数组排序
@@ -270,8 +272,8 @@ export default {
         clear() {
             this.$refs.hostileForm.resetFields();
             this.addModel.sectionCode = '';
-			this.index = '';
-			this.field = '';
+            this.index = '';
+            this.field = '';
         },
         generateOverlab() { // 生成
             if (!this.addModel.sectionCode) {

From 84d140b63908ebcb05aac3b882210b13dfe30d28 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 7 Dec 2020 16:34:57 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BD=A6=E7=AB=99?=
 =?UTF-8?q?=E7=BB=98=E5=88=B6=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Station/EStationText.js | 3 +--
 src/jmapNew/shape/Station/index.js        | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/shape/Station/EStationText.js b/src/jmapNew/shape/Station/EStationText.js
index f90c552d3..9e9e7fc0c 100644
--- a/src/jmapNew/shape/Station/EStationText.js
+++ b/src/jmapNew/shape/Station/EStationText.js
@@ -11,7 +11,6 @@ class EStationText extends Group {
     create() {
         const model = this.model.modelData;
         const style = this.model.style;
-
         //  车站名称
         this.stationName = new Text({
             zlevel: this.model.zlevel,
@@ -32,7 +31,7 @@ class EStationText extends Group {
                 textBorderWidth:style.Station.stationText.textBorderWidth
             }
         });
-        this.add(this.stationName);
+        model.visible && this.add(this.stationName);
         if (model.subheadDisplay) { // 副标题
             this.subheadText = new Text({
                 zlevel: this.model.zlevel,
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index 53dc65d24..a2c6b1abb 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -74,7 +74,7 @@ export default class Station extends Group {
                 textFill: model.kmPostFontColor
             });
             this.add(this.mileageText);
-            model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
+            model.visible && model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
         }
 
         // if (!model.visible) { // 隐藏车站
@@ -466,7 +466,7 @@ export default class Station extends Group {
                 item.show();
             });
             if (this.mileageText) {
-                this.model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
+                this.model.visible && this.model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
             }
             this.isShowShape = true;
             this.setState(this.model);

From d973dbc46e486a05d2567304ae557c64942f2799 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Mon, 7 Dec 2020 17:14:06 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=95=8C=E9=9D=A2=E9=9A=90=E8=97=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/jl3ddevice/jl3ddeviceNew.js       | 28 +++++--------------
 .../jl3dtrafficplan/connect/trainconnect.js   |  4 +++
 src/views/jlmap3d/device/jl3ddevice.vue       |  4 +--
 src/views/newMap/displayNew/demonMenu.vue     | 11 ++++++--
 src/views/newMap/jointTrainingNew/index.vue   | 14 ++++++++--
 5 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
index e49ebd793..00a38b578 100644
--- a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
+++ b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
@@ -206,29 +206,15 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 			});
 		}
 	}
+	let changeelement = document.getElementById('jl3d');
+	window.addEventListener('resize', () =>
+	onresize()
+	, false)
+	let onresize = function () {
 
-	window.onresize = function () {
-
-		// if(scope.windowstatus){
-		// 	changeelement.style.width = '50%';
-		// 	changeelement.style.height = '50%';
-		// 	changeelement.style.top = '25%';
-		// 	scope.windowstatus = false;
-		// 	scope.updatewindowstatus('0');
-		// }else{
-		scope.camera.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
+		scope.camera.aspect = changeelement.offsetWidth / changeelement.offsetHeight;
 		scope.camera.updateProjectionMatrix();
-		scope.renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-
-		if(scope.windowstatus == "0"){
-			let changeelement = document.getElementById('jl3d');
-			changeelement.style.width = '100%';
-			changeelement.style.height = '100%';
-			changeelement.style.top = '0';
-			scope.camera.aspect = window.innerWidth / scope.dom.offsetHeight;
-			scope.camera.updateProjectionMatrix();
-			scope.renderer.setSize(window.innerWidth, scope.dom.offsetHeight);
-		}
+		scope.renderer.setSize(changeelement.offsetWidth, changeelement.offsetHeight);
 
 	}
 
diff --git a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
index cdfbf9ada..8e9dbd4bf 100644
--- a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
+++ b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
@@ -73,6 +73,10 @@ export function TrainConnect(trafficTrain,deviceaction,toptrain,routegroup,passe
 			// 	jl3d.updateNowLeaveData("down",data.body.out);
 			// }
 		}
+
+		if(data.type == "TRAIN_PIS"){
+			console.log(data);
+		}
 		if(data.type == "TRAIN_PFI_NUM"){
 
 			trafficTrain.trainList = [];
diff --git a/src/views/jlmap3d/device/jl3ddevice.vue b/src/views/jlmap3d/device/jl3ddevice.vue
index e5d1a49fb..5faac32d5 100644
--- a/src/views/jlmap3d/device/jl3ddevice.vue
+++ b/src/views/jlmap3d/device/jl3ddevice.vue
@@ -4,7 +4,7 @@
 			</Jl3ddevice-Msg>
 			<Jl3ddevice-List v-show="isswitch" :devicelist="devicelist"  @sdevice="sdevice">
 			</Jl3ddevice-List>
-			<canvas id="canvastexture" />
+			<canvas id="canvastexture" ></canvas>
 			<div class="jl3dcontrolpane" v-show="isswitch">
 				<el-button-group>
 					<el-button type="primary" @click="back">初始化</el-button>
@@ -16,7 +16,7 @@
 
 			<div id="jl3dwindow" v-show="isPsd" class="windowbutton"
 			:style="{'background-image': 'url('+localStatic+'/texture/fk.png)'}"
-			@click="windowchange"></div
+			@click="windowchange"></div>
 
 			<div id="jl3dclose" v-show="isPsd" class="backbutton"
 			:style="{'background-image': 'url('+localStatic+'/texture/xx.png)'}"
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index fdde2916e..e53a033ca 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -28,7 +28,8 @@
       </el-button-group>
     </div>
     <Jl3d-Device
-      v-if="deviceShow"
+      v-if="deviceif"
+      v-show="deviceShow"
       ref="Jl3dDevice"
       :panel-show="deviceShow"
       @closedevice3dview="jumpjlmap3dmodel"
@@ -113,7 +114,8 @@ export default {
             mapId:'',
             lineCode:'',
             practiceDisabled:false,
-            deviceShow: false,
+            deviceif:false,
+            deviceShow: true,
             drivingShow: false,
             jl3dtrafficplan:this.$t('display.demon.trafficplantext'),
             jl3dtraffictrain:this.$t('display.demon.traffictraintext'),
@@ -159,11 +161,16 @@ export default {
             }
         },
         jumpjlmap3dmodel() {
+          if(this.deviceif == false){
+            this.deviceif = true;
+          }else{
             if (this.deviceShow == false) {
                 this.deviceShow = true;
             } else {
                 this.deviceShow = false;
             }
+          }
+
         },
         showdriving() {
             this.drivingShow = false;
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index c4a44c3d2..f47a0603f 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -50,7 +50,8 @@
       <members-manage ref="membersManage" :is-admin="isAdmin" @addSimulationMember="addSimulationMember" /> <!-- 成员管理 -->
       <add-member ref="addMember" />
       <Jl3d-Device
-        v-if="deviceShow"
+        v-if="deviceif"
+        v-show="deviceShow"
         ref="Jl3dDevice"
         :panel-show="deviceShow"
         @closedevice3dview="devicemodel"
@@ -124,7 +125,8 @@ export default {
             mapViewLoadedOver: false,
             dataError: false,
             isAdmin: false,
-            deviceShow: false,
+            deviceif:false,
+            deviceShow: true,
             centralizedStationMap: {}
         };
     },
@@ -175,7 +177,8 @@ export default {
             this.showSelectStation && this.setShowStation(this.showStation);
             // this.initMemberUserInfo();
             if (this.$route.query.type === 'VR_PSD') {
-                this.deviceShow = true;
+                this.deviceif = true;
+                this.deviceShow = false;
             }
             if (this.$route.query.type === 'DRIVE') {
                 this.$store.dispatch('training/setPrdType', '04');
@@ -292,11 +295,16 @@ export default {
         //     });
         // },
         devicemodel() {
+          if(this.deviceif == false){
+            this.deviceif = true;
+          }else{
             if (this.deviceShow == false) {
                 this.deviceShow = true;
             } else {
                 this.deviceShow = false;
             }
+          }
+
         },
         /* 地图根据仿真group获取仿真基础信息 */
         async loadSimulationInfo() {

From b0234db4a239f2e1b16298d7b3dce897a3fdd1d7 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 7 Dec 2020 18:00:26 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=81=93=E5=B2=94?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/mapoperate/switch/create.vue  | 109 ++++++++----------
 1 file changed, 51 insertions(+), 58 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
index 981fa9e6d..c5f8bde37 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
@@ -25,9 +25,6 @@ export default {
             const createArr = []; // 创建model列表
             const changeSectionList = this.changeSectionAttr();
             changeSectionList.forEach(section => {
-                // if (section.code == 'T449' || section.code == 'T501' || section.code == 'T502') {
-                //     debugger;
-                // }
                 if (!section.rightSectionCode) { // 右侧关联关系为空 且 道岔区段
                     const list = this.findSectionA(section.points[section.points.length - 1].x, section.points[section.points.length - 1].y);
                     let sectionB = {};
@@ -161,53 +158,58 @@ export default {
         changeSectionAttr() {
             const changeSectionList = []; // 改变的区段列表
             this.sectionList.forEach(section => {
-                const oneSection = section.points[section.points.length - 1];
-                const oneSectionStar = section.points[0];
-                let countA = 0;
-                let countB = 0;
-                this.sectionList.forEach(elem => {
-                    const twoSection = elem.points[0];
-                    const twoSectionEnd = elem.points[elem.points.length - 1];
-                    if (oneSection.x == twoSection.x && oneSection.y == twoSection.y) {
-                        countA++;
-                        if (countA >= 2) {
-                            if (!this.checkAddListA(oneSection, section.code)) { // 右侧关系清空
-                                const sectionModel = deepAssign({}, section);
-                                sectionModel.rightSectionCode = '';
-                                sectionModel.sepTypeRight = '00'; // 分隔符
-                                sectionModel.type = '03';
-                                const list = this.findSectionA(sectionModel.points[sectionModel.points.length - 1].x, sectionModel.points[sectionModel.points.length - 1].y);
-                                list.forEach(elem => {
-                                    const sectionModel = deepAssign({}, elem);
-                                    sectionModel.leftSectionCode = '';
-                                    sectionModel.sepTypeLeft = '00';
-                                    sectionModel.type = '03';
-                                    changeSectionList.push(sectionModel);
-                                });
-                                changeSectionList.push(sectionModel);
+                if (section.type == '01') {
+                    const oneSection = section.points[section.points.length - 1];
+                    const oneSectionStar = section.points[0];
+                    let countA = 0;
+                    let countB = 0;
+                    console.log(changeSectionList);
+                    this.sectionList.forEach(elem => {
+                        if (elem.type == '01') {
+                            const twoSection = elem.points[0];
+                            const twoSectionEnd = elem.points[elem.points.length - 1];
+                            if (oneSection.x == twoSection.x && oneSection.y == twoSection.y) {
+                                countA++;
+                                if (countA >= 2) {
+                                    if (!this.checkAddListA(oneSection, section.code)) { // 右侧关系清空
+                                        const sectionModel = deepAssign({}, section);
+                                        sectionModel.rightSectionCode = '';
+                                        sectionModel.sepTypeRight = '00'; // 分隔符
+                                        sectionModel.type = '03';
+                                        const list = this.findSectionA(sectionModel.points[sectionModel.points.length - 1].x, sectionModel.points[sectionModel.points.length - 1].y);
+                                        list.forEach(elem => {
+                                            const sectionModelElem = deepAssign({}, elem);
+                                            sectionModelElem.leftSectionCode = '';
+                                            sectionModelElem.sepTypeLeft = '00';
+                                            sectionModelElem.type = '03';
+                                            changeSectionList.push(sectionModelElem);
+                                        });
+                                        changeSectionList.push(sectionModel);
+                                    }
+                                }
+                            } else if (oneSectionStar.x == twoSectionEnd.x && oneSectionStar.y == twoSectionEnd.y) {
+                                countB++;
+                                if (countB >= 2) {
+                                    if (!this.checkAddListB(oneSectionStar, section.code)) { // 左侧关系清空
+                                        const sectionModel = deepAssign({}, section);
+                                        sectionModel.leftSectionCode = '';
+                                        sectionModel.sepTypeLeft = '00';
+                                        sectionModel.type = '03';
+                                        const list = this.findSectionB(sectionModel.points[0].x, sectionModel.points[0].y);
+                                        list.forEach(elem => {
+                                            const sectionModelElem = deepAssign({}, elem);
+                                            sectionModelElem.rightSectionCode = '';
+                                            sectionModelElem.sepTypeRight = '00'; // 分隔符
+                                            sectionModelElem.type = '03';
+                                            changeSectionList.push(sectionModelElem);
+                                        });
+                                        changeSectionList.push(sectionModel);
+                                    }
+                                }
                             }
                         }
-                    } else if (oneSectionStar.x == twoSectionEnd.x && oneSectionStar.y == twoSectionEnd.y) {
-                        countB++;
-                        if (countB >= 2) {
-                            if (!this.checkAddListB(oneSectionStar, section.code)) { // 左侧关系清空
-                                const sectionModel = deepAssign({}, section);
-                                sectionModel.leftSectionCode = '';
-                                sectionModel.sepTypeLeft = '00';
-                                sectionModel.type = '03';
-                                const list = this.findSectionB(sectionModel.points[0].x, sectionModel.points[0].y);
-                                list.forEach(elem => {
-                                    const sectionModel = deepAssign({}, elem);
-                                    sectionModel.rightSectionCode = '';
-                                    sectionModel.sepTypeRight = '00'; // 分隔符
-                                    sectionModel.type = '03';
-                                    changeSectionList.push(sectionModel);
-                                });
-                                changeSectionList.push(sectionModel);
-                            }
-                        }
-                    }
-                });
+                    });
+                }
             });
             return changeSectionList;
         },
@@ -249,7 +251,6 @@ export default {
                     const sectionb = this.findSectionData(sectionLists, elem.sectionBCode);
                     const sectiona = this.findSectionData(sectionLists, elem.sectionACode);
                     const sectionc = this.findSectionData(sectionLists, elem.sectionCCode);
-                    // const parentSectionModel = this.$store.getters['map/getDeviceByCode'](sectiona.parentCode);
                     // if (!parentSectionModel) { // 找不到父元素删除
                     if (switchSectionList.indexOf(elem.code) == -1) {
                         let uid;
@@ -268,7 +269,7 @@ export default {
                             const sectiona1 = this.findSectionData(sectionLists, ele.sectionACode);
                             const sectionc1 = this.findSectionData(sectionLists, ele.sectionCCode);
                             const sectionb1 = this.findSectionData(sectionLists, ele.sectionBCode);
-                            if (sectionb1.points[sectionb1.points.length - 1].x == sectionb.points[0].x && sectionb1.points[sectionb1.points.length - 1].y == sectionb.points[0].y) {
+                            if (sectiona1 && sectionc1 && sectionb1 && sectionb1.points[sectionb1.points.length - 1].x == sectionb.points[0].x && sectionb1.points[sectionb1.points.length - 1].y == sectionb.points[0].y) {
                                 ele['uid'] = uid;
                                 elem['relevanceSectionList'] = [elem.sectionACode, elem.sectionBCode, elem.sectionCCode, ele.sectionACode, ele.sectionBCode, ele.sectionCCode];
                                 sectiona1.parentCode = uid;
@@ -283,12 +284,6 @@ export default {
                             }
                         });
                     }
-                    // } else {
-                    //     parentSectionModel.relevanceSectionList.push(elem.sectionACode);
-                    //     parentSectionModel.relevanceSectionList.push(elem.sectionBCode);
-                    //     parentSectionModel.relevanceSectionList.push(elem.sectionCCode);
-                    //     models.push(parentSectionModel);
-                    // }
                     sectiona.relSwitchCode = elem.code;
                     sectionb.relSwitchCode = elem.code;
                     sectionc.relSwitchCode = elem.code;
@@ -298,8 +293,6 @@ export default {
                     sectiona.switchSection = true;
                     sectionb.switchSection = true;
                     sectionc.switchSection = true;
-                    // sectionb.sepTypeLeft = '00';
-                    // sectionb.sepTypeRight = '00';
                     models.push(sectiona);
                     models.push(sectionb);
                     models.push(sectionc);

From ed93c3159e8ba6deca3f32f987463914a1e7fa77 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 7 Dec 2020 18:19:31 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=83=E7=B4=A0?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapoperate/section/batchSettings.vue      | 69 +++++++++++++++++--
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
index f08e1a06a..0df375285 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
@@ -372,25 +372,25 @@ export default {
                     if (flag) {
                         if (item.type == '03') {
                             const switchModel = this.$store.getters['map/getDeviceByCode'](item.relSwitchCode);
-                            models.push(deepAssign(switchModel, { _dispose: true }));
+                            switchModel && models.push(deepAssign(switchModel, { _dispose: true }));
                         }
                         models.push(deepAssign(item, { _dispose: true }));
                     }
                 }
             });
-            map.lineList.forEach(item => {
+            map.lineList && map.lineList.forEach(item => {
                 const flag = this.fromModel.right ? item.points[0].x >= pointX : item.points[0].x < pointX;
                 if (flag) {
                     models.push(deepAssign(item, { _dispose: true }));
                 }
             });
-            map.trainWindowList.forEach(item => {
+            map.trainWindowList && map.trainWindowList.forEach(item => {
                 const flag = this.fromModel.right ? item.point.x > pointX : item.point.x < pointX;
                 if (flag) {
                     models.push(deepAssign(item, { _dispose: true }));
                 }
             });
-            map.powerLineList.forEach(item => {
+            map.powerLineList && map.powerLineList.forEach(item => {
                 const flag = this.fromModel.right ? item.points[0].x >= pointX : item.points[0].x < pointX;
                 if (flag) {
                     models.push(deepAssign(item, { _dispose: true }));
@@ -413,16 +413,71 @@ export default {
                 if (flag) {
                     models.push(deepAssign(item, { _dispose: true }));
                     const esp = map.espList.find(ele => ele.standCode == item.code);
-                    models.push(deepAssign(esp, { _dispose: true }));
+                    esp && models.push(deepAssign(esp, { _dispose: true }));
                 }
             });
-            map.psdList.forEach(item => {
+            map.psdList && map.psdList.forEach(item => {
                 const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
                 if (flag) {
                     models.push(deepAssign(item, { _dispose: true }));
                 }
             });
-            map.textList.forEach(item => {
+            // 计轴复位列表
+            map.axleCounterResetButtonList && map.axleCounterResetButtonList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            // GQX折返：变通
+            map.tbStrategyList && map.tbStrategyList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            map.zcList && map.zcList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            // 折返按钮列表
+            map.cycleButtonList && map.cycleButtonList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            // 引导总锁列表
+            map.totalGuideLockButtonVOList && map.totalGuideLockButtonVOList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            // 自动进路
+            map.automaticRouteButtonList && map.automaticRouteButtonList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            // 矩形框
+            map.outerFrameList && map.outerFrameList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            // 方向杆列表
+            map.directionRodList && map.directionRodList.forEach(item => {
+                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                if (flag) {
+                    models.push(deepAssign(item, { _dispose: true }));
+                }
+            });
+            map.textList && map.textList.forEach(item => {
                 const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
                 if (flag) {
                     models.push(deepAssign(item, { _dispose: true }));

From 4362eef88b03d530cb534be2e1521d220fb60d95 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 7 Dec 2020 18:36:53 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapoperate/section/batchSettings.vue      | 191 ++++++++++--------
 .../newMapdraft/mapoperate/section/index.vue  |   7 +-
 2 files changed, 109 insertions(+), 89 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
index 0df375285..a692ff394 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
@@ -374,6 +374,16 @@ export default {
                             const switchModel = this.$store.getters['map/getDeviceByCode'](item.relSwitchCode);
                             switchModel && models.push(deepAssign(switchModel, { _dispose: true }));
                         }
+                        if (item.type == '02') {
+                            const parentModel = this.$store.getters['map/getDeviceByCode'](item.parentCode);
+                            parentModel && models.push(deepAssign(parentModel, { _dispose: true }));
+                        }
+                        if (item.type == '01') {
+                            item.logicSectionCodeList && item.logicSectionCodeList.forEach(code => {
+                                const childModel = this.$store.getters['map/getDeviceByCode'](code);
+                                childModel && models.push(deepAssign(childModel, { _dispose: true }));
+                            });
+                        }
                         models.push(deepAssign(item, { _dispose: true }));
                     }
                 }
@@ -396,93 +406,102 @@ export default {
                     models.push(deepAssign(item, { _dispose: true }));
                 }
             });
-            map.signalList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            map.stationList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            map.stationStandList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                    const esp = map.espList.find(ele => ele.standCode == item.code);
-                    esp && models.push(deepAssign(esp, { _dispose: true }));
-                }
-            });
-            map.psdList && map.psdList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            // 计轴复位列表
-            map.axleCounterResetButtonList && map.axleCounterResetButtonList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            // GQX折返：变通
-            map.tbStrategyList && map.tbStrategyList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            map.zcList && map.zcList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            // 折返按钮列表
-            map.cycleButtonList && map.cycleButtonList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            // 引导总锁列表
-            map.totalGuideLockButtonVOList && map.totalGuideLockButtonVOList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            // 自动进路
-            map.automaticRouteButtonList && map.automaticRouteButtonList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            // 矩形框
-            map.outerFrameList && map.outerFrameList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            // 方向杆列表
-            map.directionRodList && map.directionRodList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
-            });
-            map.textList && map.textList.forEach(item => {
-                const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
-                if (flag) {
-                    models.push(deepAssign(item, { _dispose: true }));
-                }
+            const arrList = ['signalList', 'stationList', 'stationStandList', 'psdList', 'axleCounterResetButtonList', 'tbStrategyList', 'zcList', 'cycleButtonList', 'totalGuideLockButtonVOList', 'automaticRouteButtonList', 'outerFrameList', 'directionRodList', 'textList'];
+            arrList.forEach(itemName => {
+                map[itemName] && map[itemName].forEach(item => {
+                    const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+                    if (flag) {
+                        models.push(deepAssign(item, { _dispose: true }));
+                    }
+                });
             });
+            // map.signalList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // map.stationList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // map.stationStandList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //         const esp = map.espList.find(ele => ele.standCode == item.code);
+            //         esp && models.push(deepAssign(esp, { _dispose: true }));
+            //     }
+            // });
+            // map.psdList && map.psdList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // // 计轴复位列表
+            // map.axleCounterResetButtonList && map.axleCounterResetButtonList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // // GQX折返：变通
+            // map.tbStrategyList && map.tbStrategyList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // map.zcList && map.zcList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // // 折返按钮列表
+            // map.cycleButtonList && map.cycleButtonList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // // 引导总锁列表
+            // map.totalGuideLockButtonVOList && map.totalGuideLockButtonVOList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // // 自动进路
+            // map.automaticRouteButtonList && map.automaticRouteButtonList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // // 矩形框
+            // map.outerFrameList && map.outerFrameList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // // 方向杆列表
+            // map.directionRodList && map.directionRodList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
+            // map.textList && map.textList.forEach(item => {
+            //     const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+            //     if (flag) {
+            //         models.push(deepAssign(item, { _dispose: true }));
+            //     }
+            // });
             if (this.fromModel.right && section.rightSectionCode) {
                 section.rightSectionCode = '';
             }
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index 1c48a5d8a..fa47a6fcc 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -683,12 +683,13 @@ export default {
                     if (selected.type == '01') {
                         selected.logicSectionCodeList && selected.logicSectionCodeList.forEach(code => {
                             const selectedLocl = this.$store.getters['map/getDeviceByCode'](code);
-                            const trainWindowModel = this.$store.getters['map/getDeviceByCode'](selectedLocl.trainWindowCode);
-                            trainWindowModel && models.push(deepAssign(trainWindowModel, { _dispose: true }));
+                            if (selectedLocl) {
+                                const trainWindowModel = this.$store.getters['map/getDeviceByCode'](selectedLocl.trainWindowCode);
+                                trainWindowModel && models.push(deepAssign(trainWindowModel, { _dispose: true }));
+                            }
                         });
                     }
                     models = [...models, ...deleteObjAssociatedSection];
-                    // console.log(models, '=====');
                     this.$emit('updateMapModel', models);
                     this.clear();
                 }).catch(error => {