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

src/jlmap3d/edit/testEditorModel/StationStandList.js

@@ -92,19 +92,25 @@ export function StationStandList() {
       // console.log(jlmap3ddata);
       let jlmapstationdata = jlmapdata.stationList;
       let jlmapstanddata = jlmapdata.stationStandList;
+      //
+      // console.log(jlmapstationdata);
+      //
+      // console.log(standsdata);
       // console.log(jlmapstationdata);
       for(let i=0;i<jlmapstationdata.length;i++){
         if(jlmapstationdata[i].visible == false || jlmapstationdata[i].depot == true){
           jlmapstationdata.splice(i,1);
           i--;
         }else{
+          // console.log(jlmapstationdata[i]);
+          // console.log(standsdata[i]);
           standsdata[i].code = jlmapstationdata[i].code;
           standsdata[i].name = jlmapstationdata[i].name;
         }
       }
-      console.log(otherStation);
+      // console.log(otherStation);
       // console.log(standsdata);
-      console.log(assetloader.modellist);
+      // console.log(assetloader.modellist);
       let stations = jlmap3ddata.stationstandlist.list;
       let num;
       let num2;
@@ -150,6 +156,7 @@ export function StationStandList() {
               section : jlmapstanddata[j].standTrackCode,
               inside : jlmapstanddata[j].inside,
             };
+            
             stands.push(changestand);
           }
         }

src/jlmap3d/main/loaders/DriverLoadNew.js

@@ -71,17 +71,16 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
     let standsdata = JSON.parse(netdata.stands);
     let psddata = data.psdList;
 
-    if(standsdata[0].inside == undefined){
+    for(let i=0;i<standsdata.length;i++){
-      for(let i=0;i<standsdata.length;i++){
+      for(let j=0;j<mapdata.stationStandList.length;j++){
-        for(let j=0;j<mapdata.stationStandList.length;j++){
+        if(standsdata[i].code == mapdata.stationStandList[j].stationCode){
-          if(standsdata[i].code == mapdata.stationStandList[j].stationCode){
+          standsdata[i].inside = mapdata.stationStandList[j].inside;
-            standsdata[i].inside = mapdata.stationStandList[j].inside;
+          j = mapdata.stationStandList.length;
-            j = mapdata.stationStandList.length;
-          }
         }
       }
     }
 
+
     assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList,0,JSON.parse(netdata.assets).others);
 
     assetloader.assetPromiseOver(sceneload)

src/jlmap3d/main/loaders/SimulationLoadNew.js

@@ -66,17 +66,16 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
     let signaldata = JSON.parse(netdata.signals);
     let standsdata = JSON.parse(netdata.stands);
     let psddata = mapdata.psdList;
-    console.log(mapdata);
+
-    if(standsdata[0].inside == undefined){
       for(let i=0;i<standsdata.length;i++){
         for(let j=0;j<mapdata.stationStandList.length;j++){
           if(standsdata[i].code == mapdata.stationStandList[j].stationCode){
+    
             standsdata[i].inside = mapdata.stationStandList[j].inside;
             j = mapdata.stationStandList.length;
           }
         }
       }
-    }
     assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList,1.3,JSON.parse(netdata.assets).others);
     // assetloader.setmodellistnew(netdata.assets);
 

src/jlmap3d/main/newmodel/StationStandListN.js

@@ -204,7 +204,6 @@ export function StationStandListN() {
 
         let newstationstand = new StationStandModel(standsdata[i]);
   
-
           newstationstand.code = standsdata[i].code;
           newstationstand.name = standsdata[i].name;
           newstationstand.type = "station";
@@ -372,7 +371,7 @@ export function StationStandListN() {
               let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
               let textplane = new THREE.Mesh( textgeometry, textmaterial );
               textplane.name = standsdata[i].code;
-              console.log("sss");
+
               textplane.position.y = 70;
               textplane.rotation.x = Math.PI/2;
               textplane.position.z = 80;

src/jmapNew/map.js

@@ -418,11 +418,16 @@ class Jlmap {
             });
         }
     }
