From 4a1e3d0aa796b1418d05f976b4da07dde0fc1b64 Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Tue, 1 Sep 2020 11:17:29 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E7=94=B5=E5=AD=90=E6=B2=99=E7=9B=98=E5=86=85=E5=A4=96=E4=BE=A7?= =?UTF-8?q?=E7=AB=99=E5=8F=B0=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=A8bug?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A4=96=E8=BD=A6=E7=AB=99=E5=8F=B0?= =?UTF-8?q?=E6=BC=AB=E6=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jlmap3d/jl3dsimulation/jlmap3d.js | 23 +++++++++++-------- src/jlmap3d/main/loaders/SimulationLoadNew.js | 14 ++++++++++- .../main/newmodel/StationStandListN.js | 13 +++++++---- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/jlmap3d/jl3dsimulation/jlmap3d.js b/src/jlmap3d/jl3dsimulation/jlmap3d.js index 2db744224..192002b2d 100644 --- a/src/jlmap3d/jl3dsimulation/jlmap3d.js +++ b/src/jlmap3d/jl3dsimulation/jlmap3d.js @@ -420,7 +420,7 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) { } if(scope.raycasterswitch == "signal"){ - console.log(signallist); + let intersects = raycaster.intersectObjects( signallist.group.children,true); if(intersects[0]){ @@ -449,10 +449,7 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) { camerarail.progress = 0; let points = []; let stationp1 = stationstandlist.group.children[0].position; - let stationp2 = stationstandlist.group.children[20].position; - //全线漫游 - // points.push(new THREE.Vector3(stationp1.x-20,10,stationp1.z)); - // points.push(new THREE.Vector3(stationp2.x+20,10,stationp2.z)); + //站内漫游(晕) // points.push(new THREE.Vector3(stationp1.x-65,11,stationp1.z+15)); // points.push(new THREE.Vector3(stationp1.x,11,stationp1.z+15)); @@ -462,10 +459,18 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) { // points.push(new THREE.Vector3(stationp1.x+38,11,stationp1.z+2)); // points.push(new THREE.Vector3(stationp1.x+13,5,stationp1.z+2)); - points.push(new THREE.Vector3(stationp1.x-65,11,stationp1.z+12)); - points.push(new THREE.Vector3(stationp1.x+60,11,stationp1.z+12)); - points.push(new THREE.Vector3(stationp1.x+60,7,stationp1.z+12)); - points.push(new THREE.Vector3(stationp1.x-55,5,stationp1.z+12)); + if(stationstandlist.group.children[0].inside == false){ + points.push(new THREE.Vector3(stationp1.x-65,11,stationp1.z-26)); + points.push(new THREE.Vector3(stationp1.x+60,11,stationp1.z-26)); + points.push(new THREE.Vector3(stationp1.x+60,7,stationp1.z-26)); + points.push(new THREE.Vector3(stationp1.x-55,5,stationp1.z-26)); + }else{ + points.push(new THREE.Vector3(stationp1.x-65,11,stationp1.z+12)); + points.push(new THREE.Vector3(stationp1.x+60,11,stationp1.z+12)); + points.push(new THREE.Vector3(stationp1.x+60,7,stationp1.z+12)); + points.push(new THREE.Vector3(stationp1.x-55,5,stationp1.z+12)); + } + // points.push(new THREE.Vector3(stationp1.x+40,3,stationp1.z+15)); // controls.target = new THREE.Vector3(camera.position.x+1,camera.position.y,camera.position.z); // controls.update(); diff --git a/src/jlmap3d/main/loaders/SimulationLoadNew.js b/src/jlmap3d/main/loaders/SimulationLoadNew.js index 5f07c0902..487f5a3ed 100644 --- a/src/jlmap3d/main/loaders/SimulationLoadNew.js +++ b/src/jlmap3d/main/loaders/SimulationLoadNew.js @@ -46,6 +46,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce } function initnew3d(data,netdata){ + // console.log(JSON.parse(netdata.assets)); Materialload(scope,JSON.parse(netdata.assets).stationTextureList[0]); let mapdata = data; @@ -68,7 +69,18 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce let switchdata = JSON.parse(netdata.switchs); let signaldata = JSON.parse(netdata.signals); let standsdata = JSON.parse(netdata.stands); - let psddata = data.psdList; + let psddata = mapdata.psdList; + + if(standsdata[0].inside == undefined){ + for(let i=0;i Date: Tue, 1 Sep 2020 11:20:53 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 716e7c21179da096498330d79f68aedea64e5e65) --- src/views/newMap/chatView/chatBox.vue | 4 +- src/views/newMap/chatView/chatContent.vue | 82 +++++++++---------- src/views/newMap/displayNew/demonChat.vue | 52 +++++++----- .../jointTrainingNew/chatView/chatBox.vue | 28 ++++++- 4 files changed, 97 insertions(+), 69 deletions(-) diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index 2ebc567cb..d0f1a3948 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -247,7 +247,6 @@ export default { const that = this; this.recorders.stopRecording(function(blobURL) { const data = URL.createObjectURL(that.recorders.getBlob()); - console.log('--------', data); clearInterval(that.inter); that.seconds = 0; const blob = that.recorders.getBlob(); @@ -307,6 +306,9 @@ export default { }, inviteMember() { this.$refs.chatToolTip.doShow(); + }, + addAudioList(data) { + this.$refs.chatContent.addAudioList(data); } } }; diff --git a/src/views/newMap/chatView/chatContent.vue b/src/views/newMap/chatView/chatContent.vue index 3938b7cb7..df9b5d61e 100644 --- a/src/views/newMap/chatView/chatContent.vue +++ b/src/views/newMap/chatView/chatContent.vue @@ -30,12 +30,20 @@ export default { }, data() { return { - // currentAudioList:[], - // currentAudioIndex:0, - // isPlay:false, + currentAudioList:[], + currentAudioIndex:0, + isPlay:false, + isAutoPlay: false, baseUrl:process.env.VUE_APP_VOICE_API + 'audio/' }; }, + watch: { + 'currentAudioList': function(val) { + if (val.length > 0 && !this.isPlay && !this.isAutoPlay) { + this.playEachAudio(val[0].src); + } + } + }, mounted() { // this.coversition = this.currentCoversition; // this.inintData(); @@ -47,50 +55,36 @@ export default { document.querySelector('.chatcontentIn').scrollTop = scrollTop; }); }, - // playEachAudio(audioUrl) { - // this.$nextTick(function() { - // document.querySelector('#audioPlay').src = audioUrl; - // document.querySelector('#audioPlay').play(); - // const that = this; - // document.querySelector('#audioPlay').onended = function() { - // that.currentAudioList.shift(); - // console.log(that.currentAudioList.length); - // if (that.currentAudioList.length > 0) { - // that.playEachAudio(that.currentAudioList[that.currentAudioIndex]); - // } else { - // that.isPlay = false; - // } - // }; - // }); - // }, - // covertName(data, status) { - // if (status) { - // let result = ''; - // const members = data.members || this.conversitionMemberList; - // (members || []).forEach(member => { - // if (member.memberId != data.memberId) { - // result += ('@' + this.covertEachName(member.memberId)); - // } - // }); - // return result; - // } else { - // return this.covertEachName(data.memberId); - // } - // }, - // covertEachName(memberId) { - // let name = ''; - // const member = this.$store.state.training.memberData[memberId]; - // if (member && member.userId) { - // const user = this.simulationUsers[member.userId]; - // name = member.label + '(' + user.nickName + ')'; - // } else if (member) { - // name = member.label; - // } - // return name; - // }, + + playEachAudio(audioUrl) { + this.$nextTick(function() { + this.isAutoPlay = true; + document.querySelector('#audioPlay').src = this.baseUrl + audioUrl; + document.querySelector('#audioPlay').play(); + const that = this; + document.querySelector('#audioPlay').onended = function() { + that.currentAudioList.shift(); + if (that.currentAudioList.length > 0) { + that.playEachAudio(that.currentAudioList[0].src); + } else { + that.isAutoPlay = false; + } + }; + }); + }, playAudio(audioUrl) { + this.isPlay = true; document.querySelector('#audioPlay').src = audioUrl; document.querySelector('#audioPlay').play(); + const that = this; + document.querySelector('#audioPlay').onended = function() { + that.isPlay = false; + that.isAutoPlay = false; + }; + }, + addAudioList(converstion) { + this.currentAudioList.push(converstion); + this.scrollTop(); } // conversationChange() { // this.currentAudioList = []; diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue index fb696e4c8..0ff21f0fa 100644 --- a/src/views/newMap/displayNew/demonChat.vue +++ b/src/views/newMap/displayNew/demonChat.vue @@ -108,9 +108,12 @@ export default { // 创建会话 '$store.state.socket.createConversition':function(val) { if (this.memberData.length > 0) { - const member = this.memberData.find(member=>{ return member.id == val.creatorId; }); - if (member && member.userId == this.$store.state.user.id) { + const conversitionMember = this.memberData.find(member=>{ return member.userId == this.$store.state.user.id; }); + if (conversitionMember && val.memberIds.includes(conversitionMember.id)) { // 当前用户创建的会话 + if (val.creatorId !== conversitionMember.id) { + this.$message.success(this.coverName(val) + '与你开启会话'); + } this.isHasCoversition = true; this.isStartRecord = true; this.isQuitShow = true; @@ -118,6 +121,7 @@ export default { const memberList = []; val.memberIds.forEach(id=>{ if (val.creatorId == id) { + const member = this.memberData.find(member=>{ return member.id == id; }); member.connect = true; memberList.push(member); } else { @@ -177,7 +181,11 @@ export default { '$store.state.socket.conversationInfo':function (val, old) { // 仿真聊天 const simulationText = this.$store.state.socket.conversationInfo; if (val.messageType == 'MESSAGE' && (this.conversitionId == val.id || this.userRole == 'AUDIENCE')) { - this.chatContentList.push(this.addContent(simulationText.message)); + const content = this.addContent(simulationText.message); + this.chatContentList.push(content); + if (!content.self) { + this.$refs.chatbox.addAudioList(content); + } } }, // 按计划行车的列车列表更新(更新司机列表) @@ -217,23 +225,23 @@ export default { }, // 邀请会话的消息 '$store.state.socket.inviteSimulationConversition':function(val) { - const member = this.memberData.find(member=>{ return member.id == val.creatorId; }); - if (member) { - this.inviteUserName = member.label; - this.conversitionId = val.id; - member.connect = true; - member.online = true; - this.inviteUser = member; - - this.currentMemberList.push(member); - const member = this.memberData.find(member=>{ return member.id == val.memberId; }); - member.connect = true; - this.currentMemberList.push(member); - this.isStartRecord = true; - - // this.$refs.chatbox.inviteMember(); - this.$message.success(this.inviteUserName + '与你开启会话'); - } + // const conversitionMember = this.memberData.find(member=>{ return member.id == val.creatorId; }); + // if (conversitionMember) { + // this.inviteUserName = conversitionMember.label; + // this.conversitionId = val.id; + // conversitionMember.connect = true; + // conversitionMember.online = true; + // this.inviteUser = conversitionMember; + // + // this.currentMemberList.push(conversitionMember); + // const member = this.memberData.find(member=>{ return member.id == val.memberId; }); + // member.connect = true; + // this.currentMemberList.push(member); + // this.isStartRecord = true; + // this.isHasCoversition = true; + // // this.$refs.chatbox.inviteMember(); + // this.$message.success(this.inviteUserName + '与你开启会话'); + // } } }, @@ -254,6 +262,10 @@ export default { } return text; }, + coverName(inviteUser) { + const member = this.memberData.find(member=>{ return member.id == inviteUser.creatorId; }); + return member.label; + }, clearAllData() { this.resetCoversition(); this.createCoversition = true; diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue index 420ec5fad..f112dd848 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue @@ -92,7 +92,7 @@
确定
取消
- +
@@ -169,7 +169,8 @@ export default { isConversitionCreator: false, messageList: [], commonMessageList: [], - privateMessageList: [] + privateMessageList: [], + temData: [] }; }, computed:{ @@ -217,9 +218,12 @@ export default { }); }, '$store.state.socket.createConversition':function(val) { - const member = this.memberData[val.creatorId]; - if (member && member.userId == this.$store.state.user.id) { + const member = this.temData.find(member=>{ return member.userId == this.$store.state.user.id; }); + if (member && val.memberIds.includes(member.id)) { const memberList = []; + if (val.creatorId !== member.id) { + this.$message.success(this.coverName(val) + '与你开启会话'); + } val.memberIds.forEach(id=>{ if (val.creatorId == id) { memberList.push({memberId:id, connect:true}); @@ -278,6 +282,12 @@ export default { this.$refs.tree.filter(this.queryMember); } }, + '$store.state.socket.inviteSimulationConversition':function(val) { + // this.userName = this.coverName(val); + // this.conversitionId = val.id; + // this.commonConversation = false; + // this.$message.success(this.userName + '与你开启会话'); + }, '$store.state.training.simulationUserList': { handler(val, o) { this.simulationUsers = {}; @@ -361,6 +371,7 @@ export default { type: 'role', children: depotDispatcherList }]; + this.temData = [...dispatcherList, ...stationSupervisorList, ...driverList, ...maintainerList, ...depotDispatcherList]; this.initCommonMemberList(); this.$nextTick(() => { if (this.$refs.tree) { @@ -410,6 +421,15 @@ export default { this.userString = '群聊列表为空, 请选择人员'; } }, + coverName(inviteUser) { + const member = this.$store.state.training.memberData[inviteUser.creatorId]; + if (member.userId) { + const user = this.simulationUsers[member.userId]; + return member.label + '(' + user.nickName + ')'; + } else { + return member.label; + } + }, // 语音录制开始 startRecording() { this.scriptTip = ''; From 7e7a76ae6ad64387acc798a306734f3233c8e695 Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Tue, 1 Sep 2020 13:18:12 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E9=80=9A=E5=8F=B7=E8=AE=A2=E9=98=85=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jlmap3d/jl3dmaintainer/maintainerconnect.js | 4 ++++ static/workertest/driverWebWorker.js | 2 +- static/workertest/maintainerworker.js | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/jlmap3d/jl3dmaintainer/maintainerconnect.js b/src/jlmap3d/jl3dmaintainer/maintainerconnect.js index 357197b98..260a3c572 100644 --- a/src/jlmap3d/jl3dmaintainer/maintainerconnect.js +++ b/src/jlmap3d/jl3dmaintainer/maintainerconnect.js @@ -212,6 +212,10 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) { initall(event.data.body); return; } + if (event.data.type == 'Simulation_Over') { + window.close(); + return; + } }; this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails, materiallist, nowaction, scene) { diff --git a/static/workertest/driverWebWorker.js b/static/workertest/driverWebWorker.js index f02c8b6c6..abb7df713 100644 --- a/static/workertest/driverWebWorker.js +++ b/static/workertest/driverWebWorker.js @@ -687,7 +687,7 @@ function timedCount() { function callback(Response) { data = JSON.parse(Response.body); - // console.log(data); + if(data.type == "Train_Position"){ postMessage(data); diff --git a/static/workertest/maintainerworker.js b/static/workertest/maintainerworker.js index 6f3e81290..27bc3bff7 100644 --- a/static/workertest/maintainerworker.js +++ b/static/workertest/maintainerworker.js @@ -697,6 +697,7 @@ function timedCount(){ // postMessage(data.body[i]); // } // } + if(data.type == "Device_Fault_Set_3D"){ postMessage(data); return; @@ -743,7 +744,10 @@ function timedCount(){ postMessage(data); return; } - + if (data.type == 'Simulation_Over') { + postMessage(data); + return; + } } } From 5590e43bd5d39743ff74c377ee7679efc05148e5 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 1 Sep 2020 15:10:35 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Section/index.js | 18 +++++----- .../theme/fuzhou_01/menus/menuSwitch.vue | 26 +++++++------- .../theme/fuzhou_01/operationConfig.js | 34 +++++++++---------- src/store/modules/menuoperation.js | 1 + .../newMap/mapsystemNew/common/index.vue | 27 +++++++-------- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 6c8d35f16..7df9f41a9 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -789,15 +789,15 @@ export default class Section extends Group { // } // } - /** 计轴失效 13*/ - alxeFailure() { - if (this.section) { - this.section.setStyle({ - stroke: this.style.Section.axle.Failure, - lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth - }); - } - } + // /** 计轴失效 13*/ + // alxeFailure() { + // if (this.section) { + // this.section.setStyle({ + // stroke: this.style.Section.axle.Failure, + // lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth + // }); + // } + // } showRemainTime(number) { // 区段延时保护倒计时显示 this.releaseName && this.releaseName.show(); diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue index 74b305935..054249a77 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue @@ -50,37 +50,37 @@ export default { menuNormal: { Local: [ { - label: this.$t('menu.menuSwitch.switchLock'), + label: '道岔单锁', handler: this.lock, cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK }, { - label: this.$t('menu.menuSwitch.switchUnlock'), + label: '道岔单解', handler: this.unlock, cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK }, { - label: this.$t('menu.menuSwitch.switchSectionBlockade'), + label: '道岔封锁', handler: this.block, cmdType:CMD.Switch.CMD_SWITCH_BLOCK }, { - label: this.$t('menu.menuSwitch.switchSectionUnblock'), + label: '道岔解封', handler: this.unblock, cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK }, { - label: this.$t('menu.menuSwitch.switchTurnout'), + label: '道岔转动', handler: this.switchTurnout, cmdType:CMD.Switch.CMD_SWITCH_TURN }, { - label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'), + label: '道岔故障解锁', handler: this.fault, cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK }, { - label: this.$t('menu.menuSwitch.switchSectionAxisPreReset'), + label: '道岔计轴预复位', handler: this.axlePreReset, cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET }, @@ -107,32 +107,32 @@ export default { ], Center: [ { - label: this.$t('menu.menuSwitch.switchLock'), + label: '道岔单锁', handler: this.lock, cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK }, { - label: this.$t('menu.menuSwitch.switchUnlock'), + label: '道岔单解', handler: this.unlock, cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK }, { - label: this.$t('menu.menuSwitch.switchSectionBlockade'), + label: '道岔封锁', handler: this.block, cmdType:CMD.Switch.CMD_SWITCH_BLOCK }, { - label: this.$t('menu.menuSwitch.switchSectionUnblock'), + label: '道岔解封', handler: this.unblock, cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK }, { - label: this.$t('menu.menuSwitch.switchTurnout'), + label: '道岔转动', handler: this.switchTurnout, cmdType:CMD.Switch.CMD_SWITCH_TURN }, { - label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'), + label: '道岔故障解锁', handler: this.fault, cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK }, diff --git a/src/jmapNew/theme/fuzhou_01/operationConfig.js b/src/jmapNew/theme/fuzhou_01/operationConfig.js index 7a6a09b19..c43060caa 100644 --- a/src/jmapNew/theme/fuzhou_01/operationConfig.js +++ b/src/jmapNew/theme/fuzhou_01/operationConfig.js @@ -480,31 +480,31 @@ export default { { deviceType: '02', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } ] }, - { // 未生成实训 + { maxDuration: 15, minDuration: 8, - operateType: 'Switch_Section_Block', + operateType: 'Switch_Block', skinCode: '02', - trainingName: '道岔区段封闭({7})', - trainingRemark: '道岔区段封闭功能', + trainingName: '道岔封闭({7})', + trainingRemark: '道岔封闭功能', trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔区段封闭】' }, + { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封闭】' }, { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' } ] }, - { // 未生成实训 + { maxDuration: 15, minDuration: 8, - operateType: 'Switch_Section_Unblock', + operateType: 'Switch_Unblock', skinCode: '02', - trainingName: '道岔区段解封({7})', - trainingRemark: '道岔区段解封功能', + trainingName: '道岔解封({7})', + trainingRemark: '道岔解封功能', trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔区段解封】' }, + { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' }, { deviceType: '02', orderNum: 2, operateCode: '1061', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '1063', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确认2】按钮' }, @@ -547,12 +547,12 @@ export default { minDuration: 8, operateType: 'Switch_Axis_Pre_Reset', skinCode: '02', - trainingName: '道岔区段计轴预复位({7})', - trainingRemark: '道岔区段计轴预复位功能', + trainingName: '道岔计轴预复位({7})', + trainingRemark: '道岔计轴预复位功能', trainingType: 'Switch', productTypes: ['01'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '110', tip: '鼠标右键菜单选择【道岔区段计轴预复位】' }, + { deviceType: '02', orderNum: 1, operateCode: '110', tip: '鼠标右键菜单选择【道岔计轴预复位】' }, { deviceType: '02', orderNum: 2, operateCode: '1101', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '1103', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1104', tip: '鼠标左键点击【确认2】按钮' }, @@ -592,8 +592,8 @@ export default { minDuration: 8, operateType: 'Switch_Set_Limit_Speed', skinCode: '02', - trainingName: '道岔区段设置限速({7})', - trainingRemark: '道岔区段设置限速功能（限速值：5）', + trainingName: '道岔设置限速({7})', + trainingRemark: '道岔设置限速功能（限速值：5）', trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ @@ -611,8 +611,8 @@ export default { minDuration: 8, operateType: 'Switch_Cancel_Limit_Speed', skinCode: '02', - trainingName: '道岔区段取消限速({7})', - trainingRemark: '道岔区段取消限速功能', + trainingName: '道岔取消限速({7})', + trainingRemark: '道岔取消限速功能', trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ diff --git a/src/store/modules/menuoperation.js b/src/store/modules/menuoperation.js index 9c85a5e95..f52b9686a 100644 --- a/src/store/modules/menuoperation.js +++ b/src/store/modules/menuoperation.js @@ -102,6 +102,7 @@ const menuOperation = { }, setMenu: (state, menu) => { state.menu = menu; + console.log('加载菜单'); state.menuCount += 1; }, setMenuParam: (state, param) => { diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index 9b42187fc..432fd5e81 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -9,7 +9,7 @@