From eec51e7cfd0fc69b38f0283afd800853c476ace3 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 28 Jul 2020 16:41:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=93=88=E5=B0=94?= =?UTF-8?q?=E6=BB=A8=E8=BD=A6=E7=AB=99=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/haerbin_01.js | 1 + src/jmapNew/shape/Station/index.js | 50 ++++++++++++------- .../theme/haerbin_01/menus/menuButton.vue | 19 ++++--- src/scripts/cmdPlugin/CommandEnum.js | 4 +- src/scripts/cmdPlugin/MenuContextHandler.js | 6 ++- src/utils/baseUrl.js | 4 +- src/views/newMap/jointTrainingNew/index.vue | 28 +++++++++-- .../newMap/jointTrainingNew/menuDemon.vue | 10 ++-- 8 files changed, 83 insertions(+), 39 deletions(-) diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 53293dcda..187a3a90b 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -349,6 +349,7 @@ class SkinCode extends defaultStyle { lampSpace: 60 // 灯间距 }, StationControl: { + disPlayNone: true, // 不显示 text: { distance: 2, // 灯和文字之间的距离 fontSize: 11, // 字体大小 diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index 79df37d84..b09759532 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -171,20 +171,22 @@ export default class Station extends Group { } // 创建控制模式 createControlMode() { - const model = this.model; - if (model.visible && model.createControlMode) { - // 紧急站控 - this.createEmergencyControl(); + const model = this.model; + if (!this.style.Station.StationControl.disPlayNone) { + if (model.visible && model.createControlMode) { + // 紧急站控 + this.createEmergencyControl(); - // 中控按钮 - this.createCenterControl(); + // 中控按钮 + this.createCenterControl(); - // 站控按钮 - this.createSubstationControl(); + // 站控按钮 + this.createSubstationControl(); - // 联锁控 - this.createInterconnectedControl(); - } + // 联锁控 + this.createInterconnectedControl(); + } + } this.setState(model); } @@ -290,7 +292,7 @@ export default class Station extends Group { } }); this.add(this.arcBorder); - } + } } createSubstationControl() { // 站控按钮 @@ -328,7 +330,7 @@ export default class Station extends Group { }); this.add(this.substationArrowsControl); } - } + } } createInterconnectedControl() { // 联锁控 @@ -354,7 +356,10 @@ export default class Station extends Group { this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor); - this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色 + this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色 + if (this.style.Station.StationControl.disPlayNone) { + this.stationText && this.stationText.setStyle('textFill', 'green'); + } } handleLocal() { // 站控 @@ -362,7 +367,10 @@ export default class Station extends Group { this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.yellowColor); this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.lamp.yellowColor); // 文字颜色 this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor); - this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor); + this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor); + if (this.style.Station.StationControl.disPlayNone) { + this.stationText && this.stationText.setStyle('textFill', '#fff'); + } } handleEmergency() { // 紧急站控 @@ -370,7 +378,10 @@ export default class Station extends Group { this.emergencyControl && this.emergencyControl.setTextColor(this.style.Station.StationControl.lamp.redColor); // 紧急 颜色 this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor); - this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor); + this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor); + if (this.style.Station.StationControl.disPlayNone) { + this.stationText && this.stationText.setStyle('textFill', '#fff'); + } } recover() { @@ -388,7 +399,8 @@ export default class Station extends Group { // 设置状态 setState(model) { if (!this.isShowShape) return; - this.recover(); + this.recover(); + // console.log(model.controlMode, model); model.controlMode && this['handle' + model.controlMode](); if (model.tbStrategyId) { store.state.map.map.tbStrategyList.forEach(item => { @@ -398,7 +410,9 @@ export default class Station extends Group { } }); } - + if (this.style.Station.StationControl.disPlayNone && !model.controlMode) { // 没有控制时显示 黄色 + this.stationText && this.stationText.setStyle('textFill', '#FFFF00'); + } } getShapeTipPoint(opts) { diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 1435f34b9..4178a1ff0 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -118,7 +118,7 @@ export default { const step = { operation: 'click', code: this.selectedObj.code - }; + }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); @@ -332,10 +332,13 @@ export default { handleStationMenu() { this.centralizedStationList = new Array(15).fill({}); this.stationParamList.forEach((station, index) => { - this.centralizedStationList[index] = station; + this.centralizedStationList[index] = station; + if (station.disabledName) { + station.disabled = this.selectedObj[station.disabledName] == station.mode; + } }); this.tempData = []; - this.tempData.push(this.selectedObj); + this.tempData.push(this.selectedObj); if (this.selectedObj.centralized) { this.param = { @@ -345,7 +348,7 @@ export default { } else { this.stationList.forEach(station => { if (station.centralized && station.chargeStationCodeList.includes(this.selectedObj.code)) { - this.param = { stationCode: station.code, stationCodes: [station.code] }; + this.param = { stationCode: station.code, stationCodes: [station.code, ...station.chargeStationCodeList] }; } }); } @@ -399,8 +402,8 @@ export default { }, initMenus() { this.basicParamList = this.$store.state.training.prdType === '01' ? [ - { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false }, - { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false }, + { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' }, + { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'Local' }, { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, show:false, securityCommand: true }, // { name: '重启另解', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false, securityCommand: true }, { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false }, @@ -458,8 +461,8 @@ export default { this.stationParamList = this.$store.state.training.prdType === '01' ? [ { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false } ] : [ - { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false }, - { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false }, + { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' }, + { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'Local' }, { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false }, { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false }, { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false }, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index c2c498a08..2984387d7 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -59,7 +59,9 @@ export default { /** 回复站控请求（同意/拒绝） */ CMD_CM_REPLY_STATION_CONTROL: {value:'CM_Reply_Station_Control', label: '回复站控请求'}, /** 回复中控请求（同意/拒绝） */ - CMD_CM_REPLY_CENTER_CONTROL: {value:'CM_Reply_Center_Control', label: '回复中控请求'} + CMD_CM_REPLY_CENTER_CONTROL: {value:'CM_Reply_Center_Control', label: '回复中控请求'}, + CMD_CM_RECEIVE_CONTROL: {value:'CM_Receive_Control', label: '接收控制'}, + CMD_CM_SURRENDER_CONTROL: {value:'CM_Surrender_Control', label: '交出控制'}, }, // 司机操作 diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index 449f87221..b3aba610c 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -68,8 +68,10 @@ class MenuContextHandler { if (control) { if (this.getPrdType() != '' && this.getPrdType() != null) { const type = State2SimulationMap[this.getPrdType()]; - const status = State2ControlMap[control.controlMode]; // 判断当前模式 - menu = [...menuList[type]]; + const status = State2ControlMap[control.controlMode]; // 判断当前模式 + if (type) { + menu = [...menuList[type]]; + } // 特殊处理站台的右键操作( 因为小站台不允许有操作 ) if (selected._type == 'StationStand') { if (selected.small) { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 778caeb7b..c59924e25 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.6:9000'; // 旭强 + BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 5e7477031..ea269dd11 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -83,6 +83,7 @@ import { EventBus } from '@/scripts/event-bus'; import { timeFormat } from '@/utils/date'; import { Message } from 'element-ui'; import localStore from 'storejs'; +import { getToken } from '@/utils/auth'; import MembersManage from './memberManage/membersManage'; import AddMember from './memberManage/addMember'; import { computationTime } from '@/utils/date'; @@ -422,7 +423,7 @@ export default { this.hideIbp(); break; case 'DRIVER': - this.$store.dispatch('training/setPrdType', ''); + this.$store.dispatch('training/setPrdType', '04'); this.$store.dispatch('training/setRoles', 'DRIVER'); this.jl3dmaintainershow = false; break; @@ -514,10 +515,27 @@ export default { window.open(routeData.href, '_blank', 'noopener noreferrer'); }, hidepanel() { // 司机视角 - this.panelShow = false; - this.drivingShow = true; - this.ibpShow = false; - this.$refs.Jl3dDrive.show(this.mapId, this.group); + // this.panelShow = false; + // this.drivingShow = true; + // this.ibpShow = false; + // this.$refs.Jl3dDrive.show(this.mapId, this.group); + if (this.$store.state.training.prdType == '04') { + this.panelShow = false; + this.drivingShow = true; + this.$refs.Jl3dDrive.show(this.mapId, this.group); + } else { + const routeData = this.$router.resolve({ + path:'/jlmap3d/sandbox', + query:{ + mapid: this.mapId, + group: this.group, + token: getToken(), + project: this.project, + noPreLogout: true + } + }); + window.open(routeData.href, '_blank', 'noopener noreferrer'); + } }, hideIbp() { diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index cf537e07b..81d8d39c3 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -109,6 +109,7 @@ export default { }, isShowScheduling() { // 行调与管理员 可显示 + console.log(this.$store.state.training.prdType, '=====') return this.$store.state.training.prdType == '02' || this.$store.state.training.prdType == ''; }, isSpeaking() { @@ -153,7 +154,10 @@ export default { this.back(); } } - } + }, + '$store.state.training.prdType': function(prdType) { + this.change3dname(); + } }, async mounted() { this.change3dname(); @@ -192,7 +196,7 @@ export default { this.$emit('getUserRole'); break; case 'DRIVER': - this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'DRIVER'); + this.$store.dispatch('training/setPrdType', '04'); this.$store.dispatch('training/setRoles', 'DRIVER'); this.$emit('getUserRole'); break; case 'MAINTAINER': @@ -363,7 +367,7 @@ export default { }); }, change3dname() { - if (this.$route.query.prdType == '04') { + if (this.$store.state.training.prdType == '04') { this.jl3dname = this.$t('display.demon.driverPerspective'); // 司机视角 } else { this.jl3dname = this.$t('display.demon.threeDimensionalView'); // 三维视图 From ac43981c7d1db49c682320ec3b927d6b7ed36cb4 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 28 Jul 2020 16:59:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=93=88=E5=B0=94?= =?UTF-8?q?=E6=BB=A8=E8=BD=A6=E7=AB=99=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Station/index.js | 21 +++++++++-- .../theme/haerbin_01/menus/menuButton.vue | 37 +++++++++++-------- .../newMap/jointTrainingNew/menuDemon.vue | 2 +- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index b09759532..c2b3e0b80 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -359,6 +359,9 @@ export default class Station extends Group { this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色 if (this.style.Station.StationControl.disPlayNone) { this.stationText && this.stationText.setStyle('textFill', 'green'); + if (this.model.subheadDisplay) { // 副标题 + this.subheadText && this.subheadText.setStyle('textFill', 'green'); + } } } @@ -370,6 +373,9 @@ export default class Station extends Group { this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor); if (this.style.Station.StationControl.disPlayNone) { this.stationText && this.stationText.setStyle('textFill', '#fff'); + if (this.model.subheadDisplay) { // 副标题 + this.subheadText && this.subheadText.setStyle('textFill', '#fff'); + } } } @@ -381,6 +387,18 @@ export default class Station extends Group { this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor); if (this.style.Station.StationControl.disPlayNone) { this.stationText && this.stationText.setStyle('textFill', '#fff'); + if (this.model.subheadDisplay) { // 副标题 + this.subheadText && this.subheadText.setStyle('textFill', '#fff'); + } + } + } + + handleNone() { // 空 + if (this.style.Station.StationControl.disPlayNone) { // 没有控制时显示 黄色 + this.stationText && this.stationText.setStyle('textFill', '#FFFF00'); + if (this.model.subheadDisplay) { // 副标题 + this.subheadText && this.subheadText.setStyle('textFill', '#FFFF00'); + } } } @@ -410,9 +428,6 @@ export default class Station extends Group { } }); } - if (this.style.Station.StationControl.disPlayNone && !model.controlMode) { // 没有控制时显示 黄色 - this.stationText && this.stationText.setStyle('textFill', '#FFFF00'); - } } getShapeTipPoint(opts) { diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 4178a1ff0..93ec1eac1 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -339,19 +339,22 @@ export default { }); this.tempData = []; this.tempData.push(this.selectedObj); - - 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, + 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] }; + // } + // }); + // } }, handleParam() { if (this.operate == OperationEvent.Signal.cancelTrainRoute.menu.operation || this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation) { @@ -403,7 +406,7 @@ export default { initMenus() { this.basicParamList = this.$store.state.training.prdType === '01' ? [ { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' }, - { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'Local' }, + { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' }, { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, show:false, securityCommand: true }, // { name: '重启另解', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false, securityCommand: true }, { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false }, @@ -459,10 +462,12 @@ export default { { name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menu, show: false } ]; this.stationParamList = this.$store.state.training.prdType === '01' ? [ - { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false } + { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false }, + { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' }, + { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' } ] : [ { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' }, - { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'Local' }, + { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' }, { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false }, { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false }, { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false }, diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 32ee13103..85c73fe90 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -109,7 +109,7 @@ export default { }, isShowScheduling() { // 行调与管理员 可显示 - console.log(this.$store.state.training.prdType, '=====') + // console.log(this.$store.state.training.prdType, '=====') return this.$store.state.training.prdType == '02' || this.$store.state.training.prdType == ''; }, isSpeaking() { From 6ca803d06ddbf2c4f0c8ec5de82d24904a0a0141 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 28 Jul 2020 17:55:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BD=A6=E7=AB=99?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=EF=BC=8C=E5=8A=9F=E8=83=BD=E6=A0=8F=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Station/index.js | 4 ++-- src/views/newMap/displayNew/index.vue | 7 ++++--- src/views/newMap/jointTrainingNew/index.vue | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index c2b3e0b80..474dbccdb 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -358,9 +358,9 @@ export default class Station extends Group { this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor); this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色 if (this.style.Station.StationControl.disPlayNone) { - this.stationText && this.stationText.setStyle('textFill', 'green'); + this.stationText && this.stationText.setStyle('textFill', '#1fdc1f'); if (this.model.subheadDisplay) { // 副标题 - this.subheadText && this.subheadText.setStyle('textFill', 'green'); + this.subheadText && this.subheadText.setStyle('textFill', '#1fdc1f'); } } } diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 3430176a1..4b5a9a13d 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -220,7 +220,8 @@ export default { this.setMode(); }, '$store.state.app.windowSizeCount': function() { - this.setWindowSize(); + this.setWindowSize(); + this.setPosition(); }, $route() { this.initLoadData(); @@ -506,8 +507,8 @@ export default { if (menuTool) { this.offset = (menuTool.offsetHeight || 0) + 15; } - const buttonWidth = this.width - 1200; - if (menuBottom && buttonWidth < 550) { + const buttonWidth = this.width - 1200; // B box widht + if (menuBottom && buttonWidth < 780) { this.offsetBottom = (menuBottom.offsetHeight || 0) + 15; } if (menuButtonsBox) { diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index ea269dd11..05f878886 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -210,7 +210,8 @@ export default { }); }, '$store.state.app.windowSizeCount': function() { // 窗口变化 - this.setWindowSize(); + this.setWindowSize(); + this.setPosition(); }, $route() { this.initLoadData(); @@ -262,7 +263,7 @@ export default { this.offset = (menuTool.offsetHeight || 0) + 15; } const buttonWidth = this.width - 1200; - if (menuBottom && buttonWidth < 550) { + if (menuBottom && buttonWidth < 780) { this.offsetBottom = (menuBottom.offsetHeight || 0) + 15; } }); From f13ba95407c1decb13e5bc8bbe3633f219d99da0 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 28 Jul 2020 18:28:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E5=BF=AB=E6=8D=B7=E9=94=AE=EF=BC=88=E5=8C=BA?= =?UTF-8?q?=E6=AE=B5=E3=80=81=E4=BF=A1=E5=8F=B7=E6=9C=BA=E3=80=81=E8=BD=A6?= =?UTF-8?q?=E7=AB=99=EF=BC=89&=E8=AE=BE=E5=A4=87=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?cctv=E8=A7=86=E5=9B=BE=E8=AE=BE=E5=A4=87=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E4=B8=89=E7=BB=B4=E8=A7=86=E5=9B=BE&=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=85=AC=E5=85=B1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/menus/dialog/routeControl.vue | 7 ++ .../components/menus/dialog/routeDetail.vue | 7 ++ .../menus/dialog/routeHandControl.vue | 5 ++ .../menus/dialog/stationCmdControl.vue | 11 ++++ .../menus/dialog/stationHumanControlAll.vue | 7 ++ .../dialog/stationSetRouteControlAll.vue | 7 ++ .../ningbo_01/menus/dialog/alxeEffective.vue | 9 +++ .../ningbo_01/menus/dialog/routeSelection.vue | 7 ++ .../ningbo_01/menus/dialog/routeUnLock.vue | 12 ++++ .../ningbo_01/menus/dialog/routerCommand.vue | 7 ++ .../menus/dialog/speedLimitControl.vue | 13 ++++ src/store/modules/map.js | 2 +- .../jointTrainingNew/chatView/chatBox.vue | 65 ++++++++++++------- .../newMap/jointTrainingNew/menuDemon.vue | 38 +++++------ 14 files changed, 155 insertions(+), 42 deletions(-) diff --git a/src/jmapNew/theme/components/menus/dialog/routeControl.vue b/src/jmapNew/theme/components/menus/dialog/routeControl.vue index 511fe02e6..70ba9d83e 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeControl.vue @@ -110,6 +110,13 @@ export default { return ''; } }, + watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show && this.popClass === 'ningbo-01__systerm') { + this.commit(); + } + } + }, mounted() { this.$nextTick(() => { this.$store.dispatch('training/tipReload'); diff --git a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue index 2e4108377..59dbc82af 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue @@ -103,6 +103,13 @@ export default { return '查询进路状态'; } }, + watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show && this.systemName === 'ningbo-01__systerm') { + this.commit(); + } + } + }, mounted() { this.$nextTick(() => { this.$store.dispatch('training/tipReload'); diff --git a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue index 04ff39def..825d9aa77 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue @@ -146,6 +146,11 @@ export default { } }, watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show && this.systemName === 'ningbo-01__systerm' && !this.commitDisabled) { + this.commit(); + } + } }, mounted() { this.$nextTick(() => { diff --git a/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue index 520c42e2c..592ad293e 100644 --- a/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue @@ -194,6 +194,17 @@ export default { }); }, deep: true + }, + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show && this.popClass === 'ningbo-01__systerm') { + if (!this.cmdDisabled[0]) { + this.command(); + } else if (!this.cmdDisabled[1]) { + this.confirm1(); + } else if (!this.cmdDisabled[2]) { + this.confirm2(); + } + } } }, mounted() { diff --git a/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue index 973efd221..33bb492c3 100644 --- a/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue +++ b/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue @@ -64,6 +64,13 @@ export default { return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : ''; } }, + watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show && this.popClass === 'ningbo-01__systerm') { + this.commit(); + } + } + }, mounted() { this.$nextTick(() => { this.$store.dispatch('training/tipReload'); diff --git a/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue index d2715738e..600f50494 100644 --- a/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue +++ b/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue @@ -78,6 +78,13 @@ export default { return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : ''; } }, + watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show && this.popClass === 'ningbo-01__systerm') { + this.commit(); + } + } + }, mounted() { this.$nextTick(() => { this.$store.dispatch('training/tipReload'); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue index 37e5e560b..662516d7b 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue @@ -183,6 +183,15 @@ export default { } }, watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show) { + if (this.type !== 'password') { + this.commitOnce(); + } else if (this.type !== 'text') { + this.commit(); + } + } + } }, mounted() { this.$nextTick(() => { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue index 4a8051f6c..d27e84ecc 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue @@ -90,6 +90,13 @@ export default { return disabled; } }, + watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show && !this.commitDisabled) { + this.commit(); + } + } + }, mounted() { this.$nextTick(() => { this.$store.dispatch('training/tipReload'); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue index 671e435e6..bcaaf80ab 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue @@ -109,6 +109,18 @@ export default { return '解除封锁'; } }, + watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show) { + if (!this.disabledConfirm1) { + this.confirm1(); + } else if (!this.disabledConfirm2) { + this.confirm2(); + } + + } + } + }, mounted() { this.$nextTick(() => { this.$store.dispatch('training/tipReload'); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue index 96aebeafd..476a1f37e 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue @@ -70,6 +70,13 @@ export default { return ''; } }, + watch: { + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show) { + this.commit(); + } + } + }, mounted() { this.$nextTick(() => { this.$store.dispatch('training/tipReload'); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue index e7e79298c..e22db3748 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue @@ -265,6 +265,19 @@ export default { }, 'speed': function (val) { if (val) this.cmdDisabled[0] = false; + }, + '$store.state.map.keyboardEnterCount': function (val) { + if (this.show) { + if (this.$refs.confirmControlSpeed.show) { + this.$refs.confirmControlSpeed.commit(); + } else if (!this.cmdDisabled[0]) { + this.command(); + } else if (!this.cmdDisabled[1]) { + this.confirm1(); + } else if (!this.cmdDisabled[2]) { + this.confirm2(); + } + } } }, mounted() { diff --git a/src/store/modules/map.js b/src/store/modules/map.js index 14f8ffc7c..ad3952002 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -874,7 +874,7 @@ const map = { }; }, setKeyboardEnter: (state) => { - state.keyboardEnterCount++; + state.keyboardEnterCount++; } }, diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue index 917b3375a..57d183457 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue @@ -15,6 +15,16 @@
+
+ + + +
+
+ + + +
{{ userString }}
- 公共会话 创建群聊
{{ scriptTip }}
@@ -50,6 +59,21 @@
+
+ + + +
+
+ + + +
+
+ + + +
退出群聊 - 公共会话 - 成员列表 - 私有会话 发送语音
{{ scriptTip }}
@@ -205,7 +226,7 @@ export default { }); }, '$store.state.socket.createConversition':function(val) { - const member = this.memberData[val.creatorId]; + const member = this.memberData[val.creatorId]; if (member && member.userId == this.$store.state.user.id) { const memberList = []; val.memberIds.forEach(id=>{ @@ -369,23 +390,23 @@ export default { this.form = data; }, createCoversition() { - if (this.memberIdList.length) { - this.createLoading = true; - startConversition(this.group, this.memberIdList).then(resp => { - this.conversitionId = resp.data.id; - this.messageList = []; - this.privateMessageList = []; - this.userString = ''; - this.isConversitionCreator = true; - this.$message.success('创建会话成功！'); - this.createLoading = false; - }).catch((error) => { - this.$message.error(error.code == '3005' ? '创建会话失败:仿真会话成员忙线中！' : '创建仿真失败！'); - this.createLoading = false; - }); - } else { - this.userString = '群聊列表为空, 请选择人员'; - } + if (this.memberIdList.length) { + this.createLoading = true; + startConversition(this.group, this.memberIdList).then(resp => { + this.conversitionId = resp.data.id; + this.messageList = []; + this.privateMessageList = []; + this.userString = ''; + this.isConversitionCreator = true; + this.$message.success('创建会话成功！'); + this.createLoading = false; + }).catch((error) => { + this.$message.error(error.code == '3005' ? '创建会话失败:仿真会话成员忙线中！' : '创建仿真失败！'); + this.createLoading = false; + }); + } else { + this.userString = '群聊列表为空, 请选择人员'; + } }, // 语音录制开始 startRecording() { diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 3346f471a..502e021c9 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -7,11 +7,11 @@ 成员管理 生成二维码 - + {{ $t('display.demon.passengerflow') }} - + {{ jl3dname }} - + {{ $t('display.demon.deviceView') }}