-    updatePrdType(val, list) {
+    updatePrdType(list, val, showMode) {
         this.showConfig.prdType = val;
+        this.showConfig.showMode = showMode;
         (list || []).forEach(item => {
-            this.hookHandle(item, this.showConfig);
+            const code = item.code;
-            this.$painter.update(item);
+            const type = item._type;
+            const oDevice = this.mapDevice[code] || deviceFactory(type, item, this.showConfig);
+            this.hookHandle(oDevice, this.showConfig);
+            this.$painter.update(oDevice);
+            this.$painter.updateShowMode(oDevice);
         });
     }
     update(list) {
@@ -482,9 +487,9 @@ class Jlmap {
                         this.$painter.delete(oDevice);
                     } else {
                         this.$painter.update(oDevice);
-					}
+                    }
-				}
+                }
-				store.commit('map/mapStationStateUpdate');
+                store.commit('map/mapStationStateUpdate');
             } else {
                 if (elem.deviceType === 'TRAIN') {
                     this.isUpdateShowTrainList = true;
@@ -647,7 +652,7 @@ class Jlmap {
                 break;
             case this.events.__Zoom:
                 this.$mouseController.on(this.events.__Zoom, this.optionsHandler);
-				break;
+                break;
             }
         }
     }

src/jmapNew/shape/Arrow/index.js

@@ -1,5 +1,4 @@
 import Group from 'zrender/src/container/Group';
