diff --git a/src/jlmap3d/edit/Jlmap3dnewdata.js b/src/jlmap3d/edit/Jlmap3dnewdata.js index 8a2f8dba7..5637150c5 100644 --- a/src/jlmap3d/edit/Jlmap3dnewdata.js +++ b/src/jlmap3d/edit/Jlmap3dnewdata.js @@ -68,7 +68,6 @@ export function Jlmap3ddata(mapid,scope){ // jlmap3ddata.raillist = new RailList(); jlmap3ddata.raillist.setrail(); - console.log(mapdata); assetloader.assetinit(scene) .then(function(data){ //console.log(data); @@ -100,7 +99,6 @@ export function Jlmap3ddata(mapid,scope){ console.log(netdata); // console.log(netdata) getMapDetail(mapid).then(data => { - console.log(data); jlmap3ddata.id = netdata.id; jlmap3ddata.mapId = mapid; let mapdata = data.data; @@ -121,7 +119,7 @@ export function Jlmap3ddata(mapid,scope){ let signaldata = JSON.parse(netdata.signals); let standsdata = JSON.parse(netdata.stands); // console.log(mapdata); - assetloader.setmodellist(netdata.assets,5); + assetloader.setmodellistnew(netdata.assets,5); assetloader.assetpromise(scene) .then(function(data){ // return jlmap3ddata.stationstandlist.initpromise(jlmap3ddata,mapdata.stationList,mapdata.stationStandList,scene,assetloader); diff --git a/src/jlmap3d/edit/connect/newgetmodels.js b/src/jlmap3d/edit/connect/newgetmodels.js index 470ddc5a8..896e36750 100644 --- a/src/jlmap3d/edit/connect/newgetmodels.js +++ b/src/jlmap3d/edit/connect/newgetmodels.js @@ -148,6 +148,7 @@ export function getmodels(data) { position:data.mapdata.stationstandlist.list[i].mesh.position, rotation:data.mapdata.stationstandlist.list[i].mesh.rotation, scale:data.mapdata.stationstandlist.list[i].mesh.scale, + inside:data.mapdata.stationstandlist.list[i].inside, direction1:{ name:data.mapdata.stationstandlist.list[i].direction1.name, code:data.mapdata.stationstandlist.list[i].direction1.code diff --git a/src/jlmap3d/edit/neweditmodel/SectionList.js b/src/jlmap3d/edit/neweditmodel/SectionList.js index 9a0cd6036..d88122343 100644 --- a/src/jlmap3d/edit/neweditmodel/SectionList.js +++ b/src/jlmap3d/edit/neweditmodel/SectionList.js @@ -873,7 +873,6 @@ export function SectionList() { autorail.leftlist = leftlist; scene.add(scope.sectiongroup); return new Promise(function(resolve, reject){ - console.log(sectiondata); for(let i=0,leni = sectiondata.length;i=0;an--){ + actions["traindoor"].top[an].reset(); + actions["traindoor"].top[an].time = actions["traindoor"].top[an]._clip.duration; + actions["traindoor"].top[an].timeScale = -1; + actions["traindoor"].top[an].play(); + } + }else if(trainmodel.open != data.open && data.open == "1"){ + trainmodel.open = "1"; + for(let an=actions["traindoor"].top.length-1;an>=0;an--){ + actions["traindoor"].top[an].reset(); + actions["traindoor"].top[an].time = 0; + actions["traindoor"].top[an].timeScale = 1; + actions["traindoor"].top[an].play(); + } + } + }else{ - if(trainmodel.open != data.open && data.open == "0"){ - trainmodel.open = "0"; - for(let an=actions["traindoor"].down.length-1;an>=0;an--){ - actions["traindoor"].down[an].reset(); - actions["traindoor"].down[an].time = actions["traindoor"].top[an]._clip.duration; - actions["traindoor"].down[an].timeScale = -1; - actions["traindoor"].down[an].play(); - } - }else if(trainmodel.open != data.open && data.open == "1"){ - trainmodel.open = "1"; - for(let an=actions["traindoor"].down.length-1;an>=0;an--){ - actions["traindoor"].down[an].reset(); - actions["traindoor"].down[an].time = 0; - actions["traindoor"].down[an].timeScale = 1; - actions["traindoor"].down[an].play(); + + if (trainmodel.open != data.open && data.open == '0') { + trainmodel.open = '0'; + for (let an=actions["traindoor"].down.length-1; an>=0; an--) { + actions["traindoor"].down[an].reset(); + actions["traindoor"].down[an].time = actions["traindoor"].down[an]._clip.duration; + actions["traindoor"].down[an].timeScale = -1; + actions["traindoor"].down[an].play(); + } + } else if (trainmodel.open != data.open && data.open == '1') { + trainmodel.open = "1"; + for(let an=actions["traindoor"].down.length-1;an>=0;an--){ + actions["traindoor"].down[an].reset(); + actions["traindoor"].down[an].time = 0; + actions["traindoor"].down[an].timeScale = 1; + actions["traindoor"].down[an].play(); + } } + } }else{ + if(data.doorCode == "1"){ + + if(trainmodel.open != data.open && data.open == "0"){ + trainmodel.open = "0"; + for(let an=actions["traindoor"].top.length-1;an>=0;an--){ + actions["traindoor"].top[an].reset(); + actions["traindoor"].top[an].time = actions["traindoor"].top[an]._clip.duration; + actions["traindoor"].top[an].timeScale = -1; + actions["traindoor"].top[an].play(); + } + }else if(trainmodel.open != data.open && data.open == "1"){ + trainmodel.open = "1"; + for(let an=actions["traindoor"].top.length-1;an>=0;an--){ + actions["traindoor"].top[an].reset(); + actions["traindoor"].top[an].time = 0; + actions["traindoor"].top[an].timeScale = 1; + actions["traindoor"].top[an].play(); + } + } + }else{ - if (trainmodel.open != data.open && data.open == '0') { - trainmodel.open = '0'; - for (let an=actions["traindoor"].top.length-1; an>=0; an--) { - actions["traindoor"].top[an].reset(); - actions["traindoor"].top[an].time = actions["traindoor"].top[an]._clip.duration; - actions["traindoor"].top[an].timeScale = -1; - actions["traindoor"].top[an].play(); - } - } else if (trainmodel.open != data.open && data.open == '1') { - trainmodel.open = "1"; - for(let an=actions["traindoor"].top.length-1;an>=0;an--){ - actions["traindoor"].top[an].reset(); - actions["traindoor"].top[an].time = 0; - actions["traindoor"].top[an].timeScale = 1; - actions["traindoor"].top[an].play(); + if (trainmodel.open != data.open && data.open == '0') { + trainmodel.open = '0'; + for (let an=actions["traindoor"].down.length-1; an>=0; an--) { + actions["traindoor"].down[an].reset(); + actions["traindoor"].down[an].time = actions["traindoor"].down[an]._clip.duration; + actions["traindoor"].down[an].timeScale = -1; + actions["traindoor"].down[an].play(); + } + } else if (trainmodel.open != data.open && data.open == '1') { + trainmodel.open = "1"; + for(let an=actions["traindoor"].down.length-1;an>=0;an--){ + actions["traindoor"].down[an].reset(); + actions["traindoor"].down[an].time = 0; + actions["traindoor"].down[an].timeScale = 1; + actions["traindoor"].down[an].play(); + } } + } - } + } } diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js index 637f3393e..0ed1d9502 100644 --- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js +++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js @@ -150,7 +150,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { if(trainlisttest.list[code].dispose == "0"){ if(trainlisttest.list[code].curve == null){ if (data.right == '1') { // 向右 - + trainlisttest.list[code].right = '1'; trainlisttest.list[code].progress = data.offset; trainlisttest.list[code].isstandsection = rails.sectionrail[data.section].standTrack; if(rails.sectionrail[data.section].standTrack){ @@ -175,6 +175,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { trainlisttest.list[code].status = '1'; } else if (data.right == '0') { // 向左 + trainlisttest.list[code].right = '0'; trainlisttest.list[code].progress = 1-data.offset; trainlisttest.list[code].isstandsection = rails.sectionrail[data.section].standTrack; if(rails.sectionrail[data.section].standTrack){ @@ -205,6 +206,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { //后端数据驱动车的位置更新与代码驱动车的移动相结合 if(data.code != trainlisttest.list[code].code){ if (data.right == '1') { // 向右 + trainlisttest.list[code].right = '1'; trainlisttest.list[code].nowcode = data.code; trainlisttest.list[code].curve = rails.sectionrail[data.section].lineleft; trainlisttest.list[code].progress = data.offset; @@ -213,6 +215,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { trainlisttest.list[code].nextlen = rails.sectionrail[data.next].lengthfact; trainlisttest.list[code].nextissection = rails.sectionrail[data.next].standTrack; } else if (data.right == '0') { // 向左 + trainlisttest.list[code].right = '0'; trainlisttest.list[code].nowcode = data.code; trainlisttest.list[code].curve = rails.sectionrail[data.section].lineright; trainlisttest.list[code].progress = 1-data.offset; @@ -251,7 +254,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { } function DeviceDestroy(data){ - console.log(data); for(let i=0,leni=data.body.length;i=0;an--){ - actions[code].down[an].reset(); - actions[code].down[an].time = actions[code].top[an]._clip.duration; - actions[code].down[an].timeScale = -1; - actions[code].down[an].play(); + if(trainlisttest.list[code].open != data.open && data.open == "0"){ + trainlisttest.list[code].open = "0"; + for(let an=actions[code].top.length-1;an>=0;an--){ + actions[code].top[an].reset(); + actions[code].top[an].time = actions[code].top[an]._clip.duration; + actions[code].top[an].timeScale = -1; + actions[code].top[an].play(); + } + }else if(trainlisttest.list[code].open != data.open && data.open == "1"){ + trainlisttest.list[code].open = "1"; + for(let an=actions[code].top.length-1;an>=0;an--){ + actions[code].top[an].reset(); + actions[code].top[an].time = 0; + actions[code].top[an].timeScale = 1; + actions[code].top[an].play(); + } } - }else if(trainlisttest.list[code].open != data.open && data.open == "1"){ - trainlisttest.list[code].open = "1"; - for(let an=actions[code].down.length-1;an>=0;an--){ - actions[code].down[an].reset(); - actions[code].down[an].time = 0; - actions[code].down[an].timeScale = 1; - actions[code].down[an].play(); + }else{ + + + if (trainlisttest.list[code].open != data.open && data.open == '0') { + trainlisttest.list[code].open = '0'; + for (let an=actions[code].down.length-1; an>=0; an--) { + actions[code].down[an].reset(); + actions[code].down[an].time = actions[code].down[an]._clip.duration; + actions[code].down[an].timeScale = -1; + actions[code].down[an].play(); + } + } else if (trainlisttest.list[code].open != data.open && data.open == '1') { + trainlisttest.list[code].open = "1"; + for(let an=actions[code].down.length-1;an>=0;an--){ + actions[code].down[an].reset(); + actions[code].down[an].time = 0; + actions[code].down[an].timeScale = 1; + actions[code].down[an].play(); + } } + } }else{ - if (trainlisttest.list[code].open != data.open && data.open == '0') { - trainlisttest.list[code].open = '0'; - for (let an=actions[code].top.length-1; an>=0; an--) { - actions[code].top[an].reset(); - actions[code].top[an].time = actions[code].top[an]._clip.duration; - actions[code].top[an].timeScale = -1; - actions[code].top[an].play(); - } - } else if (trainlisttest.list[code].open != data.open && data.open == '1') { - trainlisttest.list[code].open = "1"; - for(let an=actions[code].top.length-1;an>=0;an--){ - actions[code].top[an].reset(); - actions[code].top[an].time = 0; - actions[code].top[an].timeScale = 1; - actions[code].top[an].play(); - } - } + if(data.doorCode == "1"){ + if(trainlisttest.list[code].open != data.open && data.open == "0"){ + trainlisttest.list[code].open = "0"; + for(let an=actions[code].top.length-1;an>=0;an--){ + actions[code].top[an].reset(); + actions[code].top[an].time = actions[code].top[an]._clip.duration; + actions[code].top[an].timeScale = -1; + actions[code].top[an].play(); + } + }else if(trainlisttest.list[code].open != data.open && data.open == "1"){ + trainlisttest.list[code].open = "1"; + for(let an=actions[code].top.length-1;an>=0;an--){ + actions[code].top[an].reset(); + actions[code].top[an].time = 0; + actions[code].top[an].timeScale = 1; + actions[code].top[an].play(); + } + } + }else{ + + + if (trainlisttest.list[code].open != data.open && data.open == '0') { + trainlisttest.list[code].open = '0'; + for (let an=actions[code].down.length-1; an>=0; an--) { + actions[code].down[an].reset(); + actions[code].down[an].time = actions[code].down[an]._clip.duration; + actions[code].down[an].timeScale = -1; + actions[code].down[an].play(); + } + } else if (trainlisttest.list[code].open != data.open && data.open == '1') { + trainlisttest.list[code].open = "1"; + for(let an=actions[code].down.length-1;an>=0;an--){ + actions[code].down[an].reset(); + actions[code].down[an].time = 0; + actions[code].down[an].timeScale = 1; + actions[code].down[an].play(); + } + } + + } } } diff --git a/src/jlmap3d/jl3dsimulation/jlmap3d.js b/src/jlmap3d/jl3dsimulation/jlmap3d.js index 80cd33c83..83e53f0a2 100644 --- a/src/jlmap3d/jl3dsimulation/jlmap3d.js +++ b/src/jlmap3d/jl3dsimulation/jlmap3d.js @@ -56,13 +56,15 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) { //定义镜头操作 let controls = new THREE.OrbitControls(camera); controls.maxPolarAngle = Math.PI/2; - controls.screenSpacePanning = true; + // controls.screenSpacePanning = true; //controls.minPolarAngle = Math.PI/8; - controls.maxDistance = 2000; + controls.maxDistance = 1000; //模型加载器 this.assetloader = new AssetLoader(); //替换材质组，例：信号机不同灯光 this.materiallist = []; + //替换材质组(站台的) + this.stationtexture = []; //初始化场景线框和灯光 暂时 SetLights(scene); //点击选中的模型 diff --git a/src/jlmap3d/main/loaders/AssetLoader.js b/src/jlmap3d/main/loaders/AssetLoader.js index 1aabfeadd..aa086220c 100644 --- a/src/jlmap3d/main/loaders/AssetLoader.js +++ b/src/jlmap3d/main/loaders/AssetLoader.js @@ -37,7 +37,7 @@ let defaultstation = { type:"num4", picUrl:"", assetUrl:"../../static/model/station/fuzhou.FBX" -}//modelurl+"/station/fuzhou/fuzhou.FBX" +}//"../../static/model/station/fuzhou/fuzhou.FBX" let waicestation = { id:"10", name:"外侧车站", @@ -46,15 +46,15 @@ let waicestation = { picUrl:"", assetUrl:"../../static/model/station/waicestation.FBX" } -let defaulttopstation = { - id:"104", - name:"福州车站1", - deviceType:"topstand", - type:"num5", +let station3 = { + id:"10000", + name:"三站台", + deviceType:"station3", + type:"num4", picUrl:"", - assetUrl:modelurl+"/station/fuzhou/topstation.FBX" + assetUrl:"../../static/model/station/station3.FBX" } -//modelurl+"/station/fuzhou/fuzhou.FBX" +//"../../static/model/station/fuzhou/fuzhou.FBX" //https://test.joylink.club/oss/station/fuzhou/fuzhou.FBX //https://joylink.club/oss/station/fuzhou/fuzhou.FBX //../../static/model/station/zhantai715(2).FBX @@ -65,17 +65,9 @@ let defaultswitch = { deviceType:"switch", type:"fuzhou", picUrl:"", - assetUrl:modelurl+"/daocha/daocha.FBX" + assetUrl:"../../static/model/daocha/daocha.FBX" } -let defaultdriver = { - id:"15", - name:"驾驶台", - deviceType:"driver", - type:"driver", - picUrl:"", - assetUrl:modelurl+"/driver/driver.FBX" -} let defaultsuidao = { id:"16", @@ -83,7 +75,16 @@ let defaultsuidao = { deviceType:"suidao", type:"suidao", picUrl:"", - assetUrl:modelurl+"/suidao/suidao.FBX" + assetUrl:"../../static/model/suidao/suidao.FBX" +} + +let hebsuidao = { + id:"1010", + name:"hebsuidao", + deviceType:"hebsuidao", + type:"hebsuidao", + picUrl:"", + assetUrl:"../../static/model/suidao/hebsuidao.FBX" } let defaultbackground = { @@ -92,9 +93,9 @@ let defaultbackground = { deviceType:"background", type:"background", picUrl:"", - assetUrl:modelurl+"/suidao/background.FBX" + assetUrl:"../../static/model/suidao/background.FBX" } -//modelurl+"/suidao/suidao.FBX" +//"../../static/model/suidao/suidao.FBX" //https://test.joylink.club/oss/suidao/suidao.FBX //https://joylink.club/oss/suidao/suidao.FBX //../../static/model/suidao/suidao.FBX @@ -108,15 +109,6 @@ let defaultautorail = { assetUrl:"../../static/model/auto/rail.FBX" } -let defaultautosuidao = { - id:"101", - name:"autosuidao", - deviceType:"autosuidao", - type:"autosuidao", - picUrl:"", - assetUrl:"../../static/model/auto/suidao.FBX" -} - let autoswitch = { id:"104", name:"道岔", @@ -132,7 +124,7 @@ let autoswitch1 = { deviceType:"autoswitch1", type:"fuzhou", picUrl:"", - assetUrl:modelurl+"/auto/switch1.FBX" + assetUrl:"../../static/model/auto/switch1.FBX" } let autoswitch2 = { @@ -141,7 +133,7 @@ let autoswitch2 = { deviceType:"autoswitch2", type:"fuzhou", picUrl:"", - assetUrl:modelurl+"/auto/switch2.FBX" + assetUrl:"../../static/model/auto/switch2.FBX" } export function AssetLoader(){ @@ -160,7 +152,6 @@ export function AssetLoader(){ if(trainoffset){ scope.trainoffset = trainoffset; } - // console.log("setmodellist"); let defaultmodel1 = new AssetModel(defaultsignal); scope.modellist.push(defaultmodel1); @@ -170,17 +161,10 @@ export function AssetLoader(){ let station = new AssetModel(defaultstation); scope.modellist.push(station); - let wstation = new AssetModel(waicestation); - scope.modellist.push(wstation); - // let topstation = new AssetModel(defaulttopstation); - // scope.modellist.push(topstation); - - // let driver = new AssetModel(defaultdriver); - // scope.modellist.push(driver); - let suidao = new AssetModel(defaultsuidao); scope.modellist.push(suidao); + let background = new AssetModel(defaultbackground); scope.modellist.push(defaultbackground); @@ -215,6 +199,58 @@ export function AssetLoader(){ } + this.setmodellistnew = function (data,trainoffset){ + if(trainoffset){ + scope.trainoffset = trainoffset; + } + let defaultmodel1 = new AssetModel(defaultsignal); + scope.modellist.push(defaultmodel1); + + let defaultmodel2 = new AssetModel(defaulttrain); + scope.modellist.push(defaultmodel2); + + let station = new AssetModel(defaultstation); + scope.modellist.push(station); + + let wstation = new AssetModel(waicestation); + scope.modellist.push(wstation); + + let s3 = new AssetModel(station3); + scope.modellist.push(s3); + + let hebsd = new AssetModel(hebsuidao); + scope.modellist.push(hebsd); + + let defaultswitch1 = new AssetModel(autoswitch1); + scope.modellist.push(defaultswitch1); + + let defaultswitch2 = new AssetModel(autoswitch2); + scope.modellist.push(defaultswitch2); + + let modeldata = JSON.parse(data); + + for(let j=0;j - -
- {{message}} -
- - - 确定 - - - 取 消 - - - + +
+ {{ message }} +
+ + + 确定 + + + 取 消 + + + \ No newline at end of file + diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue index 779d821b7..5035196d8 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue @@ -214,6 +214,21 @@ export default { } else { this.commitDisabled = true; } + + const operate = {val:code}; + if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { + /** 进路交人工控*/ + operate.operation = OperationEvent.Signal.humanControl.choose.operation; + } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { + /** 进路交自动控*/ + operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation; + } + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } + }); + }, allSelectChange() { this.changeList = []; diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue index 27d62b79e..609822bdd 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue @@ -102,7 +102,7 @@ \ No newline at end of file + diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue index 9129909ba..08b613516 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue @@ -22,7 +22,8 @@ -
+
+
设置自动通过 取消自动通过
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue index fa74d117a..237066fbb 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue @@ -41,8 +41,6 @@ @@ -134,7 +132,7 @@ export default { commit() { const operate = { over: true, - operation: OperationEvent.Signal.detail.menu.operation, + operation: OperationEvent.Signal.detail.menu.operation }; this.loading = true; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue index 2d2286ee7..6073486a3 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue @@ -175,6 +175,8 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }); + } else { + this.$refs.noticeInfo.doShow('当前进路不允许排列, 与其他进路可能发生冲突'); } } }, diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue index bc4a172ed..fc8144152 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue @@ -93,16 +93,36 @@ export default { return this.dialogShow && !this.$store.state.menuOperation.break; }, domIdChoose() { - return this.dialogShow ? OperationEvent.Section.unlock.choose.domId : ''; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + return OperationEvent.Section.unlock.choose.domId; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + return OperationEvent.Section.fault.choose.domId; + } + return ''; }, confirmId1() { - return this.dialogShow ? OperationEvent.Section.unlock.confirm1.domId : ''; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + return OperationEvent.Section.unlock.confirm1.domId; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + return OperationEvent.Section.fault.confirm1.domId; + } + return ''; }, confirmId2() { - return this.dialogShow ? OperationEvent.Section.unlock.confirm2.domId : ''; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + return OperationEvent.Section.unlock.confirm2.domId; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + return OperationEvent.Section.fault.confirm2.domId; + } + return ''; }, domIdConfirm() { - return this.dialogShow ? OperationEvent.Section.unlock.confirm.domId : ''; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + return OperationEvent.Section.unlock.confirm.domId; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + return OperationEvent.Section.fault.confirm.domId; + } + return ''; }, title() { if (this.operation == OperationEvent.Section.unlock.menu.operation) { @@ -218,6 +238,7 @@ export default { confirm2() { if (this.messageText2 == this.sectionCode) { const operate = { + over: true, operation: '', cmdType: '' }; @@ -246,7 +267,6 @@ export default { }, commit() { const operate = { - over: true, operation: '' }; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue index 40fb9821d..b3d52ff6f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue @@ -238,7 +238,7 @@ export default { return ''; }, domIdClose() { - return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; + return this.dialogShow ? OperationEvent.Command.close.menu.domId : ''; }, isCancelSpeed() { return this.operation == OperationEvent.Section.cancelSpeed.menu.operation || this.operation == OperationEvent.Switch.cancelSpeed.menu.operation; @@ -350,7 +350,8 @@ export default { }, speedSelectChange(val) { const operate = { - operation: '' + operation: '', + val: val }; if (this.operation == OperationEvent.Section.setSpeed.menu.operation) { @@ -529,7 +530,6 @@ export default { }, close() { const operate = { - type: this.type, operation: OperationEvent.Command.close.menu.operation }; this.writeRecord({ order: ++this.order, date: now(), context: '点击关闭', result: '' }); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue index bd11783bd..803660914 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue @@ -76,7 +76,12 @@ export default { return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : ''; }, chooseId() { - return this.dialogShow ? OperationEvent.StationStand.setBulkBuckleTrain.choose.domId : ''; + if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) { + return OperationEvent.StationStand.setBulkBuckleTrain.choose.domId; + } else if (this.operation == OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation) { + return OperationEvent.StationStand.cancelBulkBuckleTrain.choose.domId; + } + return ''; }, title() { if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue index 4694819d4..1058ad313 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue @@ -93,16 +93,36 @@ export default { return this.dialogShow && !this.$store.state.menuOperation.break; }, domIdChoose() { - return this.dialogShow ? OperationEvent.Switch.unlock.choose.domId : ''; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + return OperationEvent.Switch.unlock.choose.domId; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + return OperationEvent.Switch.unblock.choose.domId; + } + return ''; }, confirmId1() { - return this.dialogShow ? OperationEvent.Switch.unlock.confirm1.domId : ''; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + return OperationEvent.Switch.unlock.confirm1.domId; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + return OperationEvent.Switch.unblock.confirm1.domId; + } + return ''; }, confirmId2() { - return this.dialogShow ? OperationEvent.Switch.unlock.confirm2.domId : ''; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + return OperationEvent.Switch.unlock.confirm2.domId; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + return OperationEvent.Switch.unblock.confirm2.domId; + } + return ''; }, domIdConfirm() { - return this.dialogShow ? OperationEvent.Switch.unlock.confirm.domId : ''; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + return OperationEvent.Switch.unlock.confirm.domId; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + return OperationEvent.Switch.unblock.confirm.domId; + } + return ''; }, title() { if (this.operation == OperationEvent.Switch.unlock.menu.operation) { diff --git a/src/jmapNew/theme/ningbo_01/model.js b/src/jmapNew/theme/ningbo_01/model.js index 62440bda8..9ea48872d 100644 --- a/src/jmapNew/theme/ningbo_01/model.js +++ b/src/jmapNew/theme/ningbo_01/model.js @@ -21,6 +21,7 @@ class Model { transferTrackNameShow: true // 转换轨名称显示 }; this['private'][deviceType.Signal] = { + nameShow: true, // 信号机名称显示 linkageAutoRouteShow: true, // 联锁自动进路表示灯显示 atsAutoTriggerShow: true // ATS自动触发表示灯显示 }; diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue index 885311959..c09a21552 100644 --- a/src/layout/components/Entry.vue +++ b/src/layout/components/Entry.vue @@ -94,7 +94,8 @@ export default { designxty: '/xty/login', gzb: '/designgzb/login', designgzb: '/gzb/login', - hyd: '/design/login' + hyd: '/design/login', + designhyd: '/login' } }; }, @@ -131,7 +132,12 @@ export default { window.open(routeData.href, '_blank'); }, goToHelp() { - const href = 'https://joylink.club/helps/help1.pdf'; + let href = ''; + if (getSessionStorage('project').startsWith('design')) { + href = 'https://joylink.club/docs-design'; + } else { + href = 'https://joylink.club/docs'; + } window.open(href, '_blank'); }, goEmpty() {}, diff --git a/src/permission.js b/src/permission.js index a22076726..fae7dfe89 100644 --- a/src/permission.js +++ b/src/permission.js @@ -14,7 +14,7 @@ function hasPermission(roles, permissionRoles) { return roles.some(role => permissionRoles.indexOf(role) >= 0); } -const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login', '/gzb/login', '/designgzb/login', '/gzzbxy/relay', '/hyd/login']; // 不重定向白名单 +const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login', '/gzb/login', '/designgzb/login', '/gzzbxy/relay']; // 不重定向白名单 const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/]; @@ -30,17 +30,17 @@ const loginXtyPage = whiteList[2]; const loginDesignXtyPage = whiteList[3]; const loginGzbPage = whiteList[4]; const loginDesignGzbPage = whiteList[5]; -const loginHydPage = whiteList[7]; const loginDesignPageMenu = { design: loginDesignPage, designxty: loginDesignXtyPage, - designgzb: loginDesignGzbPage + designgzb: loginDesignGzbPage, + designhyd: loginDesignPage }; const loginPageMenu = { login: loginPage, xty: loginXtyPage, gzb: loginGzbPage, - hyd: loginHydPage + hyd: loginPage }; // 获取路径数据 function getRouteInfo(to) { @@ -66,14 +66,6 @@ function getRouteInfo(to) { } else if ( /^\/gzb/.test(toRoutePath)) { loginPath = loginGzbPage; clientId = null; - } else if (/^\/hyd/.test(toRoutePath)) { - if (process.env.VUE_APP_PRO === 'local') { - loginPath = loginPage; - } else { - loginPath = loginHydPage; - } - clientId = null; - } else { loginPath = loginPageMenu[current_session] || loginPath; clientId = null; @@ -135,17 +127,16 @@ router.beforeEach((to, from, next) => { handleRoute(to, from, next, routeInfo); } } else { - //继电器使用 + // 继电器使用 console.log(to); // 未登录情况下 if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入 next(); - } else if(to.path.substr(0,13) == whiteList[6]){ + } else if (to.path.substr(0, 13) == whiteList[6]) { next(); - } - else{ + } else { // 否则全部重定向到登录页 next(routeInfo.loginPath); } diff --git a/src/router/index_Common.js b/src/router/index_Common.js index e80d74501..f467a4aea 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -185,16 +185,6 @@ export const constantRoutes = [ redirect: '/gzb/login', hidden: true }, - { - path: '/hyd/login', - component: Login, - hidden: true - }, - { - path: '/hyd', - redirect: '/hyd/login', - hidden: true - }, // 设计平台登录 { path: '/design/login', diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js index f08ef89bc..8c1af282b 100644 --- a/src/scripts/ConstDic.js +++ b/src/scripts/ConstDic.js @@ -2244,7 +2244,11 @@ export const loginInfo = { }, hyd: { title: '城市轨道交通实训平台', - loginPath: '/hyd/login' + loginPath: '/login' + }, + designhyd: { + title: '城市轨道交通设计平台', + loginPath: '/design/login' } }; diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js index 32edd18d5..00ed1f075 100644 --- a/src/scripts/OperationConfig.js +++ b/src/scripts/OperationConfig.js @@ -5,18 +5,29 @@ // {id: "4", trainingType: "02", name: "进路编号"} // {id: "5", trainingType: "02", name: "信号机名称"} // {id: "6", trainingType: "02", name: "信号机编号"} + // {id: "7", trainingType: "03", name: "道岔名称"} // {id: "17", trainingType: "03", name: "道岔编码"} +// {id: "15", trainingType: "03", name: "道岔位置"} +// {id: "16", trainingType: "03", name: "道岔位置(反)"} +// {id: "21", trainingType: "03", name: "车站名称"} +// {id: "23", trainingType: "03", name: "车站编号"} +// {id: "24", trainingType: "03", name: "道岔计轴区段编号"} +// {id: "25", trainingType: "03", name: "道岔计轴区段名称"} + // {id: "8", trainingType: "04", name: "物理区段名称"} // {id: "9", trainingType: "04", name: "逻辑区段名称"} // {id: "18", trainingType: "04", name: "逻辑区段编码"} +// {id: "19", trainingType: "04", name: "区段编号"} +// {id: "20", trainingType: "04", name: "车站名称"} +// {id: "22", trainingType: "04", name: "车站编号"} + // {id: "10", trainingType: "05", name: "车站名称"} // {id: "11", trainingType: "05", name: "站台行驶方向编号"} // {id: "12", trainingType: "05", name: "站台行驶方向"} // {id: "13", trainingType: "05", name: "站台行驶方向编号(反)"} // {id: "14", trainingType: "05", name: "站台行驶方向(反)"} -// {id: "15", trainingType: "03", name: "道岔位置"} -// {id: "16", trainingType: "03", name: "道岔位置(反)"} + export const OperationList = { '01': { list: [] @@ -851,12 +862,26 @@ export const OperationList = { trainingName: '设置扣车({10}-{12} 站台)', trainingRemark: '设置扣车功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】' }, + { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】'}, { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' } ] }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0501', + skinCode: '03', + trainingName: '设置扣车({10}-{12} 站台)', + trainingRemark: '设置扣车功能', + trainingType: '05', + productTypes: ['01'], // 产品类型 01 现地 02 行调 + stepVOList: [ + { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'}, + { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【车站】', codeType:'STAND'} + ] + }, { maxDuration: 8, minDuration: 5, @@ -865,12 +890,26 @@ export const OperationList = { trainingName: '取消扣车({10}-{12} 站台)', trainingRemark: '取消扣车功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' }, + { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】'}, { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' } ] }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0502', + skinCode: '03', + trainingName: '取消扣车({10}-{12} 站台)', + trainingRemark: '取消扣车功能', + trainingType: '05', + productTypes: ['01'], // 产品类型 01 现地 02 行调 + stepVOList: [ + { deviceType: '06', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, + { deviceType: '06', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【车站】', codeType:'STAND' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -879,7 +918,7 @@ export const OperationList = { trainingName: '设置跳停({10}-{12} 站台)', trainingRemark: '设置跳停功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' } @@ -893,7 +932,7 @@ export const OperationList = { trainingName: '设置跳停({10}-{12} 站台)', trainingRemark: '设置指定001号列车跳停功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '5024', tip: '鼠标左键点击' }, @@ -909,7 +948,7 @@ export const OperationList = { trainingName: '取消跳停({10}-{12} 站台)', trainingRemark: '取消跳停功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' } @@ -923,7 +962,7 @@ export const OperationList = { trainingName: '取消跳停({10}-{12} 站台)', trainingRemark: '取消指定001号列车跳停功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '5034', tip: '鼠标左键点击' }, @@ -939,7 +978,8 @@ export const OperationList = { trainingName: '查询站台状态({10}-{12} 站台)', trainingRemark: '查询站台状态功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + // productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【站台信息】' }, { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' } @@ -1055,7 +1095,6 @@ export const OperationList = { { deviceType: '06', orderNum: 3, operateCode: '511', tip: '鼠标左键点击【确定】按钮' } ] }, - { maxDuration: 15, minDuration: 8, @@ -1064,7 +1103,7 @@ export const OperationList = { trainingName: '轨道切除({8}{9} 区段)', trainingRemark: '轨道切除功能', trainingType: '04', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【轨道切除】' }, { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' } @@ -1078,7 +1117,7 @@ export const OperationList = { trainingName: '轨道激活({8}{9} 区段)', trainingRemark: '轨道激活功能', trainingType: '04', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【轨道激活】' }, { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' } @@ -1092,12 +1131,12 @@ export const OperationList = { trainingName: '设置临时限速({8}{9} 区段)', trainingRemark: '设置临时限速功能（限速值：15）', trainingType: '04', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值15】', val: '15' }, { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, - { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' }, { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } @@ -1112,7 +1151,7 @@ export const OperationList = { trainingName: '轨道切除({7} 道岔)', trainingRemark: '轨道切除功能', trainingType: '03', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【轨道切除】' }, { deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' } @@ -1126,7 +1165,7 @@ export const OperationList = { trainingName: '轨道激活({7} 道岔)', trainingRemark: '轨道激活功能', trainingType: '03', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【轨道激活】' }, { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' } @@ -1138,9 +1177,9 @@ export const OperationList = { operateType: '0310', skinCode: '03', trainingName: '设置临时限速({7} 道岔)', - trainingRemark: '设置临时限速功能（限速值 35 零点西上行公里标0 - 零点西上行公里标3000）', + trainingRemark: '设置临时限速功能（限速值 35 ）', trainingType: '03', - productTypes: ['01', '02'], + productTypes: ['02'], // stepVOList: [ // { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' }, // { deviceType: '02', orderNum: 2, operateCode: '1131', tip: '鼠标左键选择【打开会话】' }, @@ -1165,13 +1204,68 @@ export const OperationList = { { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值35】', val: '35' }, { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' }, - { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' }, { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } ] }, - + { + maxDuration: 15, + minDuration: 8, + operateType: '0313', + skinCode: '03', + trainingName: '道岔总反({7} 道岔)', + trainingRemark: '道岔反位功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键点击【道岔总反】' }, + { deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0312', + skinCode: '03', + trainingName: '道岔总定({7} 道岔)', + trainingRemark: '道岔定位功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键点击【道岔总定】' }, + { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0301', + skinCode: '03', + trainingName: '道岔单锁({7} 道岔)', + trainingRemark: '道岔单锁功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键点击【道岔单锁】' }, + { deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0302', + skinCode: '03', + trainingName: '道岔解锁({7} 道岔)', + trainingRemark: '道岔单解功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' }, + { deviceType: '02', orderNum: 2, operateCode: '1040', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -1180,7 +1274,7 @@ export const OperationList = { trainingName: '排列进路({3} 进路)', trainingRemark: '排列进路功能', trainingType: '02', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' }, { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' }, @@ -1253,14 +1347,117 @@ export const OperationList = { trainingName: '信号重开({3} 进路)', trainingRemark: '信号重开功能', trainingType: '02', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' }, { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' } ] }, - { + maxDuration: 8, + minDuration: 5, + operateType: '0206', + skinCode: '03', + trainingName: '信号重开({3} 进路)', + trainingRemark: '信号重开功能', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '3040', tip: '鼠标左键点击【信号重开】' }, + { deviceType: '04', orderNum: 2, operateCode: '3040', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + ] + }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0211', + skinCode: '03', + trainingName: '设置自动进路({3} 进路)', + trainingRemark: '设置自动进路功能', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '3090', tip: '鼠标左键点击【自动进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '3090', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + ] + }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0212', + skinCode: '03', + trainingName: '取消自动进路({3} 进路)', + trainingRemark: '取消自动进路功能', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '3090', tip: '鼠标左键点击【自动进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '3090', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + ] + }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0215', + skinCode: '03', + trainingName: '总人解({3} 进路)', + trainingRemark: '人解进路(总人解)', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' }, + { deviceType: '04', orderNum: 2, operateCode: '3050', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + ] + }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0205', + skinCode: '03', + trainingName: '关闭信号({5} )', + trainingRemark: '关闭信号', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, + { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + ] + }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0205', + skinCode: '03', + trainingName: '取消进路({5} )', + trainingRemark: '取消进路', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, + { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + ] + }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0201', + skinCode: '03', + trainingName: '进路建立({3})', + trainingRemark: '进路建立', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【始端信号机】', codeType:'SIGNAL'}, + { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【终端信号机】', codeType:'SIGNAL'} + ] + }, + // 自动折返 (暂时没有) + // 取消自动折返 (暂时没有) + // 引导信号 (暂时没有) + // 取消引导信号 (暂时没有) + { + // 暂时没有 maxDuration: 15, minDuration: 8, operateType: '0801', @@ -1308,15 +1505,15 @@ export const OperationList = { trainingType: '02', productTypes: ['01'], stepVOList: [ - { deviceType: 'mbm', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' }, - { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', val: '{6}' }, - { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', val: '{6}' } + { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】' }, + { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', val: '{4}' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0207', + operateType: '0216', skinCode: '04', trainingName: '办理引导进路({3})', trainingRemark: '进路办理信号引导', @@ -1328,22 +1525,37 @@ export const OperationList = { { deviceType: '04', orderNum: 3, operateCode: '308', tip: '鼠标左键点击【确认】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0207', - // skinCode: '04', - // trainingName: '引导进路({3})', - // trainingRemark: '进路办理信号引导', - // trainingType: '02', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: 'mbm', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' }, - // { deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{6}' }, // 进路编号值不正确 - // { deviceType: 'mbm', orderNum: 3, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' }, - // { deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{6}' } - // ] - // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0216', + skinCode: '04', + trainingName: '引导进路({3})[进路未锁闭]', + trainingRemark: '进路办理信号引导', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】'}, // 进路编号值不正确 + { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }, + { deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{4}' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '待定', + skinCode: '04', + trainingName: '引导进路({3})[进路锁闭]', + trainingRemark: '进路办理信号引导', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{4}' }, // 进路编号值不正确 + { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -1368,8 +1580,9 @@ export const OperationList = { trainingType: '02', productTypes: ['01'], stepVOList: [ - { deviceType: 'mbm', orderNum: 1, operateCode: '3030', tip: '鼠标左键点击【总取消】' }, - { deviceType: '04', orderNum: 2, operateCode: '3030', tip: '鼠标左键点击【{5}】按钮', val: '{6}' } + { deviceType: '04', orderNum: 1, operateCode: '3030', tip: '鼠标左键点击【总取消】' }, + { deviceType: '04', orderNum: 2, operateCode: '3051', tip: '输入密码123，点击【确定】按钮' }, + { deviceType: '04', orderNum: 3, operateCode: '3030', tip: '鼠标左键点击【{5}】按钮', val: '{6}' } ] }, { @@ -1383,7 +1596,7 @@ export const OperationList = { productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【总人解】' }, - { deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮', val: '{6}' }, { deviceType: '04', orderNum: 3, operateCode: '3051', tip: '输入密码123456，点击【确定】按钮' } ] }, @@ -1397,8 +1610,8 @@ export const OperationList = { trainingType: '02', productTypes: ['01'], stepVOList: [ - { deviceType: 'mbm', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' }, - { deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' }, + { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' }, + { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' }, { deviceType: '04', orderNum: 3, operateCode: '3050', tip: '鼠标左键点击【{5}】', val: '{6}' } ] }, @@ -1412,10 +1625,24 @@ export const OperationList = { trainingType: '02', productTypes: ['02'], stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' }, + { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】', val: '{6}' }, { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' } ] }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0206', + skinCode: '04', + trainingName: '信号重开({3} 进路)', + trainingRemark: '信号重开功能', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【{5}】', val: '{6}' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -1428,7 +1655,7 @@ export const OperationList = { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' }, { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: '3061', tip: '输入密码123456，点击【确定】按钮' } + { deviceType: '04', orderNum: 3, operateCode: '3061', tip: '输入密码123，点击【确定】按钮' } ] }, { @@ -1441,7 +1668,7 @@ export const OperationList = { trainingType: '02', productTypes: ['01'], stepVOList: [ - { deviceType: 'mbm', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' }, + { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' }, { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【{5}】', val: '{6}' } ] }, @@ -1457,7 +1684,7 @@ export const OperationList = { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' }, { deviceType: '04', orderNum: 2, operateCode: '307', tip: '鼠标左键点击【确认】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: '3072', tip: '输入密码123456，点击【确认】按钮' } + { deviceType: '04', orderNum: 3, operateCode: '3072', tip: '输入密码123，点击【确认】按钮' } ] }, { @@ -1470,15 +1697,15 @@ export const OperationList = { trainingType: '02', productTypes: ['01'], stepVOList: [ - { deviceType: 'mbm', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' }, - { deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' }, + { deviceType: '04', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' }, + { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' }, { deviceType: '04', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{5}】', val: '{6}' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0208', + operateType: '0209', skinCode: '04', trainingName: '进路收人工控({5})', trainingRemark: '进路收人工控', @@ -1493,21 +1720,21 @@ export const OperationList = { { maxDuration: 15, minDuration: 8, - operateType: '0208', + operateType: '0209', skinCode: '04', trainingName: '人工控({5})', trainingRemark: '人工控', trainingType: '02', productTypes: ['01'], stepVOList: [ - { deviceType: 'mbm', orderNum: 1, operateCode: '3140', tip: '鼠标左键点击【人工控】' }, - { deviceType: '04', orderNum: 2, operateCode: '3140', tip: '鼠标左键点击【{3}】', val: '{4}' } + { deviceType: '04', orderNum: 1, operateCode: '3140', tip: '鼠标左键点击【人工控】' }, + { deviceType: '04', orderNum: 2, operateCode: '3140', tip: '鼠标左键点击【{3}】', val: '{6}' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0209', + operateType: '0208', skinCode: '04', trainingName: '进路交自动控({5})', trainingRemark: '进路交自动控', @@ -1522,7 +1749,7 @@ export const OperationList = { { maxDuration: 15, minDuration: 8, - operateType: '0209', + operateType: '0208', skinCode: '04', trainingName: '自动控({5})', trainingRemark: '自动控', @@ -1530,7 +1757,7 @@ export const OperationList = { productTypes: ['01'], stepVOList: [ { deviceType: 'mbm', orderNum: 1, operateCode: '3150', tip: '鼠标左键点击【自动控】' }, - { deviceType: '04', orderNum: 2, operateCode: '3150', tip: '鼠标左键点击【{3}】', val: '{4}' } + { deviceType: '04', orderNum: 2, operateCode: '3150', tip: '鼠标左键点击【{3}】', val: '{6}' } ] }, { @@ -1538,12 +1765,12 @@ export const OperationList = { minDuration: 8, operateType: '0210', skinCode: '04', - trainingName: '查询进路控制状态({5})', - trainingRemark: '查询进路控制状态', + trainingName: '查询进路信息({5})', + trainingRemark: '查询进路信息', trainingType: '02', productTypes: ['02'], stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' }, + { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【进路信息】' }, { deviceType: '04', orderNum: 2, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } ] }, @@ -1559,13 +1786,13 @@ export const OperationList = { productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标右键菜单选择【单操到定位】' }, - { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' } + { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮', val: '{17}' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0313', + operateType: '0312', skinCode: '04', trainingName: '单操到定位({7})', trainingRemark: '单操到定位({7})', @@ -1573,7 +1800,7 @@ export const OperationList = { productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【道岔定操】' }, - { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮', val: '{17}' } + { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】', val: '{17}' } ] }, { @@ -1587,7 +1814,7 @@ export const OperationList = { productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【单操到反位】' }, - { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' } + { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮', val: '{17}' } ] }, { @@ -1615,7 +1842,7 @@ export const OperationList = { productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' }, - { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' } + { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮', val: '{17}' } ] }, { @@ -1643,7 +1870,7 @@ export const OperationList = { productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔解锁】' }, - { deviceType: '02', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【确定】按钮' } + { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【确定】按钮', val: '{17}' } ] }, { @@ -1657,7 +1884,7 @@ export const OperationList = { productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键菜单选择【道岔解锁】' }, - { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' }, + { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】按钮', val: '{17}' } ] }, @@ -1673,7 +1900,7 @@ export const OperationList = { stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' }, { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: '1051', tip: '输入密码123456，点击【确定】按钮' } + { deviceType: '02', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' } ] }, { @@ -1702,7 +1929,7 @@ export const OperationList = { stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' }, { deviceType: '02', orderNum: 2, operateCode: '106', tip: '鼠标左键点击【确认】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: '1062', tip: '输入密码123456，点击【确认】按钮' } + { deviceType: '02', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' } ] }, { @@ -1716,7 +1943,7 @@ export const OperationList = { productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' }, - { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' }, + { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】按钮', val: '{17}' } ] }, @@ -1732,7 +1959,7 @@ export const OperationList = { stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【区故解】' }, { deviceType: '02', orderNum: 2, operateCode: '109', tip: '鼠标左键点击【确认】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: '1092', tip: '输入密码123456，点击【确认】按钮' } + { deviceType: '02', orderNum: 3, operateCode: '1092', tip: '输入密码123，点击【确认】按钮' } ] }, // 区段列表 @@ -1748,7 +1975,7 @@ export const OperationList = { stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区故解】' }, { deviceType: '03', orderNum: 2, operateCode: '402', tip: '鼠标左键点击【确认】按钮' }, - { deviceType: '03', orderNum: 3, operateCode: '4023', tip: '输入密码123456，点击【确认】按钮' } + { deviceType: '03', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' } ] }, { @@ -1761,10 +1988,10 @@ export const OperationList = { trainingType: '04', productTypes: ['01'], stepVOList: [ - { deviceType: 'mbm', orderNum: 1, operateCode: '4020', tip: '鼠标右键菜单选择【区故解】' }, - { deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' }, + { deviceType: '03', orderNum: 1, operateCode: '4020', tip: '鼠标右键菜单选择【区故解】' }, + { deviceType: '03', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{9}】', val: '{18}' }, - { deviceType: 'mbm', orderNum: 4, operateCode: '00012', tip: '鼠标左键点击【清除】' } + { deviceType: '03', orderNum: 4, operateCode: '00012', tip: '鼠标左键点击【清除】' } ] }, { @@ -1833,7 +2060,7 @@ export const OperationList = { trainingName: '设置跳停({10}-{12}站台)', trainingRemark: '设置跳停功能', trainingType: '05', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮', val: '{11}' } @@ -1847,7 +2074,7 @@ export const OperationList = { trainingName: '取消跳停({10}-{12}站台)', trainingRemark: '设置取消跳停功能', trainingType: '05', - productTypes: ['01', '02'], + productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮', val: '{11}' } @@ -2923,7 +3150,7 @@ export const OperationList = { trainingType: '03', productTypes: ['01'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, + { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' }, { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【转换定位】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } ] @@ -2952,7 +3179,7 @@ export const OperationList = { trainingType: '03', productTypes: ['01'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, + { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' }, { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【转换反位】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } ] @@ -2981,7 +3208,7 @@ export const OperationList = { trainingType: '03', productTypes: ['01'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, + { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' }, { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【单锁道岔】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } ] @@ -3010,7 +3237,7 @@ export const OperationList = { trainingType: '03', productTypes: ['01'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, + { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' }, { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【取消锁定】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } ] @@ -3039,7 +3266,7 @@ export const OperationList = { trainingType: '03', productTypes: ['01'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, + { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' }, { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【封锁道岔】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } ] @@ -3068,7 +3295,7 @@ export const OperationList = { trainingType: '03', productTypes: ['01'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, + { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' }, { deviceType: '02', orderNum: 2, operateCode: '106', tip: '鼠标左键点击【解封道岔】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } ] @@ -3078,7 +3305,7 @@ export const OperationList = { minDuration: 8, operateType: '0303', skinCode: '07', - trainingName: '区段封锁({8}{9})', + trainingName: '道岔区段封锁({7})', trainingRemark: '区段封锁功能', trainingType: '03', productTypes: ['01'], // 产品类型 01 现地 02 行调 @@ -3093,7 +3320,7 @@ export const OperationList = { minDuration: 8, operateType: '0304', skinCode: '07', - trainingName: '区段解封({8}{9})', + trainingName: '道岔区段解封({7})', trainingRemark: '区段解封功能', trainingType: '03', productTypes: ['01'], @@ -3108,7 +3335,7 @@ export const OperationList = { minDuration: 8, operateType: '0306', skinCode: '02', - trainingName: '区段故障解锁({8}{9})', + trainingName: '道岔区段故障解锁({7})', trainingRemark: '故障解锁功能', trainingType: '03', productTypes: ['01'], @@ -3373,7 +3600,7 @@ export const OperationList = { { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' }, { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机' }, { deviceType: '04', orderNum: 3, operateCode: '308', tip: '鼠标左键点击【引导进路】按钮' }, - { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【确认2】按钮' } + { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -3389,7 +3616,7 @@ export const OperationList = { { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' }, { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机' }, { deviceType: '04', orderNum: 3, operateCode: '305', tip: '鼠标左键点击【取消引导】按钮' }, - { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【确认2】按钮' } + { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -3636,7 +3863,7 @@ export const OperationList = { { maxDuration: 15, minDuration: 8, - operateType: '0516', + operateType: '0514', skinCode: '06', trainingName: '区间列车数量限制({10}-{12}站台)', trainingRemark: '区间列车数量限制', @@ -3650,7 +3877,7 @@ export const OperationList = { { maxDuration: 15, minDuration: 8, - operateType: '0517', + operateType: '0515', skinCode: '06', trainingName: '取消区间列车数量限制({10}-{12}站台)', trainingRemark: '取消区间列车数量限制', @@ -3684,13 +3911,13 @@ export const OperationList = { trainingName: '区段故障解锁({8}{9})', trainingRemark: '区段故障解锁', trainingType: '04', - productTypes: ['02'], + productTypes: ['01'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' }, { deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '' }, { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '03', orderNum: 5, operateCode: '402', tip: '鼠标左键点击【关闭】按钮' } + { deviceType: '03', orderNum: 5, operateCode: '4023', tip: '鼠标左键点击【关闭】按钮' } ] }, { @@ -3731,7 +3958,7 @@ export const OperationList = { trainingType: '04', productTypes: ['02'], stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' }, + { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值5】', val: '5' }, { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, @@ -3750,7 +3977,7 @@ export const OperationList = { trainingType: '04', productTypes: ['02'], stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' }, + { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值自动】', val: '0' }, { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, @@ -3773,54 +4000,54 @@ export const OperationList = { { deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0406', - // skinCode: '06', - // trainingName: '区段解封({8}{9})', - // trainingRemark: '区段解封功能', - // trainingType: '04', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' }, - // { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 5, operateCode: '404', tip: '鼠标左键点击【关闭】按钮' } - // ] - // }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0409', - // skinCode: '02', - // trainingName: '确认计轴有效({8}{9})', - // trainingRemark: '确认计轴有效功能', - // trainingType: '04', - // productTypes: ['02'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, - // { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, - // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, - // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, - // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } - // ] - // } + { + maxDuration: 15, + minDuration: 8, + operateType: '0406', + skinCode: '06', + trainingName: '区段解封({8}{9})', + trainingRemark: '区段解封功能', + trainingType: '04', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' }, + { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '{19}' }, + { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '4042', tip: '鼠标左键点击【关闭】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0409', + skinCode: '06', + trainingName: '确认计轴有效({8}{9})', + trainingRemark: '确认计轴有效功能', + trainingType: '04', + productTypes: ['02'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, + { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, + { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{20}', val: '{22}' }, + { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '{19}' }, + { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, - operateType: '0313', + operateType: '0312', skinCode: '06', trainingName: '定操({7})', trainingRemark: '定操({7})', trainingType: '03', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【定操】' }, - { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮' } + { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【定操】' }, + { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' } ] }, { @@ -3865,24 +4092,24 @@ export const OperationList = { { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0314', - // skinCode: '02', - // trainingName: '确认计轴有效({8}{9})', - // trainingRemark: '确认计轴有效功能', - // trainingType: '04', - // productTypes: ['02'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, - // { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, - // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, - // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, - // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } - // ] - // } + { + maxDuration: 15, + minDuration: 8, + operateType: '0314', + skinCode: '06', + trainingName: '确认计轴有效({8}{9})', + trainingRemark: '确认计轴有效功能', + trainingType: '03', + productTypes: ['02'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, + { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, + { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{21}', val: '{23}' }, + { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({25})', val: '{24}' }, + { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -3897,23 +4124,23 @@ export const OperationList = { { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0302', - // skinCode: '06', - // trainingName: '道岔单解({7})', - // trainingRemark: '道岔单解功能', - // trainingType: '03', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' }, - // { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({8}{9})区段', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【关闭】按钮' } - // ] - // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0302', + skinCode: '06', + trainingName: '道岔单解({7})', + trainingRemark: '道岔单解功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' }, + { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({7})区段', val: '{17}' }, + { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '1042', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -3928,34 +4155,34 @@ export const OperationList = { { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0304', - // skinCode: '06', - // trainingName: '道岔解封({7})', - // trainingRemark: '道岔解封功能', - // trainingType: '03', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' }, - // { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({8}{9})区段', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 5, operateCode: '106', tip: '鼠标左键点击【关闭】按钮' } - // ] - // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0304', + skinCode: '06', + trainingName: '道岔解封({7})', + trainingRemark: '道岔解封功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' }, + { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({7})区段', val: '{17}' }, + { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '1062', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, operateType: '0310', skinCode: '06', - trainingName: '道岔区段设置限速({7})', - trainingRemark: '道岔区段设置限速功能（限速值：10）', + trainingName: '设置临时限速({7})', + trainingRemark: '设置临时限速功能（限速值：10）', trainingType: '03', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' }, + { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '10' }, { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' }, @@ -3969,12 +4196,12 @@ export const OperationList = { minDuration: 8, operateType: '0310', skinCode: '06', - trainingName: '道岔区段设置限速({7})', - trainingRemark: '道岔区段设置限速功能（限速值：不限）', + trainingName: '设置临时限速({7})', + trainingRemark: '设置临时限速功能（限速值：不限）', trainingType: '03', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' }, + { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 不限】', val: '0' }, { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' }, @@ -4149,29 +4376,29 @@ export const OperationList = { trainingName: '信号封锁({5})', trainingRemark: '信号封闭', trainingType: '02', - productTypes: ['02'], + productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' }, { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0204', - // skinCode: '06', - // trainingName: '信号解封({5})', - // trainingRemark: '信号解封功能', - // trainingType: '02', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' }, - // { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({8}{9})区段', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 5, operateCode: '307', tip: '鼠标左键点击【关闭】按钮' } - // ] - // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0204', + skinCode: '06', + trainingName: '信号解封({5})', + trainingRemark: '信号解封功能', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' }, + { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({5})区段', val: '{6}' }, + { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '3072', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -4182,7 +4409,7 @@ export const OperationList = { trainingType: '02', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' }, + { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制状态】' }, { deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' } ] }, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index f767ecc9d..8f7b8b327 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -86,9 +86,9 @@ export default { CMD_SIGNAL_OPEN_AUTO_SETTING: {value:'Signal_Open_Auto_Setting', label: '进路自排开'}, /** 进路自排关 */ CMD_SIGNAL_CLOSE_AUTO_SETTING: {value:'Signal_Close_Auto_Setting', label: '进路自排关'}, - /** 设置联锁自动进路*/ // 设置/取消通过模式 + /** 设置联锁自动进路*/ // 设置通过模式 CMD_SIGNAL_SET_CI_AUTO: {value:'Signal_Set_CI_Auto', label: '设置联锁自动进路'}, - /** 取消联锁自动进路*/ + /** 取消联锁自动进路*/ // 取消通过模式 CMD_SIGNAL_CANCEL_CI_AUTO: {value:'Signal_Cancel_CI_Auto', label: '取消联锁自动进路'}, /** 设置联锁自动触发 */ CMD_SIGNAL_SET_CI_AUTO_TRIGGER: {value:'Signal_Set_CI_Auto_Trigger', label: '设置联锁自动触发'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 914dc1650..f0cd23508 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -7,6 +7,10 @@ export const OperationEvent = { operation: '000', domId: '_Tips-Cancel-Menu' }, + password: { + operation: '0001', + domId: '_Tips-Cancel-Password' + }, clearMbm: { operation: '00012', domId: '_Tips-mbm_clear{TOP}' @@ -834,6 +838,10 @@ export const OperationEvent = { menu: { operation: '309', domId: '_Tips-Signal-SetAutoInterlock-Menu' + }, + confirm: { + operation: '3091', + domId: '_Tips-Signal-SetAutoInterlock-Confirm' } }, // 取消联锁自动进路 @@ -841,6 +849,10 @@ export const OperationEvent = { menu: { operation: '310', domId: '_Tips-Signal-CancelAutoInterlock-Menu' + }, + confirm: { + operation: '3101', + domId: '_Tips-Signal-CancelAutoInterlock-Confirm' } }, // 设置联锁自动触发 @@ -848,6 +860,10 @@ export const OperationEvent = { menu: { operation: '311', domId: '_Tips-Signal-SetAutoTrigger-Menu{TOP}' + }, + confirm: { + operation: '3111', + domId: '_Tips-Signal-SetAutoTrigger-Confirm' } }, // 取消联锁自动触发 @@ -855,6 +871,10 @@ export const OperationEvent = { menu: { operation: '312', domId: '_Tips-Signal-CancelAutoTrigger-Menu{TOP}' + }, + confirm: { + operation: '3121', + domId: '_Tips-Signal-CancelAutoTrigger-Confirm' } }, // 信号关灯 @@ -928,7 +948,7 @@ export const OperationEvent = { }, menu: { operation: '318', - domId: '_Tips-Signal-cancelGuide-Menu' + domId: '_Tips-Signal-cancelGuide-Menu{TOP}' }, confirm: { operation: '3181', @@ -1540,6 +1560,10 @@ export const OperationEvent = { menu: { operation: '516', domId: '_Tips-Stand-cancelBulkBuckleTrain-Menu' + }, + choose: { + operation: '5161', + domId: '_Tips-Stand-cancelBulkBuckleTrain-Choose' } }, // 区间列车数量限制 diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js index 744c36766..d1a173922 100644 --- a/src/scripts/cmdPlugin/ValidateHandler.js +++ b/src/scripts/cmdPlugin/ValidateHandler.js @@ -50,9 +50,7 @@ class ValidateHandler { judge (operate) { const steps = Handler.getSteps(); const order = Handler.getOrder(); - let valid = false; - debugger; if (operate.over && steps.length == 1) { // 右键菜单直接发送校验 if (operate && steps[0] && operate.code == steps[0].code && diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue index 8b39259bf..47b58daa5 100644 --- a/src/views/designPlatform/demonList.vue +++ b/src/views/designPlatform/demonList.vue @@ -4,8 +4,8 @@ {{ $t('map.publishedMapList') }}
- - + +
@@ -71,7 +71,7 @@ export default { removeSessionStorage('demonList'); }, mounted() { - if (this.project === 'designxty' || this.project === 'designgzb') { + if (this.project === 'designxty' || this.project === 'designgzb' || this.project === 'designhyd') { this.refresh(); } }, diff --git a/src/views/lesson/trainingRule/list.vue b/src/views/lesson/trainingRule/list.vue index 8d179454f..73a1489c4 100644 --- a/src/views/lesson/trainingRule/list.vue +++ b/src/views/lesson/trainingRule/list.vue @@ -147,8 +147,8 @@ export default { ], actions: [ { text: this.$t('global.add'), handler: this.handleAdd }, - { text: this.$t('lesson.generation'), handler: this.handleBatchAdd}, - { text: this.$t('lesson.copy'), handler: this.handleSaveAs } + { text: this.$t('lesson.generation'), handler: this.handleBatchAdd} + // { text: this.$t('lesson.copy'), handler: this.handleSaveAs } ] }, currentModel: {} @@ -261,7 +261,7 @@ export default { this.$refs.addBatch.show(this.totals); }, - handleSaveAs() { + handleSaveAs() { // 暂时先不用 this.$refs.saveAs.show(this.$route.query.mapId); }, diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue index 2815c865b..a6cad727d 100644 --- a/src/views/lesson/trainingmanage/index.vue +++ b/src/views/lesson/trainingmanage/index.vue @@ -23,6 +23,7 @@ import { pageQueryTraining, pageQueryTrainingNew } from '@/api/jmap/training'; import { trainingNotify, trainingNotifyNew } from '@/api/simulation'; import { launchFullscreen } from '@/utils/screen'; import { getPublishMapListOnline } from '@/api/jmap/map'; +import { getOperateTrainingList } from '@/api/management/operation'; import { UrlConfig } from '@/scripts/ConstDic'; import TrainingDraft from './draft'; import localStore from 'storejs'; @@ -37,6 +38,7 @@ export default { mapIdList: [], trainingTypeList: [], trainingOperateTypeMap: {}, + trainingTypeMap: {}, pagerConfig: { pageSize: 'pageSize', pageIndex: 'pageNum' @@ -155,15 +157,12 @@ export default { } }, async created() { - await this.loadInitData(); const json = localStore.get(this.$route.path); - json.type = ''; - json.prdType = ''; - json.operateType = ''; - this.typeChoose(this.$refs.queryListPage.queryData); + await this.loadInitData(json); + this.typeChoose(json); }, methods: { - async loadInitData() { + async loadInitData(queryData) { this.mapIdList = []; this.queryForm.queryObject.prdType.config.data = []; getPublishMapListOnline().then(response => { @@ -175,9 +174,6 @@ export default { this.trainingTypeList = []; this.$Dictionary.trainingType().then(list => { this.trainingTypeList = list; - list.forEach(elem => { - this.queryForm.queryObject.type.config.data.push({ value: elem.code, label: elem.name }); - }); }); this.trainingOperateTypeMap = {}; @@ -197,18 +193,55 @@ export default { this.trainingOperateTypeMap['07'] = list07; // 列车实训 const list08 = await this.$Dictionary.limitOperation(); this.trainingOperateTypeMap['08'] = list08; // 限速实训 + await this.prdChoose(queryData); + this.reloadTable(); }, - prdChoose(form) { - form.type = ''; - form.operateType = ''; + async prdChoose(queryData) { + this.trainingTypeMap = {}; + const mapId = this.$route.query.mapId; + const res = await getOperateTrainingList({ mapId: mapId, productType: queryData.prdType }); + if (res && res.code == 200) { + const trainingTypeLists = res.data; + this.trainingTypeList.forEach(elem => { + trainingTypeLists.forEach(item => { + if (item.id == elem.code) { + item.label = elem.name; + item.value = elem.code; + } + if (this.trainingOperateTypeMap[item.id].length) { + this.trainingOperateTypeMap[item.id].forEach(i => { + item.children.forEach(v => { + if (i.code == v.id) { + v.name = i.name; + v.code = i.code; + } + }); + }); + } + }); + }); + trainingTypeLists.forEach(item => { + item.children.forEach(v => { + if (!this.trainingTypeMap[item.id]) { + this.trainingTypeMap[item.id] = []; + } + + this.trainingTypeMap[item.id].push({ + label: v.name, + value: v.code + }); + }); + }); + this.queryForm.queryObject.type.config.data = trainingTypeLists; + } }, typeChoose(form) { this.queryForm.queryObject.operateType.config.data = []; form.operateType = ''; - if (form && form.type) { - this.trainingOperateTypeMap[form.type].forEach(elem => { - this.queryForm.queryObject.operateType.config.data.push({ value: elem.code, label: elem.name }); + if (form && form.type && this.trainingTypeMap[form.type]) { + this.trainingTypeMap[form.type].forEach(elem => { + this.queryForm.queryObject.operateType.config.data.push({ value: elem.value, label: elem.label }); }); } }, diff --git a/src/views/login/hydLogin.vue b/src/views/login/hydLogin.vue index dfeb522d3..a0ff99b9a 100644 --- a/src/views/login/hydLogin.vue +++ b/src/views/login/hydLogin.vue @@ -163,7 +163,7 @@ export default { this.modelType = 'design'; this.loginClient = 'Design'; this.path = UrlConfig.design.prefix; - sessionVal = 'design'; + sessionVal = 'designhyd'; } const nowLang = LangStorage.getLang('zh'); diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 66f552b1a..34462c609 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -4,9 +4,30 @@ - + - + { + item.chargeStationCodeList || [].forEach(it => { + if (it === deviceModel.code) { + stationModel = item; + } + }); + }); + } + this.switchStationMode(stationModel.code, true); + } + } } }, async created() { @@ -565,9 +612,9 @@ export default { panel.setAttribute('style', ''); } }, - switchStationMode(val) { + switchStationMode(val, isTraining) { this.showStation = val; - this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation(this.showStation); + this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation(this.showStation, isTraining); }, setStationList(val) { this.stationList = []; diff --git a/src/views/newMap/displayNew/menuExam.vue b/src/views/newMap/displayNew/menuExam.vue index fe4150b8b..12b47d814 100644 --- a/src/views/newMap/displayNew/menuExam.vue +++ b/src/views/newMap/displayNew/menuExam.vue @@ -3,6 +3,9 @@
{{ formatUsedTime }} + + +
@@ -41,6 +44,24 @@ export default { offsetBottom: { type: Number, required: true + }, + showSelectStation: { + type: Boolean, + default() { + return false; + } + }, + stationList: { + type: Array, + default() { + return []; + } + }, + showStation: { + type: String, + default() { + return ''; + } } }, data() { @@ -152,6 +173,9 @@ export default { refresh() { this.isDisable = false; this.$store.dispatch('training/end', null); + }, + switchStationMode(val) { + this.$emit('switchStationMode', val); } } }; diff --git a/src/views/newMap/displayNew/menuLesson.vue b/src/views/newMap/displayNew/menuLesson.vue index a0d1977f9..df4991610 100644 --- a/src/views/newMap/displayNew/menuLesson.vue +++ b/src/views/newMap/displayNew/menuLesson.vue @@ -9,6 +9,9 @@ {{ formatUsedTime }} {{ $t('display.lesson.score') }}{{ formatScore }} + + +
@@ -55,6 +58,24 @@ export default { offsetBottom: { type: Number, required: true + }, + showSelectStation: { + type: Boolean, + default() { + return false; + } + }, + stationList: { + type: Array, + default() { + return []; + } + }, + showStation: { + type: String, + default() { + return ''; + } } }, data() { @@ -201,6 +222,9 @@ export default { } else { buttons.setAttribute('style', ''); } + }, + switchStationMode(val) { + this.$emit('switchStationMode', val); } } }; diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index b91244271..96f4abecd 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -376,7 +376,7 @@ export default { }); this.$jlmap.updateShowMode(list, showMode); }, - setShowStation(stationCode) { + setShowStation(stationCode, isTraining) { const nameList = Object.keys(this.$store.state.map.map); let list = []; nameList.forEach(item => { @@ -385,7 +385,7 @@ export default { } }); this.$jlmap.updateShowStation(list, stationCode); - this.setCenter(stationCode); + !isTraining && this.setCenter(stationCode); } } }; diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index 5666aade2..ae6382bcc 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -165,8 +165,8 @@ export default { mapViewLoaded(loading) { this.$refs.jlmapVisual && this.$refs.jlmapVisual.mapViewLoaded(loading); }, - setShowStation(stationCode) { - this.$refs.jlmapVisual && this.$refs.jlmapVisual.setShowStation(stationCode); + setShowStation(stationCode, isTraining) { + this.$refs.jlmapVisual && this.$refs.jlmapVisual.setShowStation(stationCode, isTraining); }, setCenter(code) { this.$refs.jlmapVisual && this.$refs.jlmapVisual.setCenter(code); diff --git a/src/views/newMap/mapsystemNew/index.vue b/src/views/newMap/mapsystemNew/index.vue index 05572f187..8b20a52a6 100644 --- a/src/views/newMap/mapsystemNew/index.vue +++ b/src/views/newMap/mapsystemNew/index.vue @@ -111,8 +111,8 @@ export default { clearSubscribe() { clearSubscribe(`${displayTopic}\/${this.group}`); }, - setShowStation(stationCode) { - this.$refs.mapCommon && this.$refs.mapCommon.setShowStation(stationCode); + setShowStation(stationCode, isTraining) { + this.$refs.mapCommon && this.$refs.mapCommon.setShowStation(stationCode, isTraining); }, setCenter(code) { this.$refs.mapCommon && this.$refs.mapCommon.setCenter(code); diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue index 8262336b7..9ad892bbe 100644 --- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue +++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue @@ -133,7 +133,7 @@ export default { const domId = OperationHandler.getDomIdByOperation(step.operation); const btnDom = document.getElementById(domId); if (btnDom) { - const offset = getDomOffset(btnDom, true); + const offset = getDomOffset(btnDom); if (offset.x == 0 && offset.y == 0) { return null; } diff --git a/static/model/station/fuzhou.FBX b/static/model/station/fuzhou.FBX index cc261796d..a6d438de3 100644 Binary files a/static/model/station/fuzhou.FBX and b/static/model/station/fuzhou.FBX differ diff --git a/static/model/station/fuzhouold.FBX b/static/model/station/fuzhouold.FBX deleted file mode 100644 index d1d35f975..000000000 Binary files a/static/model/station/fuzhouold.FBX and /dev/null differ diff --git a/static/model/station/station3.FBX b/static/model/station/station3.FBX new file mode 100644 index 000000000..15a16a8a3 Binary files /dev/null and b/static/model/station/station3.FBX differ diff --git a/static/model/station/waicestation.FBX b/static/model/station/waicestation.FBX index 1e9b07944..5cc9411c9 100644 Binary files a/static/model/station/waicestation.FBX and b/static/model/station/waicestation.FBX differ diff --git a/static/model/suidao/background1.FBX b/static/model/suidao/background1.FBX deleted file mode 100644 index 074f6ef93..000000000 Binary files a/static/model/suidao/background1.FBX and /dev/null differ diff --git a/static/model/suidao/hebsuidao.FBX b/static/model/suidao/hebsuidao.FBX new file mode 100644 index 000000000..4dcd7e249 Binary files /dev/null and b/static/model/suidao/hebsuidao.FBX differ diff --git a/static/model/suidao/hebsuidao1.FBX b/static/model/suidao/hebsuidao1.FBX new file mode 100644 index 000000000..3a11c858f Binary files /dev/null and b/static/model/suidao/hebsuidao1.FBX differ diff --git a/static/model/suidao/suidao1.FBX b/static/model/suidao/suidao1.FBX deleted file mode 100644 index 58b2e10cf..000000000 Binary files a/static/model/suidao/suidao1.FBX and /dev/null differ diff --git a/static/model/suidao/suidao2.FBX b/static/model/suidao/suidao2.FBX deleted file mode 100644 index 0d7b3d55a..000000000 Binary files a/static/model/suidao/suidao2.FBX and /dev/null differ diff --git a/static/texture/heb/Station11094.jpg b/static/texture/heb/Station11094.jpg new file mode 100644 index 000000000..a153b8959 Binary files /dev/null and b/static/texture/heb/Station11094.jpg differ diff --git a/static/texture/heb/Station11136.jpg b/static/texture/heb/Station11136.jpg new file mode 100644 index 000000000..f9171fbf5 Binary files /dev/null and b/static/texture/heb/Station11136.jpg differ diff --git a/static/texture/heb/Station17293.jpg b/static/texture/heb/Station17293.jpg new file mode 100644 index 000000000..e95024ce1 Binary files /dev/null and b/static/texture/heb/Station17293.jpg differ diff --git a/static/texture/heb/Station18398.jpg b/static/texture/heb/Station18398.jpg new file mode 100644 index 000000000..01281241e Binary files /dev/null and b/static/texture/heb/Station18398.jpg differ diff --git a/static/texture/heb/Station22163.jpg b/static/texture/heb/Station22163.jpg new file mode 100644 index 000000000..a2e170622 Binary files /dev/null and b/static/texture/heb/Station22163.jpg differ diff --git a/static/texture/heb/Station25464.jpg b/static/texture/heb/Station25464.jpg new file mode 100644 index 000000000..912503a6a Binary files /dev/null and b/static/texture/heb/Station25464.jpg differ diff --git a/static/texture/heb/Station28090.jpg b/static/texture/heb/Station28090.jpg new file mode 100644 index 000000000..b6b517cc5 Binary files /dev/null and b/static/texture/heb/Station28090.jpg differ diff --git a/static/texture/heb/Station41999.jpg b/static/texture/heb/Station41999.jpg new file mode 100644 index 000000000..98d353b8e Binary files /dev/null and b/static/texture/heb/Station41999.jpg differ diff --git a/static/texture/heb/Station44338.jpg b/static/texture/heb/Station44338.jpg new file mode 100644 index 000000000..0d30b550c Binary files /dev/null and b/static/texture/heb/Station44338.jpg differ diff --git a/static/texture/heb/Station46464.jpg b/static/texture/heb/Station46464.jpg new file mode 100644 index 000000000..61440d4a1 Binary files /dev/null and b/static/texture/heb/Station46464.jpg differ diff --git a/static/texture/heb/Station50565.jpg b/static/texture/heb/Station50565.jpg new file mode 100644 index 000000000..cff1fc865 Binary files /dev/null and b/static/texture/heb/Station50565.jpg differ diff --git a/static/texture/heb/Station5361.jpg b/static/texture/heb/Station5361.jpg new file mode 100644 index 000000000..059cae0b3 Binary files /dev/null and b/static/texture/heb/Station5361.jpg differ diff --git a/static/texture/heb/Station60068.jpg b/static/texture/heb/Station60068.jpg new file mode 100644 index 000000000..74cdbafcc Binary files /dev/null and b/static/texture/heb/Station60068.jpg differ diff --git a/static/texture/heb/Station62429.jpg b/static/texture/heb/Station62429.jpg new file mode 100644 index 000000000..a2398c7ba Binary files /dev/null and b/static/texture/heb/Station62429.jpg differ diff --git a/static/texture/heb/Station64444.jpg b/static/texture/heb/Station64444.jpg new file mode 100644 index 000000000..ce7e12f6c Binary files /dev/null and b/static/texture/heb/Station64444.jpg differ diff --git a/static/texture/heb/Station71700.jpg b/static/texture/heb/Station71700.jpg new file mode 100644 index 000000000..6771f3e67 Binary files /dev/null and b/static/texture/heb/Station71700.jpg differ diff --git a/static/texture/heb/Station72132.jpg b/static/texture/heb/Station72132.jpg new file mode 100644 index 000000000..fd35c8552 Binary files /dev/null and b/static/texture/heb/Station72132.jpg differ diff --git a/static/texture/heb/Station78164.jpg b/static/texture/heb/Station78164.jpg new file mode 100644 index 000000000..91f07f8d9 Binary files /dev/null and b/static/texture/heb/Station78164.jpg differ diff --git a/static/texture/heb/Station79537.jpg b/static/texture/heb/Station79537.jpg new file mode 100644 index 000000000..163a36183 Binary files /dev/null and b/static/texture/heb/Station79537.jpg differ diff --git a/static/texture/heb/Station82618.jpg b/static/texture/heb/Station82618.jpg new file mode 100644 index 000000000..3e11ddebe Binary files /dev/null and b/static/texture/heb/Station82618.jpg differ diff --git a/static/texture/heb/Station85520.jpg b/static/texture/heb/Station85520.jpg new file mode 100644 index 000000000..04e0b0e4b Binary files /dev/null and b/static/texture/heb/Station85520.jpg differ diff --git a/static/texture/heb/Station89483.jpg b/static/texture/heb/Station89483.jpg new file mode 100644 index 000000000..c67b4c94f Binary files /dev/null and b/static/texture/heb/Station89483.jpg differ diff --git a/static/texture/heb/Station96090.jpg b/static/texture/heb/Station96090.jpg new file mode 100644 index 000000000..eba8f84a3 Binary files /dev/null and b/static/texture/heb/Station96090.jpg differ diff --git a/static/texture/heb/haerbinlist.jpg b/static/texture/heb/haerbinlist.jpg new file mode 100644 index 000000000..a0f4d965d Binary files /dev/null and b/static/texture/heb/haerbinlist.jpg differ diff --git a/static/texture/heb/kongbai.jpg b/static/texture/heb/kongbai.jpg new file mode 100644 index 000000000..2713c81db Binary files /dev/null and b/static/texture/heb/kongbai.jpg differ