From 54cf4b3f97d8e17e10b9a1af7efadbf59d400408 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 17 Dec 2020 13:59:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=93=88=E5=B0=94?= =?UTF-8?q?=E6=BB=A8=E9=BC=A0=E6=A0=87=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Section/index.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index c720c4d52..c90bf65ba 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -315,10 +315,17 @@ export default class Section extends Group { } const path = window.location.href; if (path.includes('/map/draw')) { - this.on('mouseout', () => { + 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 }); }); } From c4d96ec38669b5b10250e536b191442f44614a9b Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Thu, 17 Dec 2020 15:23:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=88=97=E8=BD=A6=E5=8F=B7=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=92=8C=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BD=9B?= =?UTF-8?q?=E5=B1=B1=E5=8A=A0=E8=BD=BD=E4=B8=89=E7=BB=B4=E9=80=9A=E5=8F=B7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=97=B4=E8=B4=B4=E5=9B=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jlmap3d/assets3d.js | 2 +- src/jlmap3d/jl3ddrive/jl3ddrive.js | 14 +++--- .../jl3ddrive/moveupdate/DrivingConnectNew.js | 13 +++--- src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js | 4 +- .../jl3dmaintainer/maintainerconnect.js | 3 +- src/jlmap3d/jl3dmaintainer/maintainerload.js | 27 +++++------ src/utils/baseUrl.js | 4 +- src/views/jlmap3d/drive/jl3ddrive.vue | 46 +++++++++---------- src/views/jlmap3d/drive/sceneview/mmiview.vue | 3 +- 9 files changed, 56 insertions(+), 60 deletions(-) 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/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..dd02ee852 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); @@ -400,9 +401,9 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri // trainmodel.position.z = point.z; } - 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){ + // 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 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 -
+
@@ -88,8 +88,8 @@ export default { mmishow: false, showbuttonmsg: this.$t('jlmap3d.trainInstrumentationDisplay'), backmsg:this.$t('global.back'), - trainnum: '', - stoptimes: '', + // trainnum: '', + // stoptimes: '', dcontrolshow: false, msgshow:false, controlmsg:"不能选择其它列车", @@ -133,20 +133,20 @@ export default { } } }, - 'jlmap3d.trainnum': { - handler: function (newVal, oldVal) { - if (newVal != oldVal) { - this.trainnum = newVal; - } - } - }, - 'jlmap3d.stime': { - handler: function (newVal, oldVal) { - if (newVal != oldVal) { - this.stoptimes = newVal; - } - } - }, + // 'jlmap3d.trainnum': { + // handler: function (newVal, oldVal) { + // if (newVal != oldVal) { + // this.trainnum = newVal; + // } + // } + // }, + // 'jlmap3d.stime': { + // handler: function (newVal, oldVal) { + // if (newVal != oldVal) { + // this.stoptimes = newVal; + // } + // } + // }, 'jlmap3d.drivecount': { handler: function (newVal, oldVal) { if (newVal != oldVal) { @@ -315,11 +315,11 @@ export default { }, updatestatus(newdata){ - if(newdata.groupNumber){ - this.trainnum = newdata.groupNumber; - - updateDriveValue(this.trainnum); - } + // if(newdata.groupNumber){ + // this.trainnum = newdata.groupNumber; + // + // updateDriveValue(this.trainnum); + // } updatedoorlight(newdata); if(this.$refs.mmiui){ this.$refs.mmiui.updatetrainstatus(newdata); diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue index ed008270b..d622f7456 100644 --- a/src/views/jlmap3d/drive/sceneview/mmiview.vue +++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue @@ -219,7 +219,7 @@ export default { //更新车组号 this.updateMmiSpeedView(newdata.v,newdata.pv,newdata.tv); - + if(newdata.maLen){ this.updateMmiLen(newdata.maLen); @@ -512,7 +512,6 @@ export default { if(end){ this.endstation = end; } - }, }, beforeDestroy() { From d6b58f5ffb12105d2c85c16c566e18c5f797fb2f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 17 Dec 2020 16:24:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/simulation.js | 8 ++ .../theme/haerbin_01/menus/menuBar.vue | 3 +- .../haerbin_01/menus/menuDialog/logDetail.vue | 133 +++++++++++++++--- 3 files changed, 119 insertions(+), 25 deletions(-) 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/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/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 @@