diff --git a/src/api/jlmap3d/assets3d.js b/src/api/jlmap3d/assets3d.js index f0da15610..29f647c3e 100644 --- a/src/api/jlmap3d/assets3d.js +++ b/src/api/jlmap3d/assets3d.js @@ -10,7 +10,7 @@ const publicPath = process.env.VUE_APP_PRO == 'local' ? '' : '/cbtc'; const BASE_API = getBaseUrl(); export const JL3D_LOCAL_STATIC = publicPath+"/static"; -// console.log(JL3D_LOCAL_STATIC); +console.log(JL3D_LOCAL_STATIC); let uploadurl = null; let asseturl = null; diff --git a/src/api/simulation.js b/src/api/simulation.js index 26292eb66..9b81181df 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -421,3 +421,11 @@ export function changePassengerFlowData(group, passengerFlowId) { }); } +// 哈尔滨线路（仿真行调工作站 获取 日志信息） +export function getLogList(group, params) { + return request({ + url: `/simulation/${group}/log`, + method: 'get', + params:params + }); +} diff --git a/src/jlmap3d/jl3ddrive/jl3ddrive.js b/src/jlmap3d/jl3ddrive/jl3ddrive.js index 3b6a8bc7f..dc9cc8458 100644 --- a/src/jlmap3d/jl3ddrive/jl3ddrive.js +++ b/src/jlmap3d/jl3ddrive/jl3ddrive.js @@ -94,7 +94,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj this.nowmxlen = null; this.atpspeed = null; this.atospeed = null; - this.trainnum = null; + // this.trainnum = null; this.stime = null; this.drivecount = 0; this.drivedata = null; @@ -257,12 +257,12 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj updatemmi.updateatospeed = function(atospeed) { scope.atospeed = atospeed; }; - updatemmi.updatetrainnum = function(trainnum) { - scope.trainnum = trainnum; - }; - updatemmi.updatestoptime = function(stime) { - scope.stime = stime; - }; + // updatemmi.updatetrainnum = function(trainnum) { + // scope.trainnum = trainnum; + // }; + // updatemmi.updatestoptime = function(stime) { + // scope.stime = stime; + // }; updatemmi.updatedrivedata = function(drivedata) { scope.drivecount += 1; scope.drivedata = drivedata; diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index 731cfb02a..3363b0be9 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -74,6 +74,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri if(data.body.groupNumber){ changeNowTrain(data.body); + updateDriveValue(data.body.groupNumber); } updatestatus(data.body); @@ -360,7 +361,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri updateTrainModel.rotation.y = Math.PI; let point = updateTrainModel.curve.getPointAt(data.offset); updateTrainModel.position.x = point.x; - for (let tl=0; tl<6; tl++) { + for (let tl=0; tl 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children[5].rotalist.length > 0){ + // if(updateTrainModel.children[1].rotalist.length > 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children[5].rotalist.length > 0){ - for(let rs = 1;rs<6;rs++){ + for(let rs = 1;rs=updateTrainModel.children[rs].rotalist[0].posr.x){ - if(rs != 5){ + if(rs != updateTrainModel.children.length-1){ let asd = updateTrainModel.children[rs].rotalist[0]; updateTrainModel.children[rs+1].rotalist.push(asd); @@ -433,7 +434,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } // console.log(trainmodel.rotalist); - } + // } }else{ // @@ -476,8 +477,8 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } - if(updateTrainModel.children[1].rotalist.length > 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children[5].rotalist.length > 0){ - for(let rs = 1;rs<6;rs++){ + // if(updateTrainModel.children[1].rotalist.length > 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children[5].rotalist.length > 0){ + for(let rs = 1;rs 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ - for(let rs = 1;rs<6;rs++){ + for(let rs = 1;rs=trainmodel.children[rs].rotalist[0].posr.x){ - if(rs != 5){ + if(rs != trainmodel.children.length-1){ let asd = trainmodel.children[rs].rotalist[0]; trainmodel.children[rs+1].rotalist.push(asd); @@ -748,7 +749,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ - for(let rs = 1;rs<6;rs++){ + for(let rs = 1;rs { + this.on('mouseout', () => { // 移出 !this.selectedType && !this.selected && this.line && this.line.setStyle({ stroke: this.style.Section.line.spareColor, lineWidth: this.style.Section.line.width }); + if (this.style.Switch.sectionAction.flag && this.model.relSwitchCode) { + const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode]; + const sectionC = Vue.prototype.$jlmap.mapDevice[switchModel.sectionCCode]; + if (sectionC.code == this.model.code) { + sectionC && sectionC.instance && sectionC.instance.line.setStyle({ stroke: this.style.Switch.sectionAction.spareColor }); + } + } }); - this.on('mouseover', () => { + this.on('mouseover', () => { // 移入 !this.selectedType && this.line && this.line.setStyle({ stroke: '#fbfbfb', lineWidth: this.style.Section.line.width - 0.2 }); }); } diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue index 73f2513f3..a9c413a2d 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue @@ -383,8 +383,7 @@ export default { }); }, showLogDetail() { - // this.$refs.logDetail.doShow(); - this.undeveloped(); + this.$refs.logDetail.doShow(); }, login() { if (this.loginActive) { diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/commandEnum.js b/src/jmapNew/theme/haerbin_01/menus/menuDialog/commandEnum.js new file mode 100644 index 000000000..bdadab5db --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/commandEnum.js @@ -0,0 +1,61 @@ +export default { + Signal_Set_Route:{name:'ATP进路', code:'routeCode' }, + Signal_Cancel_Route:{name:'取消ATP', code:'signalCode' }, + // Signal_Set_Route:{name:'联锁进路',}, + // Signal_Cancel_Route:{name:'取消联锁',}, + Signal_Set_Guide:{name:'引导进路', code:'routeCode' }, + Signal_Cancel_Guide:{name:'取消引导', code:'signalCode' }, + + // 道岔操作 + Switch_Block:{name:'封锁道岔', code:'switchCode' }, + Switch_Unblock:{name:'解封道岔', code:'switchCode' }, + Switch_Single_Unlock:{name:'取消锁定', code:'switchCode' }, + Switch_Single_Lock:{name:'单锁道岔', code:'switchCode' }, + Switch_Normal_Position:{name:'转换定位', code:'switchCode' }, + Switch_Reverse_Position:{name:'转换反位', code:'switchCode' }, + Switch_Section_Block:{name:'封锁区段', code:'switchCode' }, + Switch_Section_Unblock:{name:'解封区段', code:'switchCode' }, + Switch_Cancel_Limit_Speed:{name:'轨区消限', code:'switchCode' }, + Switch_Set_Limit_Speed:{name:'轨区设限', code:'switchCode', params:[{code:'speedLimitValue', name:'限速值为：'}]}, + Switch_Fault_Unlock:{name:'强解区段', code:'switchCode' }, + + // 信号机操作 + Signal_Set_CI_Auto_Trigger:{name:'追踪单开', code:'signalCode' }, + Signal_Cancel_CI_Auto_Trigger:{name:'追踪单关', code:'signalCode' }, + Signal_Open_Auto_Setting:{name:'自排单开', code:'signalCode' }, + Signal_Close_Auto_Setting:{name:'自排单关', code:'signalCode' }, + Signal_Block:{name:'封锁信号', code:'signalCode' }, + Signal_Reopen_Signal:{name:'重复开放', code:'signalCode' }, + Signal_Unblock:{name:'解封信号', code:'signalCode' }, + Signal_Close_Signal:{name:'关单信号', code:'signalCode' }, + + // 站台操作 + Stand_Set_Hold_Train:{name:'扣车', code:'standCode' }, + Stand_Cancel_Hold_Train:{name:'取消扣车', code:'standCode' }, + Stand_Set_Jump_Stop:{name:'越站', code:'standCode' }, + Stand_Cancel_Jump_Stop:{name:'取消越站', code:'standCode' }, + + // 方向杆 + Direction_Change:{name:'切换右向', code:'code' }, + // Direction_Change:{name:'切换右向', code:'signalCode' } + + // 区段操作 + Section_Block:{name:'封锁区段', code:'sectionCode' }, + Section_Unblock:{name:'解封区段', code:'sectionCode' }, + Section_Cancel_Limit_Speed:{name:'轨区消限', code:'sectionCode' }, + Section_Set_Limit_Speed:{name:'轨区设限', code:'sectionCode', params:[{code:'speedLimitValue', name:'限速值为：'}] }, + Section_Fault_Unlock:{name:'强解区段', code:'sectionCode' }, + + // 车站操作 + Station_Set_CI_Auto_Trigger:{name:'追踪全开', code:'stationCode' }, + Station_Cancel_CI_Auto_Trigger:{name:'追踪全关', code:'stationCode' }, + Station_CIArea_Close_AllSignal :{name:'关区信号', code:'stationCode' }, + Station_Open_Auto_Setting:{name:'自排全开', code:'stationCode' }, + Station_Close_Auto_Setting :{name:'自排全关', code:'stationCode' }, + Station_Close_AllSignal:{name:'关站信号', code:'stationCode' }, + + // 联锁区操作 + CM_Receive_Control:{name:'接收控制', code:'stationCode' }, + CM_Surrender_Control :{name:'交出控制', code:'stationCode' } + +}; diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue index 295893e1c..49d097474 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue @@ -18,26 +18,27 @@ value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间" /> - 查询 + 查询 - + - + @@ -45,39 +46,120 @@