项目登录仿真里的返回按钮点击无效&prdType转换

src/jmapNew/shape/graph/Psd/EHorizontal2Door.js

@@ -84,7 +84,7 @@ class EHorizontal2Door extends Group {
                 this.stand2.setStyle('fill', style.Psd.horizontal2Door.defaultColor);
             }
         }
-        if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
             this.stand1.setStyle('fill', '#7F7F7F');
             this.stand2.setStyle('fill', '#7F7F7F');
         }

src/jmapNew/shape/graph/Psd/ERectDoor.js

@@ -51,7 +51,7 @@ class ERect2Door extends Group {
                 this.psd.setStyle('fill', style.Psd.rectDoor.defaultColor);
             }
         }
-        if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
             this.psd.setStyle('fill', '#7F7F7F');
         }
     }

src/jmapNew/shape/graph/Section/index.js

@@ -578,7 +578,7 @@ export default class Section extends Group {
             // 区段延时解锁
             model.remain > 0 && this.delayUnlock();
             // 设置灰显
-            if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+            if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
                 this.setAshShow();
             }
             // 设置脱轨器

src/jmapNew/shape/graph/Signal/index.js

@@ -1210,7 +1210,7 @@ class Signal extends Group {
             }
             this.model.virtual && this.sigBack && this.sigBack.show();
             // 设置灰显
-            if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+            if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
                 this.setAshShow();
             }
 
@@ -1218,7 +1218,7 @@ class Signal extends Group {
             if (this.style.Signal.text.conflictColor && model.checkConflict) {
                 this.sigName.setColor(this.style.Signal.text.conflictColor);
             }
-            if (store.state.training.prdType === '01') {
+            if (store.state.map.picture === 'localWork') {
                 this.lowButton && this.lowButton.show();
             }
         }

src/jmapNew/shape/graph/StationStand/ETrainSetButton.js

@@ -55,7 +55,7 @@ class ETrainSetButton extends Group {
     }
 
     setState(model) {
-        if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
             this.setColor('#7F7F7F');
         }
     }

src/jmapNew/shape/graph/StationStand/index.js

@@ -159,7 +159,7 @@ class StationStand extends Group {
         this.downDetainLamp && this.downDetainLamp.hide();
     }
     setScreenDoorOpenStatus(model) {
-        if (!this.model.noStatus && !(this.model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (!this.model.noStatus && !(this.model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
             this.gapStand && this.gapStand.setState(model);
         }
     }
@@ -183,7 +183,7 @@ class StationStand extends Group {
             currentTypeList.forEach(element => {
                 this[element].setState(model);
             });
-            if (store.state.training.prdType === '01') {
+            if (store.state.map.picture === 'localWork') {
                 this.stopJumpLamp && this.stopJumpLamp.show();
                 this.cancelStopJumpLamp && this.cancelStopJumpLamp.show();
                 this.upDetainLamp && this.upDetainLamp.show();

src/jmapNew/shape/graph/StationStand/safeStand/EGapStand.js

@@ -110,7 +110,7 @@ class EGapStand extends Group {
                 this.setClose();
             }
         }
-        if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (model.noStatus || (model.atsNoStatus && store.state.map.picture === '02')) {
             this.setColor('#7F7F7F');
         }
     }

src/jmapNew/shape/graph/Switch/index.js

@@ -877,7 +877,7 @@ export default class Switch extends Group {
                 const sectionC = this.mapDevice[switchModel.sectionCCode];
                 sectionC && sectionC.instance && sectionC.instance.handleSwitchSection(sectionC);
             }
-            if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+            if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
                 this.setAshShow();
             }
             !model.auto && this.artificialArc && this.artificialArc.show();

src/jmapNew/shape/graph/TrainWindow/EMouse.js

@@ -4,34 +4,25 @@ export default class EMouse {
     }
 
     mouseover(e) {
-        if (this.device.prdType) {
+        this.device.setVisible(true);
-            this.device.setVisible(true);
+        const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
-            const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
+        if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) {
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) {
+            instance.mouseEvent.mouseEnter(e);
-                instance.mouseEvent.mouseEnter(e);
-            }
         }
     }
 
     mouseout(e) {
-        if (this.device.prdType) {
+        this.device.setVisible(false);
-            this.device.setVisible(false);
+        const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
-            const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
+        if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
+            instance.mouseEvent.mouseLeave(e);
-                instance.mouseEvent.mouseLeave(e);
-            }
         }
     }
 
     mouseEnter() {
-        // if (this.device.prdType) {
-        //     this.device.setVisible(true);
-        // }
     }
 
     mouseLeave() {
-        if (this.device.prdType ) {
+        this.device.setVisible(false);
-            this.device.setVisible(false);
-        }
     }
 }

src/jmapNew/shape/graph/TrainWindow/index.js

@@ -23,13 +23,12 @@ class TrainWindow extends Group {
         this.model = model;
         this.style = style;
         this.z = 9;
-        this.prdType = store.state.training.prdType;
         this.create();
         this.createMouseEvent();
         this.setState(model);
     }
     create() {
-        if (this.prdType !== '01') {
+        if (store.state.map.picture !== 'localWork') {
             this.createTrainWindow();
         }
     }

src/views/newMap/display/simulationMenu.vue

@@ -707,14 +707,8 @@ export default {
                     });
                 }
             } else {
-                //  || this.isCtc
+                history.go(-1);
-                if (this.project === 'bjd') {
+                Notification.closeAll();
-                    window.close();
-                } else {
-                    // this.$store.dispatch('map/setShowCentralizedStationCode', '');
-                    history.go(-1);
-                    Notification.closeAll();
-                }
             }
         },
         // 数字沙盘

src/views/newMap/display/trainingList/trainingMenu.vue

@@ -4,6 +4,7 @@
     <div ref="drapBox" class="reminder-box">
       <div class="tip-title">
         <div>
+          <i class="icon el-icon-tickets" />
           <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
           <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
           <i v-show="!isShrink && !trainingSwitch && trainingDetail" class="icon el-icon-video-play" @click="handlerStart" />