diff --git a/package.json b/package.json index b8f859114..5d4ebbeda 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "stompjs": "^2.3.3", "storejs": "^1.0.25", "three": "^0.107.0", + "video.js": "^7.8.4", "vue": "^2.6.10", "vue-i18n": "^8.12.0", "vue-quill-editor": "^3.0.6", diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index 931192479..b46685f37 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -246,7 +246,7 @@ export default { async enterISCS() { try { this.disabled = true; - const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType }; + const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType, lineCode: this.courseModel.lineCode }; let res = {}; if (!this.drawWay) { res = await simulationNotify(data); @@ -254,7 +254,7 @@ export default { res = await createSimulationNew(data); } if (res && res.code == 200) { - const query = { group: res.data }; + const query = { group: res.data, lineCode:this.courseModel.lineCode }; this.$router.push({ path: `/displayIscs/system`, query: query }); } } catch (error) { diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue index 9fa66558a..baa8570f3 100644 --- a/src/views/jlmap3d/passflow/jl3dpassflow.vue +++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue @@ -1,79 +1,135 @@ @@ -129,7 +185,7 @@ export default { width: 100%; height: 100%; } - .jl3ddraw { + .jl3ddraw1{ position: absolute; float: right; top:0%; @@ -137,7 +193,53 @@ export default { width: 100%; height: 100%; z-index: 0; + } + .jl3ddraw { + position: absolute; + float: right; + top:0%; + /* left: 0; */ + width: 50%; + height: 100%; + z-index: 0; } + .jlReal3d{ + position: absolute; + top:0%; + left: 50%; + width: 50%; + height: 100%; + z-index: 0; + font-size:0; + } + .realCctv1{ + position: absolute; + width:50%; + height:50%; + left:0; + top:0; + } + .realCctv2{ + position: absolute; + width:50%; + height:50%; + left:50%; + top:0; + } + .realCctv3{ + position: absolute; + width:50%; + height:50%; + left:0; + top:50%; + } + .realCctv4{ + position: absolute; + width:50%; + height:50%; + left:50%; + top:50%; + } .station{ width:250px; height:100px; @@ -170,4 +272,7 @@ export default { left: 0; z-index: -12; } + .video-js video{ + outline: none !important; + } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 53d0178d3..87568875f 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -511,6 +511,7 @@ export default { this.$router.push({ path: `/jlmap3d/passengerflow`, query:{ mapid:resp.data.map.id, group:res.data.group, + lineCode: resp.data.map.lineCode, project: getSessionStorage('project'), projectDevice: this.$route.query.projectDevice, type: this.$route.query.type diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue index 357a1e89a..e8fe2de39 100644 --- a/src/views/newMap/displayNew/demonMenu.vue +++ b/src/views/newMap/displayNew/demonMenu.vue @@ -98,6 +98,7 @@ export default { btnWidth: 0, group:'', mapId:'', + lineCode:'', deviceShow: false, drivingShow: false, jl3dpassflow:this.$t('display.demon.passengerflow'), @@ -119,6 +120,7 @@ export default { mounted() { this.group = this.$route.query.group; this.mapId = this.$route.query.mapId; + this.lineCode = this.$route.query.lineCode; }, methods:{ menuClick() { @@ -161,7 +163,8 @@ export default { mapid:this.mapId, group:this.group, project: this.project, - noPreLogout: true + noPreLogout: true, + lineCode:this.lineCode } }); window.open(routeData.href, '_blank', 'noopener noreferrer'); diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index de11cba7b..b53a349d1 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -480,6 +480,7 @@ export default { mapid:this.mapId, group:this.group, project: this.project, + lineCode:this.lineCode, noPreLogout: true } });