-import {isShowThePrdType} from '../../utils/handlePath';
 import Polygon from 'zrender/src/graphic/shape/Polygon';
 
 export default class Arrow extends Group {
@@ -12,13 +11,9 @@ export default class Arrow extends Group {
         this.model = model;
         // this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/AutoTurnBack/index.js

@@ -7,7 +7,6 @@ import Text from 'zrender/src/graphic/Text';
 import Rect from 'zrender/src/graphic/shape/Rect';
 import EMouse from './EMouse';
 import BoundingRect from 'zrender/src/core/BoundingRect';
-import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class AutoTurnBack extends Group {
     constructor(model, style) {
@@ -19,14 +18,10 @@ export default class AutoTurnBack extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, style.AutoTurnBack.visibleConditions) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.createMouseEvent();
-            this.createMouseEvent();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/AutomacticRoute/index.js

@@ -6,7 +6,6 @@ import Arc from 'zrender/src/graphic/shape/Arc';
 import Text from 'zrender/src/graphic/Text';
 import EMouse from './EMouse';
 import BoundingRect from 'zrender/src/core/BoundingRect';
-import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class AutomacticRoute extends Group {
     constructor(model, style) {
@@ -18,14 +17,10 @@ export default class AutomacticRoute extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, (style.AutomaticRoute || {}).displayCondition) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.createMouseEvent();
-            this.createMouseEvent();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/AxleReset/index.js

@@ -6,7 +6,6 @@ import Arc from 'zrender/src/graphic/shape/Arc';
 import Text from 'zrender/src/graphic/Text';
 import EMouse from './EMouse';
 import BoundingRect from 'zrender/src/core/BoundingRect';
-import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class AxleReset extends Group {
     constructor(model, style) {
@@ -18,14 +17,10 @@ export default class AxleReset extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, (style.AxleReset || {}).displayCondition) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.createMouseEvent();
-            this.createMouseEvent();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/DirectionRod/index.js

@@ -1,6 +1,5 @@
 import Group from 'zrender/src/container/Group';
 import Polygon from 'zrender/src/graphic/shape/Polygon';
-import {isShowThePrdType} from '../../utils/handlePath';
 import Text from 'zrender/src/graphic/Text';
 
 export default class DirectionRod extends Group {
@@ -13,14 +12,10 @@ export default class DirectionRod extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, (style.DirectionRod || {}).displayCondition) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.createMouseEvent();
-            this.createMouseEvent();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
     create() {
         const model = this.model;

src/jmapNew/shape/FloodGate/index.js

@@ -3,7 +3,6 @@
 */
 import Group from 'zrender/src/container/Group';
 import Rect from 'zrender/src/graphic/shape/Rect';
-import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class FloodGate extends Group {
     constructor(model, style) {
@@ -16,14 +15,10 @@ export default class FloodGate extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, (style.FloodGate || {}).displayCondition) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.createMouseEvent();
-            this.createMouseEvent();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/GuideLock/index.js

@@ -6,7 +6,6 @@ import Arc from 'zrender/src/graphic/shape/Arc';
 import Text from 'zrender/src/graphic/Text';
 import EMouse from './EMouse';
 import BoundingRect from 'zrender/src/core/BoundingRect';
-import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class GuideLock extends Group {
     constructor(model, style) {
@@ -18,14 +17,10 @@ export default class GuideLock extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, (style.GuideLock || {}).displayCondition) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.createMouseEvent();
-            this.createMouseEvent();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/Line/index.js

@@ -1,5 +1,4 @@
 import Group from 'zrender/src/container/Group';
-import {isShowThePrdType} from '../../utils/handlePath';
 import Polyline from 'zrender/src/graphic/shape/Polyline';
 
 export default class Line2 extends Group {
@@ -12,13 +11,9 @@ export default class Line2 extends Group {
         this.model = model;
         this.style = style.Line;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/OutFrame/index.js

@@ -1,6 +1,5 @@
 import Group from 'zrender/src/container/Group';
 import Rect from 'zrender/src/graphic/shape/Rect';
-import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class OutFrame extends Group {
     constructor(model, style) {
@@ -12,13 +11,9 @@ export default class OutFrame extends Group {
         this.zlevel = model.zlevel;
         this.isShowShape = true;
         this.z = 0;
-        if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/OverAp/index.js

@@ -1,5 +1,4 @@
 import Group from 'zrender/src/container/Group';
-// import {isShowThePrdType} from '../../utils/handlePath';
 import ETextName from '../element/ETextName'; // 名称文字 (共有)
 import BoundingRect from 'zrender/src/core/BoundingRect';
 

src/jmapNew/shape/Power/index.js

@@ -2,7 +2,6 @@ import Polyline from 'zrender/src/graphic/shape/Polyline';
 import Group from 'zrender/src/container/Group';
 import JTriangle from '../../utils/JTriangle';
 import ESeparator from './ESeparator';
-import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class Line2 extends Group {
     constructor(model, style) {
@@ -14,14 +13,10 @@ export default class Line2 extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.createTerminal();
-            this.createTerminal();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {

src/jmapNew/shape/SaidLamp/index.js

@@ -1,7 +1,6 @@
 import Group from 'zrender/src/container/Group';
 import EControl from '../element/EControl';
 import EMouse from './EMouse';
-import {isShowThePrdType} from '../../utils/handlePath';
 import deviceType from '../../constant/deviceType';
 import ELampFilament from './ELampFilament';
 import EControlSwitch from './EControlSwitch';
@@ -23,14 +22,10 @@ export default class SaidLamp extends Group {
         this.deviceStyle = style[model._type];
         if (this.deviceStyle) {
             this.isShowShape = true;
-            if (isShowThePrdType(model.prdType, (this.deviceStyle || {}).displayCondition) || model.previewOrMapDraw) {
+            this.create();
-                this.create();
+            this.createMouseEvent();
-                this.createMouseEvent();
+            this.setState(model);
-                this.setState(model);
+            this.setShowMode();
-            }
-            if (model.previewOrMapDraw) {
-                this.setShowMode();
-            }
         }
     }
 

src/jmapNew/shape/Signal/index.js

@@ -12,7 +12,6 @@ import Group from 'zrender/src/container/Group';
 import EHighlight from '../element/EHighlight';
 import EVirtualSignal from './EVirtualSignal';
 import ELowButton from './ELowButton';
-import {isShowThePrdType} from '../../utils/handlePath';
 import Rect from 'zrender/src/graphic/shape/Rect';
 import Polygon from 'zrender/src/graphic/shape/Polygon';
 import Text from 'zrender/src/graphic/Text';
@@ -49,9 +48,7 @@ class Signal extends Group {
         this.createMouseEvent();
         this.checkIsDrawMap();
         this.transformRotation(this);
-        if (model.previewOrMapDraw) {
+        this.setShowMode();
-            this.setShowMode();
-        }
         this.setState(model);
         // this.checkIsDrawMap();
     }
@@ -737,15 +734,13 @@ class Signal extends Group {
         this.recover();
 
         /** 信号机进路按钮显示 */
-        if (isShowThePrdType(model.prdType, '03') && this.style.Signal.lowButton.display) {
+        /** 终端信号机按钮 */
-            /** 终端信号机按钮 */
+        if (model.isRouteActive) {
-            if (model.isRouteActive) {
+            this.setLowButtonActive();
-                this.setLowButtonActive();
+        } else {
-            } else {
+            this.setLowButtonRecover();
-                this.setLowButtonRecover();
-            }
-            model.isRouteSignal && this.setLowButtonShow();
         }
+        model.isRouteSignal && this.setLowButtonShow();
 
         /** 设置灯的颜色 */
         model.redOpen && !model.yellowOpen && !model.greenOpen && this.close(model.logicLight); // 信号关闭

src/jmapNew/shape/Station/index.js

@@ -460,12 +460,28 @@ export default class Station extends Group {
     // }
 
     getShapeTipPoint(opts) {
-        let rect;
+		let rect;
-        if (opts.subDeviceType === 'button') {
+		switch(opts.subDeviceType) {
-            rect = this.centerControlButton.getArcBoundingRect();
+			case 'button':
-        } else {
+				rect = this.centerControlButton.getArcBoundingRect();
-            rect = this.stationText.getBoundingRect();
+				break;
-        }
+			case 'center':
+				rect = this.centerControl.getArcBoundingRect();
+				break;
+			case 'substation':
+				rect = this.substationControl.getArcBoundingRect();
+				break;
+			case 'emergency':
+				rect = this.emergencyControl.getArcBoundingRect()
+				break;
+			case 'interconnected':
+				rect = this.interconnectedControl.getArcBoundingRect()
+				break;
+			default:
+				rect = this.stationText.getBoundingRect();
+				break;
+		}
+
         return {
             x: rect.x + rect.width,
             y: rect.y

src/jmapNew/shape/StationStand/index.js

@@ -36,7 +36,6 @@ import EDownDetainLamp from './functionButton/EDownDetainLamp';
 import ETrainSetButton from './ETrainSetButton';
 import EStationPlatform from './EStationPlatform';
 
-import {isShowThePrdType} from '../../utils/handlePath';
 import {traverseLineElements, traverseStatusElements} from '../utils/ShapeStatusCovert';
 
 class StationStand extends Group {
@@ -99,9 +98,7 @@ class StationStand extends Group {
             'downDetainLamp':EDownDetainLamp
         };
         // 遍历后端返回的状态控制的绘图
-        if (model.previewOrMapDraw || isShowThePrdType(model.prdType, style.StationStand.common.functionButtonShow)) {
+        traverseStatusElements(statusElementList, model, style, this);
-            traverseStatusElements(statusElementList, model, style, this);
-        }
     }
 
     createMouseEvent() {

src/jmapNew/shape/Text/index.js

@@ -1,6 +1,5 @@
 import Text from 'zrender/src/graphic/Text';
 import Group from 'zrender/src/container/Group';
-import {isShowThePrdType} from '../../utils/handlePath';
 import BoundingRect from 'zrender/src/core/BoundingRect';
 import Vue from 'vue';
 
@@ -15,13 +14,9 @@ export default class Text2 extends Group {
         this.style = style;
         this.z = 6;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
+        this.create();
-            this.create();
+        this.setState(model);
-            this.setState(model);
+        this.setShowMode();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
     }
 
     create() {
@@ -67,6 +62,7 @@ export default class Text2 extends Group {
             return;
         }
         const showConditions = this.model.showConditions;
+        console.log(showMode, showConditions);
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
             this.text && this.text.show();
         } else {

src/jmapNew/theme/chengdu_03/menus/menuButton.vue

@@ -406,16 +406,19 @@ export default {
             } else if (model._type === 'Station') {
                 switch (subType) {
                 case 'substation':
-                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
+					operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
-                    operate.param = {stationCodes: [model.code]};
+					operate.param = {stationCodes: [model.code]};
+					operate.code = model.code;
                     break;
                 case 'center':
                     operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
-                    operate.param = {stationCodes: [model.code]};
+					operate.param = {stationCodes: [model.code]};
+					operate.code = model.code;
                     break;
                 case 'emergency':
                     operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
-                    operate.param = {stationCodes: [model.code]};
+					operate.param = {stationCodes: [model.code]};
+					operate.code = model.code;
                     break;
                 }
             }

src/jmapNew/theme/chengdu_03/operationConfig.js

@@ -11,6 +11,49 @@
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
+		// 控制模式
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value,
+            skinCode: '04',
+            trainingName: '请求站控({2})',
+            trainingRemark: '请求站控功能',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['01'],
+            stepVOList: [
+				{ deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
+				{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【站控】', codeType:'STATION', subType:'substation' }
+            ]
+		},
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL.value,
+            skinCode: '04',
+            trainingName: '请求紧急站控({2})',
+            trainingRemark: '请求紧急站控功能',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
+				{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【紧急站控】', codeType:'STATION', subType:'emergency' }
+            ]
+		},
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL.value,
+            skinCode: '04',
+            trainingName: '请求中控({2})',
+            trainingRemark: '请求请求中控功能',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
+				{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【中控】', codeType:'STATION', subType:'center' }
+            ]
+		},
         // 信号机列表
         {
             maxDuration: 15,
@@ -74,7 +117,22 @@ export default {
                 { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
             ]
-        },
+		},
+		// {
+        //     maxDuration: 15,
+        //     minDuration: 8,
+        //     operateType: CMD.Signal.CMD_STATION_SET_MASTER_GUIDE_LOCK.value,
+        //     skinCode: '04',
+        //     trainingName: '引导总锁({3})',
+        //     trainingRemark: '进路办理引导总锁',
+        //     trainingType: 'Signal',
+        //     productTypes: ['01'],
+        //     stepVOList: [
+        //         { deviceType: '04', orderNum: 1, operateCode: '1190', tip: '鼠标左键点击【引导总锁】' },
+        //         { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
+        //         { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{5}】', codeType:'GUIDELOCK' }
+        //     ]
+        // },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -568,6 +626,20 @@ export default {
                 { deviceType: '06', orderNum: 2, operateCode: '5051', tip: '鼠标左键点击【上行全线】按钮', val: '02' },
                 { deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮' }
             ]
+		},
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
+            skinCode: '04',
+            trainingName: '设置跳停({10}-{12}站台)',
+            trainingRemark: '设置跳停功能',
+            trainingType: 'Stand',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'},
+                { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【跳停】', codeType:'STAND', subType:'StopJumpLamp' }
+            ]
         },
         {
             maxDuration: 15,
@@ -582,6 +654,20 @@ export default {
                 { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' },
                 { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' }
             ]
+		},
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
+            skinCode: '04',
+            trainingName: '取消跳停({10}-{12}站台)',
+            trainingRemark: '设置取消跳停功能',
+            trainingType: 'Stand',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'},
+                { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【取消跳停】', codeType:'STAND', subType:'CancelStopJumpLamp' }
+            ]
         },
         {
             maxDuration: 15,
@@ -596,7 +682,7 @@ export default {
                 { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
                 { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' }
             ]
-        },
+		},
         {
             maxDuration: 15,
             minDuration: 8,
@@ -694,12 +780,12 @@ export default {
             minDuration: 5,
             operateType: CMD.Stand.CMD_STAND_VIEW_STATUS.value,
             skinCode: '04',
-            trainingName: '属性({10}-{12}站台)',
+            trainingName: '显示站台信息({10}-{12}站台)',
             trainingRemark: '查询站台状态功能',
             trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【属性】' },
+                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【显示站台信息】' },
                 { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【退出】按钮' }
             ]
         }

src/jmapNew/theme/ningbo_01/menus/menuSection.vue

@@ -276,7 +276,7 @@ export default {
             if (this.selected.type == '02' || this.selected.type == '03') {
                 sectionCode = this.selected.parentCode;
             }
-            commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{
+            commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.speedLimitControl.doShow(operate, this.selected);
                 }

src/jmapNew/theme/ningbo_01/operationConfig.js

@@ -304,20 +304,20 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: 'Section_Set_Limit_Speed',
+            operateType: 'Section_Cancel_Limit_Speed',
             skinCode: '06',
-            trainingName: '设置临时限速({8}{9})',
+            trainingName: '取消临时限速({8}{9})',
-            trainingRemark: '设置临时限速功能-取消临时限速（限速值：不限速）',
+            trainingRemark: '取消临时限速功能',
             trainingType: 'Section',
             productTypes: ['02'],
             stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
+                { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【取消临时限速】' },
-                { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值: 不限速】', val: '0' },
+                // { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值: 不限速】', val: '0' },
-                { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '03', orderNum: 2, operateCode: '4081', tip: '鼠标左键点击【下达】按钮' },
-                { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '4082', tip: '鼠标左键点击【确认】按钮' },
-                { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '4083', tip: '鼠标左键点击【确认1】按钮' },
-                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' },
+                { deviceType: '03', orderNum: 5, operateCode: '4084', tip: '鼠标左键点击【确认2】按钮', val: '0' },
-                { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+                { deviceType: '03', orderNum: 6, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
             ]
         },
         {

src/jmapNew/utils/handlePath.js

@@ -1,17 +1,8 @@
-export function getPrdType() {
-    let prdType = '';
-    const path = window.location.href;
-    if (path.includes('?')) {
-        const arr = window.location.href.split('?')[1].split('&');
-        arr.forEach(elem => {
-            if (elem.split('=')[0] === 'prdType') {
-                prdType = elem.split('=')[1];
-            }
-        });
-    }
-    return prdType;
-}
 export function isShowThePrdType (prdType, showConditions) {
+    const path = window.location.href;
+    if (path.includes('jointTrainingNew')) {
+        return true;
+    }
     if (showConditions === '01' || (showConditions === '02' && prdType === '02') || (showConditions === '03' && prdType === '01')) {
         return true;
     } else if (!showConditions) {

src/scripts/cmdPlugin/ValidateHandler.js

@@ -30,7 +30,6 @@ class ValidateHandler {
     judge (operate) {
         const steps = Handler.getSteps();
         const order = Handler.getOrder();
-        console.log(operate, steps);
         let valid = false;
         if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
             if (operate && steps[0] &&

src/views/newMap/jlmapNew/index.vue

@@ -479,7 +479,7 @@ export default {
         // 综合演练切换现地行调模式
         changePrdType(val) {
             const nameList = Object.keys(this.$store.state.map.map || {});
-            let list = [];
+            let list = []; let showMode = '';
             nameList.forEach(item => {
                 if (item !== 'skinVO') {
                     const data = this.$store.state.map.map[item];
@@ -488,7 +488,12 @@ export default {
                     }
                 }
             });
-            this.$jlmap.updatePrdType(val, nameList);
+            if (val === '01') {
+                showMode = '03';
+            } else if (val === '02') {
+                showMode = '02';
+            }
+            this.$jlmap.updatePrdType(list, val, showMode);
         },
         // 切换现地行调显示界面（绘图和预览页面下）
         setShowMode(showMode) {