From 9aee2169612a48a5fc0039b09ff0580550dcde48 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 3 Aug 2020 18:59:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=93=88=E5=B0=94?= =?UTF-8?q?=E6=BB=A8=E6=93=8D=E4=BD=9C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/haerbin_01/menus/menuButton.vue | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index c16ea3daa..859a408c8 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -343,22 +343,7 @@ export default { }); this.tempData = []; this.tempData.push(this.selectedObj); - this.param = { - stationCode: this.selectedObj.code, - stationCodes: [this.selectedObj.code] - }; - // if (this.selectedObj.centralized) { - // this.param = { - // stationCode: this.selectedObj.code, - // stationCodes: [this.selectedObj.code] - // }; - // } else { - // this.stationList.forEach(station => { - // if (station.centralized && station.chargeStationCodeList.includes(this.selectedObj.code)) { - // this.param = { stationCode: station.code, stationCodes: [station.code, ...station.chargeStationCodeList] }; - // } - // }); - // } + this.param = { stationCode: this.selectedObj.code }; }, handleStandMenu() { this.centralizedStationList = new Array(15).fill({}); @@ -389,6 +374,18 @@ export default { }); this.param.routeCodeList = routeCodeList; } + if (this.cmdType == CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER || this.cmdType == CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER) { + console.log(1111); + if (this.selectedObj.centralized) { + this.param = { stationCode: this.selectedObj.code }; + } else { + this.stationList.forEach(station => { + if (station.centralized && station.chargeStationCodeList.includes(this.selectedObj.code)) { + this.param = { stationCode: station.code }; + } + }); + } + } }, command() { this.handleParam(); From bd8054bef8e045d358b9bc0569d94cb765ddceaa Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 3 Aug 2020 19:01:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/haerbin_01/menus/menuButton.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 859a408c8..2f236c606 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -375,7 +375,6 @@ export default { this.param.routeCodeList = routeCodeList; } if (this.cmdType == CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER || this.cmdType == CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER) { - console.log(1111); if (this.selectedObj.centralized) { this.param = { stationCode: this.selectedObj.code }; } else { From da39b8a1b42bfb2af1490e8f0ac412f7a0a4057f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 3 Aug 2020 19:21:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E4=B8=80?= =?UTF-8?q?=E5=8F=B7=E7=BA=BF=20=E6=95=99=E7=A0=94=E6=9C=BA=20=E5=88=87?= =?UTF-8?q?=E6=8D=A2=20=E9=80=9A=E5=8F=B7=20=E5=B1=82=E7=BA=A7=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlmap3d/maintainer/jl3dmaintainer.vue | 2 +- .../newMap/displayNew/demon/runPlanLoad.vue | 2 +- src/views/newMap/displayNew/demonChat.vue | 96 ++++++++++++++++--- src/views/newMap/displayNew/menuDemon.vue | 4 +- .../memberManage/membersManage.vue | 1 + .../newMap/jointTrainingNew/menuDemon.vue | 2 +- .../newMapdraft/mapoperate/controlLamp.vue | 6 +- 7 files changed, 92 insertions(+), 21 deletions(-) diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue index 61c43cac7..497924e0c 100644 --- a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue +++ b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue @@ -152,6 +152,7 @@ export default { // this.faultlistshow = true; const mapdata = this.$store.getters['map/map']; const dom = document.getElementById('app'); + document.querySelector('.schema').style.zIndex = 34; const project = this.$route.query.project; // console.log(project); @@ -165,7 +166,6 @@ export default { this.jlmap3d.eventon(); }, initVR:function (skinCode, group) { - const routeData = this.$router.resolve({ path:'/jlmap3d/maintainervr', query:{ diff --git a/src/views/newMap/displayNew/demon/runPlanLoad.vue b/src/views/newMap/displayNew/demon/runPlanLoad.vue index f592f87ca..1e3307a19 100644 --- a/src/views/newMap/displayNew/demon/runPlanLoad.vue +++ b/src/views/newMap/displayNew/demon/runPlanLoad.vue @@ -70,7 +70,7 @@ export default { -ms-user-select: none; user-select: none; position: absolute; - z-index: 10; + z-index: 36; top: 0px; left: 0px; width: 100%; diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue index 7437503c6..316165d06 100644 --- a/src/views/newMap/displayNew/demonChat.vue +++ b/src/views/newMap/displayNew/demonChat.vue @@ -15,13 +15,15 @@ @setScriptTip="setScriptTip" @resetCoversition="resetCoversition" /> + diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue index f75daa582..8ab6db20f 100644 --- a/src/views/newMap/displayNew/menuDemon.vue +++ b/src/views/newMap/displayNew/menuDemon.vue @@ -130,6 +130,8 @@ export default { return 'STATION_SUPERVISOR'; } else if (this.$route.query.prdType == '04') { return 'DRIVER'; + } else if (this.$route.query.prdType == '05') { + return 'DEPOT_DISPATCHER'; } else { return 'AUDIENCE'; } @@ -411,7 +413,7 @@ export default { height: 32px; overflow: hidden; padding-left: 44px; - z-index: 360; + z-index: 35; .btn_hover{ position: absolute; left: 0; diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue index bc884e559..503f0656b 100644 --- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue +++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue @@ -252,6 +252,7 @@ export default { const self = this; assignUsersPlayRoles(data, this.$route.query.group).then(resp => { this.$message.success('调整角色成员成功！'); + document.querySelector('.schema').style.zIndex = 35; }).catch(() => { self.memberData[nodeData.id].userId = ''; this.$message.error('调整角色成员失败！'); diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 697654505..19b141968 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -533,7 +533,7 @@ export default { height: 32px; overflow: hidden; padding-left: 44px; - z-index: 360; + z-index: 35; .btn_hover{ position: absolute; left: 0; diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue index 44e3e378a..992c673c7 100644 --- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue +++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue @@ -436,9 +436,9 @@ export default { case 'Axle': idPrefix = 'axle'; break; - case 'SwitchFault': - idPrefix = 'switchFault'; - break; + // case 'SwitchFault': + // idPrefix = ''; + // break; } return idPrefix; },