From 6eafb7883c72b8f066e65ea6a4831fe354df8392 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 17 Sep 2020 13:31:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=81=93=E5=B2=94?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E6=B5=81=E7=A8=8B=EF=BC=8Cibp=E9=BC=A0?= =?UTF-8?q?=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/ibp/mouseController.js | 4 +++- src/jmapNew/config/skinCode/ningbo_03.js | 24 +++++++++---------- src/store/modules/map.js | 1 + .../newMapdraft/mapoperate/switch/create.vue | 7 ++++-- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/ibp/mouseController.js b/src/ibp/mouseController.js index 388c2e016..95ecef042 100644 --- a/src/ibp/mouseController.js +++ b/src/ibp/mouseController.js @@ -261,7 +261,9 @@ class MouseController extends Eventful { } } if (this.eventTarget.grouper) { - if (!(e.event.x <= this.boundingRect.x2 && e.event.x >= this.boundingRect.x1 && e.event.y <= this.boundingRect.y2 && e.event.y >= this.boundingRect.y1)) { + const x = e.event.x + this.$ibp.$options.offsetX; + const y = e.event.y + this.$ibp.$options.offsetY; + if (!(x <= this.boundingRect.x2 && x >= this.boundingRect.x1 && y <= this.boundingRect.y2 && y >= this.boundingRect.y1)) { this.targetView.eventTarget.close(); } } diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js index 3636be246..289fd99ae 100644 --- a/src/jmapNew/config/skinCode/ningbo_03.js +++ b/src/jmapNew/config/skinCode/ningbo_03.js @@ -16,8 +16,8 @@ class SkinCode extends defaultStyle { position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 10, // 文字离区段距离 fontSize: 12, // 字体大小 - fontWeight: 'normal', // 字体粗细 - fontColor: 'lightgreen', // 字体颜色 + fontWeight: '600', // 字体粗细 + fontColor: '#000', // 字体颜色 textAlign: 'center', // 水平对齐方式 textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 @@ -27,7 +27,7 @@ class SkinCode extends defaultStyle { position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 12, // 文字离区段距离 fontSize: 11, // 字体大小 - fontWeight: 'normal', // 字体粗细 + fontWeight: '600', // 字体粗细 fontColor: '#FFFFFF', // 字体颜色 textAlign: 'center', // 水平对齐方式 textPosition: 'inside', // 文字位置 @@ -38,8 +38,8 @@ class SkinCode extends defaultStyle { position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 24, // 文字离区段距离 fontSize: 11, // 字体大小 - fontWeight: 'normal', // 字体粗细 - fontColor: '#FFFFFF', // 字体颜色 + fontWeight: '600', // 字体粗细 + fontColor: '#000', // 字体颜色 textAlign: 'center', // 水平对齐方式 textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 @@ -49,8 +49,8 @@ class SkinCode extends defaultStyle { position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 36, // 文字离区段距离 fontSize: 11, // 字体大小 - fontWeight: 'normal', // 字体粗细 - fontColor: '#FFFFFF', // 字体颜色 + fontWeight: '600', // 字体粗细 + fontColor: '#000', // 字体颜色 textAlign: 'center', // 水平对齐方式 textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 @@ -60,8 +60,8 @@ class SkinCode extends defaultStyle { position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 36, // 文字离区段距离 fontSize: 11, // 字体大小 - fontWeight: 'normal', // 字体粗细 - fontColor: '#FFFFFF', // 字体颜色 + fontWeight: '600', // 字体粗细 + fontColor: '#000', // 字体颜色 textAlign: 'center', // 水平对齐方式 textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 @@ -71,8 +71,8 @@ class SkinCode extends defaultStyle { position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 12, // 文字离区段距离 fontSize: 11, // 字体大小 - fontWeight: 'bold', // 字体粗细 - fontColor: 'yellow', // 字体颜色 + fontWeight: '600', // 字体粗细 + fontColor: '#000', // 字体颜色 textAlign: 'center', // 水平对齐方式 textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 @@ -314,7 +314,7 @@ class SkinCode extends defaultStyle { position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 offset: { x: 5, y: -10 }, // 道岔名称与区段距离 fontSize: 12, // 字体大小 - fontColor: '#C0C0C0', // 道岔名称颜色 + fontColor: '#333', // 道岔名称颜色 fontWeight: '600', // 字体粗细 borderColor: '#FE0000', // 道岔名称边框颜色 lossColor: 'lightgreen', // 道岔名称失去颜色 diff --git a/src/store/modules/map.js b/src/store/modules/map.js index 9027755f9..d1205f20c 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -66,6 +66,7 @@ function queryDeleteModels(state, device, dict) { copyModel.isSwitchSection = false; copyModel.switchSection = false; copyModel.type = '01'; + copyModel.name = copyModel.name.split('-')[0]; dict[elem.code] = copyModel; } } diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue index e1e6aba0f..5536a683c 100644 --- a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue +++ b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue @@ -24,13 +24,16 @@ export default { const createArr = []; // 创建model列表 const changeSectionList = this.changeSectionAttr(); changeSectionList.forEach(section => { + // if (section.code == 'T449' || section.code == 'T501' || section.code == 'T502') { + // debugger; + // } if (!section.rightSectionCode) { // 右侧关联关系为空 且 道岔区段 const list = this.findSectionA(section.points[section.points.length - 1].x, section.points[section.points.length - 1].y); let sectionB = {}; let sectionC = {}; if (list.length >= 2) { list.forEach(item => { - if (item.points[1].y == section.points[section.points.length - 1].y) { // 是否水平拿第二个点判断 + if ((item.points[1].y == section.points[section.points.length - 1].y) || (item.points[1].x == section.points[section.points.length - 1].x)) { // 是否水平拿第二个点判断 sectionB = item; } else { sectionC = item; @@ -70,7 +73,7 @@ export default { let sectionC = {}; if (list.length >= 2) { list.forEach(item => { - if (item.points[item.points.length - 2].y == section.points[0].y) { // 是否水平拿倒数第二个点判断 + if ((item.points[item.points.length - 2].y == section.points[0].y) || (item.points[item.points.length - 2].x == section.points[0].x)) { // 是否水平拿倒数第二个点判断 sectionB = item; } else { sectionC = item; From e93755a29f423df5415a077da2263379d21f8a39 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 17 Sep 2020 15:19:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=20=E7=9C=9F?= =?UTF-8?q?=E5=AE=9E=E6=91=84=E5=83=8F=E5=A4=B4=E6=B7=BB=E5=8A=A0=EF=BC=88?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E8=83=BD=E6=92=AD=E6=94=BE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/views/demonstration/detail/index.vue | 4 +- src/views/jlmap3d/passflow/jl3dpassflow.vue | 241 ++++++++++++++------ src/views/login/index.vue | 1 + src/views/newMap/displayNew/demonMenu.vue | 5 +- src/views/newMap/jointTrainingNew/index.vue | 1 + 6 files changed, 182 insertions(+), 71 deletions(-) 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 } });