diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index f0cf7773c..30b421e3c 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -558,7 +558,7 @@ class SkinCode extends defaultStyle { }, { type: 'HEAD', - nameFormat: 'groupNumber:targetCode' + nameFormat: 'serviceNumber:tripNumber:targetCode' } ], // 特殊列车类型需设置显示格式 lrPadding: 4, // 两边间隔 @@ -588,7 +588,9 @@ class SkinCode extends defaultStyle { targetCodePrefix: '00', // 目的地码前缀 defaultTargetCode: 'DD', // 默认目的地码 trainTargetTextAlign: 'left', // 目的地码文字显示位置 - trainNumberOffset: { x: 36, y: 4 }// 目的地码偏移量 + trainNumberOffset: { x: 36, y: 4 }, // 目的地码偏移量 + headTypeColor: '#1CBAFD', // 头码车目的地号显示颜色 + manualTypeColor: '#1CBAFD' // 人工车目的地号显示颜色 }, trainServer: { serviceNumberPrefix: '000', // 服务号(表号)前缀 @@ -603,9 +605,12 @@ class SkinCode extends defaultStyle { trainTargetTextAlign: 'right' // 车次号文字显示位置 }, trainTargetNumber: { - groupNumberPrefix: '000', // 车组号前缀 - defaultGroupNumber: 'EEE', // 默认车组号 - trainTargetNumberOffset: {x: -4, y: 4}// 车组号偏移量 + groupNumberPrefix: '00000', // 车组号前缀 + defaultGroupNumber: 'EEEEE', // 默认车组号 + trainTargetNumberOffset: {x: -4, y: 4}, // 车组号偏移量 + lineNumber: '01', // 线路号在人工车时车组号拼接线路号 + manualTypeColor: '#FA7FD7', // 人工车车组号显示颜色 + maskText: '0' // 车组号遮罩 }, trainHead: { trainConntWidth: 2, // 列车竖杠的宽度 diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 8fd829cb4..2852bc422 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -301,13 +301,6 @@ class Jlmap { (list || []).forEach(elem => { const code = elem.code; const type = elem._type; - if (elem.deviceType === 'TRAIN' && elem.type === 'HEAD') { - elem.serviceNumber = ''; - } else if (elem.deviceType === 'TRAIN' && elem.type === 'MANUAL') { - elem.serviceNumber = ''; - elem.tripNumber = ''; - elem.destinationCode = ''; - } const oDevice = this.mapDevice[code] || deviceFactory(type, elem); this.hookHandle(oDevice, elem); }); diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js index b4a218af1..6fc4e9df3 100644 --- a/src/jmapNew/shape/Train/TrainBody.js +++ b/src/jmapNew/shape/Train/TrainBody.js @@ -104,7 +104,7 @@ export default class TrainBody extends Group { ? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber) : model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; // 车次号 const targetCode = style.Train.trainNumber.targetCodePrefix + (model.destinationCode || style.Train.trainNumber.defaultTargetCode) + ''; // 目的地码 - const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; // 车组号 + const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (style.Train.trainTargetNumber.lineNumber || '') + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; // 车组号 this.textTrainServer = new ETextName({ zlevel: model.zlevel, z: model.z + 1, @@ -157,6 +157,22 @@ export default class TrainBody extends Group { textAlign: 'left', textVerticalAlign: 'top' }); + if (style.Train.trainTargetNumber.maskText) { + this.textTrainTargetNumberMask = new ETextName({ + zlevel: model.zlevel, + z: model.z + 2, + x: parseInt(model.point.x + style.Train.trainTargetNumber.trainTargetNumberOffset.x), + y: parseInt(model.point.y + style.Train.trainTargetNumber.trainTargetNumberOffset.y), + text: style.Train.trainTargetNumber.maskText, + textFill: style.trainTextColor, + textStroke: style.trainTextColor, + textStrokeWidth: 0, + fontSize: model.fontSize, + fontFamily: style.Train.common.fontFamily, + textAlign: 'left', + textVerticalAlign: 'top' + }); + } this.formatChangePosition(model, style); this.add(this.trainBodyBox); if (style.Train.common.haveTextHSDA) { @@ -338,8 +354,10 @@ export default class TrainBody extends Group { this.style.Train.trainTarget.planTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.planTypeColor}); } else if (type === 'MANUAL') { this.style.Train.trainTargetNumber.manualTypeColor && this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle({textFill: this.style.Train.trainTargetNumber.manualTypeColor}); + this.style.Train.trainNumber.headTypeColor && this.textTrainNumber && this.textTrainNumber.setStyle({textFill: this.style.Train.trainNumber.headTypeColor}); } else if (type === 'HEAD') { this.style.Train.trainTargetNumber.headTypeColor && this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle({textFill: this.style.Train.trainTargetNumber.headTypeColor}); + this.style.Train.trainNumber.headTypeColor && this.textTrainNumber && this.textTrainNumber.setStyle({textFill: this.style.Train.trainNumber.headTypeColor}); } } setSoonerOrLater(dt) { @@ -392,8 +410,10 @@ export default class TrainBody extends Group { this.add(this.textTrainTarget); } else if (ele == 'groupNumber') { !style.Train.common.fixedCoordinates && this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset)); + !style.Train.common.fixedCoordinates && this.textTrainTargetNumberMask && this.textTrainTargetNumberMask.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset)); widthText += this.textTrainTargetNumber.getBoundingRect().width; this.add(this.textTrainTargetNumber); + this.textTrainTargetNumberMask && this.add(this.textTrainTargetNumberMask); } }); } diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue index 9cc956792..9a10bf6cd 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue @@ -46,67 +46,56 @@ export default { { label: this.$t('menu.menuSwitch.switchLock'), handler: this.lock, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK }, { label: this.$t('menu.menuSwitch.switchUnlock'), handler: this.unlock, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK }, { label: this.$t('menu.menuSwitch.switchSectionBlockade'), handler: this.block, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_BLOCK }, { label: this.$t('menu.menuSwitch.switchSectionUnblock'), handler: this.unblock, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK }, { label: this.$t('menu.menuSwitch.switchTurnout'), handler: this.switchTurnout, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_TURN }, { label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'), handler: this.fault, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK }, { label: this.$t('menu.menuSwitch.switchSectionAxisPreReset'), handler: this.axlePreReset, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET }, { label: this.$t('menu.menuSwitch.sectionResection'), handler: this.split, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF }, { label: this.$t('menu.menuSwitch.sectionActive'), handler: this.active, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_ACTIVE }, { label: this.$t('menu.menuSwitch.switchSectionSetSpeedLimit'), handler: this.setSpeed, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED }, { label: this.$t('menu.menuSwitch.switchSectionCancelSpeedLimit'), handler: this.cancelSpeed, - auth: { station: true, center: false }, cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED } ], @@ -114,49 +103,41 @@ export default { { label: this.$t('menu.menuSwitch.switchLock'), handler: this.lock, - auth: { station: false, center: true }, cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK }, { label: this.$t('menu.menuSwitch.switchUnlock'), handler: this.unlock, - auth: { station: false, center: true }, cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK }, { label: this.$t('menu.menuSwitch.switchSectionBlockade'), handler: this.block, - auth: { station: false, center: true }, cmdType:CMD.Switch.CMD_SWITCH_BLOCK }, { label: this.$t('menu.menuSwitch.switchSectionUnblock'), handler: this.unblock, - auth: { station: false, center: true }, cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK }, { label: this.$t('menu.menuSwitch.switchTurnout'), handler: this.switchTurnout, - auth: { station: false, center: true }, cmdType:CMD.Switch.CMD_SWITCH_TURN }, { label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'), handler: this.fault, - auth: { station: false, center: true }, cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK }, { label: this.$t('menu.menuSwitch.sectionResection'), handler: this.split, - auth: { station: true, center: true }, cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF }, { label: this.$t('menu.menuSwitch.sectionActive'), handler: this.active, - auth: { station: true, center: true }, cmdType:CMD.Switch.CMD_SWITCH_ACTIVE }, { @@ -213,7 +194,6 @@ export default { initMenu() { // 编辑模式菜单列表 this.menu = MenuContextHandler.covert(this.menuNormal); - // this.menu = MenuContextHandler.menuFiltration(this.menuNormal); if (this.operatemode === OperateMode.ADMIN) { this.menu = [...this.menu, ...this.menuForce]; } @@ -222,8 +202,6 @@ export default { if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; } - - // this.menu = MenuContextHandler.covert(this.menu); }, doShow(point) { this.clickEvent(); @@ -255,198 +233,97 @@ export default { }, // 道岔单锁 lock() { - const step = { - start: true, - operation: OperationEvent.Switch.lock.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.lock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(step, this.selected); + this.$refs.switchControl.doShow(operate, this.selected); } }); }, // 道岔解封 unlock() { - const step = { - start: true, - operation: OperationEvent.Switch.unlock.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.unlock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchCmdControl.doShow(step, this.selected); + this.$refs.switchCmdControl.doShow(operate, this.selected); } }); }, // 道岔封锁 block() { - const step = { - start: true, - operation: OperationEvent.Switch.block.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(step, this.selected); + this.$refs.switchControl.doShow(operate, this.selected); } }); }, // 道岔解封 unblock() { - const step = { - start: true, - operation: OperationEvent.Switch.unblock.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.unblock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchCmdControl.doShow(step, this.selected); + this.$refs.switchCmdControl.doShow(operate, this.selected); } }); }, // 道岔强扳 switchTurnoutForce() { - const step = { - start: true, - operation: OperationEvent.Switch.turnoutForce.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.turnoutForce, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(step, this.selected); + this.$refs.switchControl.doShow(operate, this.selected); } }); }, // 道岔转动 switchTurnout() { - const step = { - start: true, - operation: OperationEvent.Switch.turnout.menu.operation, - param: { - Switch_Code: this.selected.code + commitOperate(menuOperate.Switch.turnout, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { + if (valid) { + this.$refs.switchControl.doShow(operate, this.selected); } - }; - - if (step.operation) { - this.$store.dispatch('training/next', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(step, this.selected); - } - }); - } + }); }, // 道岔故障解锁 fault() { - const step = { - start: true, - operation: OperationEvent.Switch.fault.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.fault, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchCmdControl.doShow(step, this.selected); + this.$refs.switchCmdControl.doShow(operate, this.selected); } }); }, // 道岔计轴预复位 axlePreReset() { - const step = { - start: true, - operation: OperationEvent.Switch.axlePreReset.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.axlePreReset, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchCmdControl.doShow(step, this.selected); + this.$refs.switchCmdControl.doShow(operate, this.selected); } }); }, // 区段切除 split() { - const step = { - start: true, - operation: OperationEvent.Switch.split.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.split, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(step, this.selected); + this.$refs.switchControl.doShow(operate, this.selected); } }); }, // 区段激活 active() { - const step = { - start: true, - operation: OperationEvent.Switch.active.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.active, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(step, this.selected); + this.$refs.switchControl.doShow(operate, this.selected); } }); }, // 道岔设置速度 setSpeed() { - const step = { - start: true, - operation: OperationEvent.Switch.setSpeed.menu.operation, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Switch.setSpeed, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.speedCmdControl.doShow(step, this.selected); + this.$refs.speedCmdControl.doShow(operate, this.selected); } }); }, // 道岔取消速度 cancelSpeed() { - const step = { - start: true, - operation: OperationEvent.Switch.cancelSpeed.menu.operation, - cmdType: CMD.Switch.CMD_CANCEL_SPEED, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid, response }) => { + commitOperate(menuOperate.Switch.cancelSpeed, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - const tempData = response.data; - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.speedCmdControl.doShow(step, this.selected, tempData); + this.$refs.speedCmdControl.doShow(operate, this.selected); } }); } diff --git a/src/jmapNew/theme/fuzhou_01/menus/utils/menuOperate.js b/src/jmapNew/theme/fuzhou_01/menus/utils/menuOperate.js index bc209942d..b354276d0 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/fuzhou_01/menus/utils/menuOperate.js @@ -153,6 +153,11 @@ export const menuOperate = { operation: OperationEvent.Switch.unblock.menu.operation, cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK }, + turnoutForce: { + // 道岔强扳 + operation: OperationEvent.Switch.turnoutForce.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN + }, turnout:{ // 道岔转动 operation: OperationEvent.Switch.turnout.menu.operation, @@ -177,6 +182,11 @@ export const menuOperate = { // 确认计轴有效 operation: OperationEvent.Switch.alxeEffective.menu.operation, cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE + }, + axlePreReset:{ + // 计轴预复位 + operation: OperationEvent.Switch.axlePreReset.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET } }, StationStand:{ diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue index cc88afa9f..f4660ec70 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue @@ -338,7 +338,7 @@ export default { }).catch(() => { this.$message.error('获取列车信息失败！'); }); - this.$store.dispatch('training/tripNumber', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 9a9d1be24..07e898bd4 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -35,12 +35,12 @@ export const loginInfo = { // 页面title & 退出登录跳转路径 loginPath: '/designgzb/login' }, hyd: { - title: '城市轨道交通综合行车模拟仿真系统', + title: '城市轨道交通综合行车模拟仿真系统V1.0', loginPath: '/login', bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273' }, designhyd: { - title: '城市轨道交通设计平台', + title: '城市轨道交通设计平台V1.0', loginPath: '/design/login', bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273' }, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index c59924e25..836771751 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -4,9 +4,9 @@ export function getBaseUrl() { // BASE_API = 'https://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://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