diff --git a/src/assets/icon/favicon_hls.png b/src/assets/icon/favicon_hls.png new file mode 100644 index 000000000..624eab368 Binary files /dev/null and b/src/assets/icon/favicon_hls.png differ diff --git a/src/assets/icon/link_hls.png b/src/assets/icon/link_hls.png new file mode 100644 index 000000000..18086d7aa Binary files /dev/null and b/src/assets/icon/link_hls.png differ diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js index 2f374b62f..7a34dba2a 100644 --- a/src/i18n/langs/en/map.js +++ b/src/i18n/langs/en/map.js @@ -76,6 +76,7 @@ export default { temporaryLimit: 'temporary speed restriction', lcControl: 'Lc control', image: 'image', + floodGate: 'flood gate', station: 'station', controlMode: 'control mode', platform: 'platform', diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index 5eec4774c..fc0e2b613 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -53,6 +53,7 @@ export default { lcControl: 'Lc控制', buttonControl: '按钮', image: '图片', + floodGate: '防淹门', station: '车站', controlMode: '控制模式', platform: '站台', diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index 6f6bcb2d9..eaddf5e58 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -732,6 +732,7 @@ class SkinCode extends defaultStyle { defaultServerNoColor: '#FFFFFF' // 默认服务号状态显示颜色 } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index 28bdfa2f1..81e3e226b 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -658,6 +658,7 @@ class SkinCode extends defaultStyle { ] // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index ad443b206..cb37c89b2 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -842,6 +842,7 @@ class SkinCode extends defaultStyle { ] // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js index 82eb40cb9..b16d70698 100644 --- a/src/jmapNew/config/skinCode/foshan_01.js +++ b/src/jmapNew/config/skinCode/foshan_01.js @@ -686,6 +686,7 @@ class SkinCode extends defaultStyle { serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'} } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index 77b3dca41..98f19ce10 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -690,6 +690,7 @@ class SkinCode extends defaultStyle { serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'} } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index f51223659..51ed1aeca 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -748,6 +748,7 @@ class SkinCode extends defaultStyle { serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'} } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index fd349a3ac..b0cc2db2d 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -756,6 +756,7 @@ class SkinCode extends defaultStyle { ] // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js index 44de6c666..bdc084e2f 100644 --- a/src/jmapNew/config/skinCode/ningbo_03.js +++ b/src/jmapNew/config/skinCode/ningbo_03.js @@ -791,6 +791,15 @@ class SkinCode extends defaultStyle { ] // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL } }; + this[deviceType.FloodGate] = { + displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） + lineWidth: 2, // 防淹门描边宽度 + spareStrokeColor: '#000', // 打开并锁闭-非打开并锁闭描边颜色 + spareFillColor: 'rgba(0, 0, 0, 0)', // 打开并锁闭填充颜色 + closeFillColor: '#C10000', // 非打开并锁闭填充颜色 + allowCloseFillColor: '#FF0000', // 允许关门填充颜色 + allowCLoseStrokeColor: '#FFFF00' // 允许关门描边颜色 + }; } } diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js index 12b3df026..f3b5408ba 100644 --- a/src/jmapNew/config/skinCode/xian_01.js +++ b/src/jmapNew/config/skinCode/xian_01.js @@ -748,6 +748,7 @@ class SkinCode extends defaultStyle { serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'} } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js index bbd711b68..e963637ca 100644 --- a/src/jmapNew/config/skinCode/xian_02.js +++ b/src/jmapNew/config/skinCode/xian_02.js @@ -828,6 +828,7 @@ class SkinCode extends defaultStyle { ] // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL } }; + this[deviceType.FloodGate] = {}; } } diff --git a/src/jmapNew/constant/deviceRender.js b/src/jmapNew/constant/deviceRender.js index 8dd6ddd85..34e61a9e1 100644 --- a/src/jmapNew/constant/deviceRender.js +++ b/src/jmapNew/constant/deviceRender.js @@ -260,4 +260,8 @@ deviceRender[deviceType.OverAp] = { _type: deviceType.OverAp, zlevel: 1 }; +deviceRender[deviceType.FloodGate] = { + _type: deviceType.FloodGate, + zlevel: 1 +}; export default deviceRender; diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js index fc28859b7..9522060aa 100644 --- a/src/jmapNew/constant/deviceState.js +++ b/src/jmapNew/constant/deviceState.js @@ -136,7 +136,9 @@ deviceState[deviceType.StationStand] = { /** 是否故障*/ fault: 0 /** 非故障*/ }; - +deviceState[deviceType.FloodGate] = { + /** 防淹门状态 */ +}; deviceState[deviceType.Train] = { // /** 列车类型*/ // type: { diff --git a/src/jmapNew/constant/deviceType.js b/src/jmapNew/constant/deviceType.js index b4a2810be..3e5ff24fb 100644 --- a/src/jmapNew/constant/deviceType.js +++ b/src/jmapNew/constant/deviceType.js @@ -45,7 +45,8 @@ const deviceType = { Arrow: 'Arrow', Power: 'Power', StationTurnBack: 'StationTurnBack', - OverAp: 'OverAp' + OverAp: 'OverAp', + FloodGate: 'FloodGate' }; export default deviceType; diff --git a/src/jmapNew/constant/stateTransition.js b/src/jmapNew/constant/stateTransition.js index 0a4c620a7..5e1b95c15 100644 --- a/src/jmapNew/constant/stateTransition.js +++ b/src/jmapNew/constant/stateTransition.js @@ -121,6 +121,9 @@ class Status { handleStationTurnBack(device) { this.statusObj = { }; } + handleFloodGate(device) { + this.statusObj = { }; + } getStatus() { return this.statusObj; } diff --git a/src/jmapNew/shape/FloodGate/index.js b/src/jmapNew/shape/FloodGate/index.js new file mode 100644 index 000000000..9457a382d --- /dev/null +++ b/src/jmapNew/shape/FloodGate/index.js @@ -0,0 +1,84 @@ +/* +* 防淹门 +*/ +import Group from 'zrender/src/container/Group'; +import Rect from 'zrender/src/graphic/shape/Rect'; +import {isShowThePrdType} from '../../utils/handlePath'; + +export default class FloodGate extends Group { + constructor(model, style) { + super(); + this.z = 20; + this._code = model.code; + this._type = model._type; + this.zlevel = model.zlevel; + this.z = model.z; + this.model = model; + this.style = style; + this.isShowShape = true; + if (isShowThePrdType(model.prdType, style.FloodGate.displayCondition) || model.previewOrMapDraw) { + this.create(); + this.createMouseEvent(); + this.setState(model); + } + if (model.previewOrMapDraw) { + this.setShowMode(); + } + } + + create() { + this.floodGate = new Rect({ + zlevel: this.zlevel, + z: this.z, + shape: { + x: this.model.position.x, + y: this.model.position.y, + width: this.model.width, + height: this.model.height + }, + style: { + lineWidth: this.style.FloodGate.lineWidth, + stroke: this.style.FloodGate.spareStrokeColor, + fill: this.style.FloodGate.spareFillColor + } + }); + this.add(this.floodGate); + } + recover() { + this.floodGate.setStyle({ stroke: this.style.FloodGate.spareStrokeColor, fill: this.style.FloodGate.spareFillColor }); + } + // 设置状态 + setState(model) { + if (!this.isShowShape) return; + this.recover(); + } + + createMouseEvent() { + } + + setShowMode() { + const showMode = this.model.showMode; + const showConditions = this.style.FloodGate.displayCondition; + if (!showConditions || showConditions === '01' || showMode === showConditions) { + this.showMode(); + } else { + this.hideMode(); + } + } + setShowStation(stationCode) { + if (!stationCode || this.model.stationCode === stationCode) { + this.isShowShape = true; + this.showMode(); + } else { + this.isShowShape = false; + this.hideMode(); + } + } + showMode() { + this.floodGate && this.floodGate.show(); + this.setState(this.model); + } + hideMode() { + this.floodGate && this.floodGate.hide(); + } +} diff --git a/src/jmapNew/shape/Section/ELines.js b/src/jmapNew/shape/Section/ELines.js index 09b415431..bf3bcb59c 100644 --- a/src/jmapNew/shape/Section/ELines.js +++ b/src/jmapNew/shape/Section/ELines.js @@ -137,9 +137,11 @@ export default class ELines extends Group { }); } show() { - this.eachChild((child) => { - child.show(); - }); + // this.eachChild((child) => { + // // console.log(child); + // child.show(); + // }); + this.section && this.section.show(); } animateStyle(loop, animates) { diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js index d431c74a0..b8df25b3d 100644 --- a/src/jmapNew/shape/StationStand/index.js +++ b/src/jmapNew/shape/StationStand/index.js @@ -395,7 +395,7 @@ class StationStand extends Group { this.reentry && this.reentry.hideMode(); this.jump && this.jump.hideMode(); this.detainCircle && this.detainCircle.setColor(this.style.StationStand.detainCar.defaultColor); - this.detainRect.setHide(); + this.detainRect && this.detainRect.setHide(); } /** 空闲*/ diff --git a/src/jmapNew/shape/factory.js b/src/jmapNew/shape/factory.js index 0549d0df9..57b055926 100644 --- a/src/jmapNew/shape/factory.js +++ b/src/jmapNew/shape/factory.js @@ -27,6 +27,7 @@ import Arrow from './Arrow/index'; import Power from './Power/index'; import StationTurnBack from './StationTurnBack/index'; import OverAp from './OverAp/index.js'; +import FloodGate from './FloodGate/index'; /** 图库*/ const mapShape = {}; @@ -75,6 +76,7 @@ mapShape[deviceType.Arrow] = Arrow; mapShape[deviceType.Power] = Power; mapShape[deviceType.StationTurnBack] = StationTurnBack; mapShape[deviceType.OverAp] = OverAp; +mapShape[deviceType.FloodGate] = FloodGate; function shapefactory(device, jmap) { const type = device._type; diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue index 2f982d957..b844668dc 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue @@ -145,493 +145,830 @@ export default { menuNormal: { Local: [ { - title: '系统', + title: '窗口(W)', operate: OperationEvent.Command.mBar.system, - children: [ - { - title: '登录', - click: this.undeveloped - }, - { - title: '注销', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '站遥控', - operate: OperationEvent.MixinCommand.remoteControl.mbar, - click: this.stationRemoteControl - }, - { - title: '区域选择', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '连接主用中心', - click: this.undeveloped - }, - { - title: '连接备用中心', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '退出', - click: this.undeveloped - } - ] + children: [] }, { - title: '查看', + title: '列车(T)', operate: OperationEvent.Command.mBar.check, children: [ { - title: '运行图', + title: '排列进路', click: this.undeveloped }, { - title: '报告分析', + title: '分配', click: this.undeveloped }, { - type: 'separator' - }, - { - title: '视图', - click: this.undeveloped, + title: '操作', operate: '', - children: [{ - title: '报警', - click: this.undeveloped - }, - { - title: '列车运行信息', - click: this.undeveloped - }, - { - title: '设备状态', - click: this.undeveloped - }, - { - title: '列车详细信息', - click: this.undeveloped - }, - { - title: '站台详细信息', - click: this.undeveloped - }] + children: [ + { + title: '发车', + click: this.undeveloped + }, + { + title: '脱离班次', + click: this.undeveloped + }, + { + title: '复位', + click: this.undeveloped + }, + { + title: '跳停', + click: this.undeveloped + }, + { + title: '设置/取消偏离', + click: this.undeveloped + }, + { + title: '更新偏差', + click: this.undeveloped + }, + { + title: '取消CBTC列车进路', + click: this.undeveloped + }, + { + title: 'VOBC切换', + click: this.undeveloped + }, + { + title: '远程VOBC切换', + click: this.undeveloped + } + ] }, { - title: '终端站发车列表', + title: '定义', + operate: '', + children: [ + { + title: '列车ID号关联', + click: this.undeveloped + }, + { + title: '列车占用关联', + click: this.undeveloped + }, + { + title: '修改列车描述号', + click: this.undeveloped + } + ] + }, + { + title: '设置', + operate: '', + children: [ + { + title: '运行类型', + click: this.undeveloped + }, + { + title: '记事薄', + click: this.undeveloped + } + ] + }, + { + title: '显示', + operate: '', + children: [ + { + title: '详细列车信息', + click: this.undeveloped + }, + { + title: '所有列车', + click: this.undeveloped + }, + { + title: 'CBTC进路信息', + click: this.undeveloped + } + ] + } + ] + }, + { + title: '线路(G)', + operate: '', + children: [ + { + title: '站台', + operate: '', + children: [ + { + title: '开放/关闭', + click: this.undeveloped + }, + { + title: '设置/取消扣车', + click: this.undeveloped + }, + { + title: '设置站间列车数量', + click: this.undeveloped + }, + { + title: '分配停站时间', + click: this.undeveloped + }, + { + title: '授权转移', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '道岔', + operate: '', + children: [ + { + title: '命令', + click: this.undeveloped + }, + { + title: '封锁', + click: this.undeveloped + }, + { + title: '封锁', + click: this.undeveloped + }, + { + title: '解除封锁', + click: this.undeveloped + }, + { + title: '请求动岔/请求或授权/取消', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '信号机', + operate: '', + children: [ + + { + title: '引导', + click: this.undeveloped + }, + { + title: '取消允许锁闭', + click: this.undeveloped + }, + { + title: '进路/命令', + click: this.undeveloped + }, + { + title: '信号指示模式', + click: this.undeveloped + }, + { + title: '封锁', + click: this.undeveloped + }, + { + title: '解除封锁', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '轨道', + operate: '', + children: [ + { + title: '开放', + click: this.undeveloped + }, + { + title: '关闭', + click: this.undeveloped + }, + { + title: '临时限速', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '闭塞区段', + operate: '', + children: [ + { + title: '取消转换锁闭', + click: this.undeveloped + }, + { + title: '取消过岔锁闭', + click: this.undeveloped + }, + { + title: '远程预复位使能', + click: this.undeveloped + }, + { + title: '复位', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '进入点', + operate: '', + children: [ + { + title: '自动进路', + click: this.undeveloped + } + ] + }, + { + title: '运行线', + operate: '', + children: [ + { + title: '设置/取消偏离', + click: this.undeveloped + } + ] + }, + { + title: 'UPS', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '运行超时', + operate: '', + children: [ + { + title: '设置容忍度', + click: this.undeveloped + } + ] + }, + { + title: '信号模式', + operate: '', + children: [ + { + title: 'CBTC', + click: this.undeveloped + }, + { + title: '后备', + click: this.undeveloped + } + ] + }, + { + title: 'PMI', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '试车线', + operate: '', + children: [ + { + title: '开始测试', + click: this.undeveloped + }, + { + title: '结束测试', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '系统扣车', click: this.undeveloped }, { - title: '详细设备状态', + title: '修改自动分配', click: this.undeveloped }, { - title: '查找列车', + title: '防淹门', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '坡道', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '弯道', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + } + ] + }, + { + title: '调整(R)', + operate: '', + children: [ + { + title: '固定列车间隔', click: this.undeveloped }, { - type: 'separator' - }, - { - title: '显示目的地号', - click: this.undeveloped - }, - { - title: '显示轨道名', - click: this.undeveloped - }, - { - title: '显示道岔名', - click: this.undeveloped - }, - { - title: '显示信号机名', - click: this.undeveloped - }, - { - title: '显示车次窗位置', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '显示车次号', - click: this.undeveloped - }, - { - title: '显示车组号', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '全屏', - click: this.undeveloped - }, - { - title: '放大', - click: this.undeveloped - }, - { - title: '缩小', - click: this.undeveloped - }, - { - title: '恢复', + title: '调整策略', click: this.undeveloped } ] }, { - title: '车站定位', - operate: '', - children: [ - ] - }, - { - title: 'ATS终端操作', + title: '视图(V)', operate: '', children: [ { - title: '当天运行车计划', + title: '缩放', click: this.undeveloped }, { - title: '出入库预告', - click: this.undeveloped - } - ] - }, - { - title: '计划车操作', - operate: '', - children: [ - { - title: '添加计划车', + title: '修改可见性', click: this.undeveloped }, { - title: '平移计划车', + title: '允许显示', click: this.undeveloped - }, - { - title: '删除计划车', - click: this.undeveloped - } - ] - }, - { - title: '批处理命令', - operate: OperationEvent.Command.mBar.detainControl, - children: [ - { - title: '全线扣车', - operate: OperationEvent.StationStand.setDetainTrainAll.mbar, - click: this.setDetainTrainAll - }, - { - title: '取消全线扣车', - operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar, - click: this.cancelDetainTrainAll - }, - { - title: '取消上行全线扣车', - operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar, - click: this.cancelUpDetainTrainAll - }, - { - title: '取消下行全线扣车', - operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar, - click: this.cancelDownDetainTrainAll - } - ] - }, - { - title: '信息管理', - operate: '', - children: [ - { - title: '调度日志', - click: this.undeveloped - }, - { - title: '调度留言提醒', - click: this.undeveloped - }, - { - title: '报警设置', - click: this.undeveloped - } - ] - }, - { - title: '帮助', - operate: '', - children: [ - { - title: '关于ITS GPC 工作站', - click: this.about, - operate: OperationEvent.Command.help.about } ] } ], Center: [ { - title: '系统', + title: '窗口(W)', operate: OperationEvent.Command.mBar.system, - children: [ - { - title: '登录', - click: this.undeveloped - }, - { - title: '注销', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '站遥控', - operate: OperationEvent.MixinCommand.remoteControl.mbar, - click: this.stationRemoteControl - }, - { - title: '区域选择', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '连接主用中心', - click: this.undeveloped - }, - { - title: '连接备用中心', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '退出', - click: this.undeveloped - } - ] + children: [] }, { - title: '查看', + title: '列车(T)', operate: OperationEvent.Command.mBar.check, children: [ { - title: '运行图', + title: '排列进路', click: this.undeveloped }, { - title: '报告分析', + title: '分配', click: this.undeveloped }, { - type: 'separator' - }, - { - title: '视图', - click: this.undeveloped, + title: '操作', operate: '', - children: [{ - title: '报警', - click: this.undeveloped - }, - { - title: '列车运行信息', - click: this.undeveloped - }, - { - title: '设备状态', - click: this.undeveloped - }, - { - title: '列车详细信息', - click: this.undeveloped - }, - { - title: '站台详细信息', - click: this.undeveloped - }] + children: [ + { + title: '发车', + click: this.undeveloped + }, + { + title: '脱离班次', + click: this.undeveloped + }, + { + title: '复位', + click: this.undeveloped + }, + { + title: '跳停', + click: this.undeveloped + }, + { + title: '设置/取消偏离', + click: this.undeveloped + }, + { + title: '更新偏差', + click: this.undeveloped + }, + { + title: '取消CBTC列车进路', + click: this.undeveloped + }, + { + title: 'VOBC切换', + click: this.undeveloped + }, + { + title: '远程VOBC切换', + click: this.undeveloped + } + ] }, { - title: '终端站发车列表', - click: this.undeveloped + title: '定义', + operate: '', + children: [ + { + title: '列车ID号关联', + click: this.undeveloped + }, + { + title: '列车占用关联', + click: this.undeveloped + }, + { + title: '修改列车描述号', + click: this.undeveloped + } + ] }, { - title: '详细设备状态', - click: this.undeveloped + title: '设置', + operate: '', + children: [ + { + title: '运行类型', + click: this.undeveloped + }, + { + title: '记事薄', + click: this.undeveloped + } + ] }, { - title: '查找列车', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '显示目的地号', - click: this.undeveloped - }, - { - title: '显示轨道名', - click: this.undeveloped - }, - { - title: '显示道岔名', - click: this.undeveloped - }, - { - title: '显示信号机名', - click: this.undeveloped - }, - { - title: '显示车次窗位置', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '显示车次号', - click: this.undeveloped - }, - { - title: '显示车组号', - click: this.undeveloped - }, - { - type: 'separator' - }, - { - title: '全屏', - click: this.undeveloped - }, - { - title: '放大', - click: this.undeveloped - }, - { - title: '缩小', - click: this.undeveloped - }, - { - title: '恢复', - click: this.undeveloped + title: '显示', + operate: '', + children: [ + { + title: '详细列车信息', + click: this.undeveloped + }, + { + title: '所有列车', + click: this.undeveloped + }, + { + title: 'CBTC进路信息', + click: this.undeveloped + } + ] } ] }, { - title: '车站定位', - operate: '', - children: [ - ] - }, - { - title: 'ATS终端操作', + title: '线路(G)', operate: '', children: [ { - title: '当天运行车计划', + title: '站台', + operate: '', + children: [ + { + title: '开放/关闭', + click: this.undeveloped + }, + { + title: '设置/取消扣车', + click: this.undeveloped + }, + { + title: '设置站间列车数量', + click: this.undeveloped + }, + { + title: '分配停站时间', + click: this.undeveloped + }, + { + title: '授权转移', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '道岔', + operate: '', + children: [ + { + title: '命令', + click: this.undeveloped + }, + { + title: '封锁', + click: this.undeveloped + }, + { + title: '封锁', + click: this.undeveloped + }, + { + title: '解除封锁', + click: this.undeveloped + }, + { + title: '请求动岔/请求或授权/取消', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '信号机', + operate: '', + children: [ + + { + title: '引导', + click: this.undeveloped + }, + { + title: '取消允许锁闭', + click: this.undeveloped + }, + { + title: '进路/命令', + click: this.undeveloped + }, + { + title: '信号指示模式', + click: this.undeveloped + }, + { + title: '封锁', + click: this.undeveloped + }, + { + title: '解除封锁', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '轨道', + operate: '', + children: [ + { + title: '开放', + click: this.undeveloped + }, + { + title: '关闭', + click: this.undeveloped + }, + { + title: '临时限速', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '闭塞区段', + operate: '', + children: [ + { + title: '取消转换锁闭', + click: this.undeveloped + }, + { + title: '取消过岔锁闭', + click: this.undeveloped + }, + { + title: '远程预复位使能', + click: this.undeveloped + }, + { + title: '复位', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '进入点', + operate: '', + children: [ + { + title: '自动进路', + click: this.undeveloped + } + ] + }, + { + title: '运行线', + operate: '', + children: [ + { + title: '设置/取消偏离', + click: this.undeveloped + } + ] + }, + { + title: 'UPS', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '运行超时', + operate: '', + children: [ + { + title: '设置容忍度', + click: this.undeveloped + } + ] + }, + { + title: '信号模式', + operate: '', + children: [ + { + title: 'CBTC', + click: this.undeveloped + }, + { + title: '后备', + click: this.undeveloped + } + ] + }, + { + title: 'PMI', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '试车线', + operate: '', + children: [ + { + title: '开始测试', + click: this.undeveloped + }, + { + title: '结束测试', + click: this.undeveloped + }, + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '系统扣车', click: this.undeveloped }, { - title: '出入库预告', + title: '修改自动分配', click: this.undeveloped + }, + { + title: '防淹门', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '坡道', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] + }, + { + title: '弯道', + operate: '', + children: [ + { + title: '显示', + click: this.undeveloped + } + ] } ] }, { - title: '计划车操作', + title: '调整(R)', operate: '', children: [ { - title: '添加计划车', + title: '固定列车间隔', click: this.undeveloped }, { - title: '平移计划车', - click: this.undeveloped - }, - { - title: '删除计划车', + title: '调整策略', click: this.undeveloped } ] }, { - title: '批处理命令', - operate: OperationEvent.Command.mBar.detainControl, - children: [ - { - title: '全线扣车', - operate: OperationEvent.StationStand.setDetainTrainAll.mbar, - click: this.undeveloped - }, - { - title: '取消全线扣车', - operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar, - click: this.undeveloped - }, - { - title: '取消上行全线扣车', - operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar, - click: this.undeveloped - }, - { - title: '取消下行全线扣车', - operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar, - click: this.undeveloped - } - ] - }, - { - title: '信息管理', + title: '视图(V)', operate: '', children: [ { - title: '调度日志', + title: '缩放', click: this.undeveloped }, { - title: '调度留言提醒', + title: '修改可见性', click: this.undeveloped }, { - title: '报警设置', + title: '允许显示', click: this.undeveloped } ] - }, - { - title: '帮助', - children: [ - { - title: '关于ITS GPC 工作站', - click: this.about, - operate: OperationEvent.Command.help.about - } - ] } ] } @@ -704,9 +1041,9 @@ export default { initMenu(menu) { const type = State2SimulationMap[this.$store.state.training.prdType]; this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode); - if (this.menu[2]) { - this.menu[2].children = this.initStationList(); - } + // if (this.menu[2]) { + // this.menu[2].children = this.initStationList(); + // } this.clickEvent(); this.closeMenu(true); }, diff --git a/src/jmapNew/utils/parser.js b/src/jmapNew/utils/parser.js index d8e53c5cd..4db325525 100644 --- a/src/jmapNew/utils/parser.js +++ b/src/jmapNew/utils/parser.js @@ -226,6 +226,10 @@ export function parser(data, skinCode, showConfig) { } } }, this); + + zrUtil.each(data.floodGateList || [], elem=> { + mapDevice[elem.code] = createDevice(deviceType.FloodGate, elem, propConvert, showConfig); + }, this); } return mapDevice; @@ -296,6 +300,7 @@ export function updateMapData(state, model) { case deviceType.Arrow: updateForList(model, state, 'arrowList'); break; case deviceType.Power: updateForList(model, state, 'powerLineList'); break; case deviceType.StationTurnBack : updateForList(model, state, 'tbStrategyList'); break; + case deviceType.FloodGate: updateForList(model, state, 'floodGateList'); break; } } } diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 313b7de17..05e0b3de3 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -5,6 +5,7 @@ import FaviconGzb from '@/assets/icon/favicon_gzb.png'; import FaviconHeb from '@/assets/icon/favicon_hyd.png'; import FaviconXadt from '@/assets/icon/favicon_xas.png'; import FaviconJyd from '@/assets/icon/favicon_jyd.png'; +import FaviconHls from '@/assets/icon/favicon_hls.png'; import Bottom_Jyd from '@/assets/icon/bottom_jyd.png'; import Link_Jyd from '@/assets/icon/link_jyd.png'; import FaviconTky from '@/assets/icon/favicon_tky.png'; @@ -12,6 +13,7 @@ import FaviconBxkc from '@/assets/icon/favicon_bxkc.png'; import FaviconCrsc from '@/assets/icon/favicon_crsc.png'; import Link_Bxkc from '@/assets/icon/link_bxkc.png'; import Link_Crsc from '@/assets/icon/link_crsc.png'; +import Link_Hls from '@/assets/icon/link_hls.png'; // title:页面title; loginPath:退出登录跳转路径; loginParam:登录接口参数project;loginTitle:登录页左上角title；logoWidth：登录页左上角logo宽度； // homeTitle:导航栏title(没有采用title); browserTitle:浏览器窗口title；bottomColumn：底部栏描述；bottomIcon：底部栏Icon;linkIcon:浏览器窗口icon(没有采用ProjectIcon) @@ -211,7 +213,7 @@ export const loginInfo = { }, crsc: { title: '城市轨道交通实训平台', - loginPath: '/login?project=xagy', + loginPath: '/login?project=crsc', loginTitle: '空串', logoWidth: '600px', bottomIcon: FaviconCrsc, @@ -225,7 +227,7 @@ export const loginInfo = { }, designcrsc: { title: '城市轨道交通设计平台', - loginPath: '/design/login?project=xagy', + loginPath: '/design/login?project=crsc', loginTitle: '空串', logoWidth: '600px', bottomIcon: FaviconCrsc, @@ -236,6 +238,30 @@ export const loginInfo = { navigationLogoWidth: '100px', navigationMarginLeft: '125px', systemType: '011' + }, + hls: { + title: '城市轨道交通实训平台', + loginPath: '/login?project=hls', + loginTitle: '空串', + logoWidth: '300px', + linkIcon: Link_Hls, + bottomColumn: '北京和利时系统工程有限公司', + loginParam: 'DEFAULT', + navigationLogoWidth: '180px', + navigationMarginLeft: '195px', + systemType: '011' + }, + designhls: { + title: '城市轨道交通设计平台', + loginPath: '/design/login?project=hls', + loginTitle: '空串', + logoWidth: '300px', + linkIcon: Link_Hls, + bottomColumn: '北京和利时系统工程有限公司', + loginParam: 'DEFAULT', + navigationLogoWidth: '180px', + navigationMarginLeft: '195px', + systemType: '011' } }; @@ -259,7 +285,9 @@ export const ProjectIcon = { bxkc: FaviconBxkc, designbxkc: FaviconBxkc, crsc: FaviconCrsc, - designcrsc: FaviconCrsc + designcrsc: FaviconCrsc, + hls: FaviconHls, + designhls: FaviconHls }; export const ProjectCode = { @@ -272,13 +300,13 @@ export const ProjectCode = { xadt: 'XADT', designxadt: 'XADT' }; -export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc']; // 底部栏仅展示公司信息不展示备案号 +export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls']; // 底部栏仅展示公司信息不展示备案号 export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['heb', 'designheb']; // 案例展示隐藏的项目 export const VersionBaseNoShow = ['heb', 'designheb']; // 登录页右下角版本开发基于不展示 -export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc']; // 登录页右下角主体不展示 +export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls']; // 登录页右下角主体不展示 export const GenerateRouteProjectList = ['jsxt', 'refereeJsxt'];// 需要在公共路由中生成登录页面的项目 -export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc']; // 登录页样式 +export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls']; // 登录页样式 export const NoQrcodeList = ['heb', 'designheb']; export const goOtherPlatformMenu = { // 导航栏快速切换平台 login: '/design/login', @@ -298,90 +326,92 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台 bxkc: '/design/login?project=bxkc', designbxkc: '/login?project=bxkc', crsc: '/design/login?project=crsc', - designcrsc: '/login?project=crsc' -}; -export const PermissionParam = { // 路径权限处理所需参数配置（跳转白名单，路由处理类型） - heb: { - whitePage: '/login?project=heb', - systemType: '019' - }, - designheb: { - whitePage: '/design/login?project=heb', - systemType: '019' - }, - login: { - whitePage: '/login', - systemType: '011' - }, - design: { - whitePage: '/design/login', - systemType: '011' - }, - designxty: { - whitePage: '/design/login?project=xty', - systemType: '013' - }, - designgzb: { - whitePage: '/design/login?project=gzb', - systemType: '014' - }, - designxadt: { - whitePage: '/design/login?project=xadt', - systemType: '012' - }, - designjyd: { - whitePage: '/design/login?project=jyd', - systemType: '017' - }, - designtky: { - whitePage: '/design/login?project=tky', - systemType: '018' - }, - designbxkc: { - whitePage: '/design/login?project=bxkc', - systemType: '011' - }, - designcrsc: { - whitePage: '/design/login?project=crsc', - systemType: '011' - }, - xty: { - whitePage: '/login?project=xty', - systemType: '013' - }, - gzb: { - whitePage: '/login?project=gzb', - systemType: '014' - }, - xadt: { - whitePage: '/login?project=xadt', - systemType: '012' - }, - jyd: { - whitePage: '/login?project=jyd', - systemType: '017' - }, - tky: { - whitePage: '/login?project=tky', - systemType: '018' - }, - bxkc: { - whitePage: '/login?project=bxkc', - systemType: '011' - }, - crsc: { - whitePage: '/login?project=crsc', - systemType: '011' - }, - jsxt: { - whitePage: '/jsxt/login', - systemType: '015' - }, - refereeJsxt: { - whitePage: '/refereeJsxt/login', - systemType: '015' - } + designcrsc: '/login?project=crsc', + hls: '/design/login?project=hls', + designhls: '/login?project=hls' }; +// export const PermissionParam = { // 路径权限处理所需参数配置（跳转白名单，路由处理类型） +// heb: { +// whitePage: '/login?project=heb', +// systemType: '019' +// }, +// designheb: { +// whitePage: '/design/login?project=heb', +// systemType: '019' +// }, +// login: { +// whitePage: '/login', +// systemType: '011' +// }, +// design: { +// whitePage: '/design/login', +// systemType: '011' +// }, +// designxty: { +// whitePage: '/design/login?project=xty', +// systemType: '013' +// }, +// designgzb: { +// whitePage: '/design/login?project=gzb', +// systemType: '014' +// }, +// designxadt: { +// whitePage: '/design/login?project=xadt', +// systemType: '012' +// }, +// designjyd: { +// whitePage: '/design/login?project=jyd', +// systemType: '017' +// }, +// designtky: { +// whitePage: '/design/login?project=tky', +// systemType: '018' +// }, +// designbxkc: { +// whitePage: '/design/login?project=bxkc', +// systemType: '011' +// }, +// designcrsc: { +// whitePage: '/design/login?project=crsc', +// systemType: '011' +// }, +// xty: { +// whitePage: '/login?project=xty', +// systemType: '013' +// }, +// gzb: { +// whitePage: '/login?project=gzb', +// systemType: '014' +// }, +// xadt: { +// whitePage: '/login?project=xadt', +// systemType: '012' +// }, +// jyd: { +// whitePage: '/login?project=jyd', +// systemType: '017' +// }, +// tky: { +// whitePage: '/login?project=tky', +// systemType: '018' +// }, +// bxkc: { +// whitePage: '/login?project=bxkc', +// systemType: '011' +// }, +// crsc: { +// whitePage: '/login?project=crsc', +// systemType: '011' +// }, +// jsxt: { +// whitePage: '/jsxt/login', +// systemType: '015' +// }, +// refereeJsxt: { +// whitePage: '/refereeJsxt/login', +// systemType: '015' +// } +// }; export const ProjectList = [ {value:'xty', label:'西铁院'}, {value: 'gzb', label: '贵州装备'}, diff --git a/src/store/modules/map.js b/src/store/modules/map.js index e2313a954..a6a0825a0 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -335,6 +335,13 @@ const map = { return []; } }, + floodGateList: (state) => { + if (state.map) { + return state.map.floodGateList; + } else { + return []; + } + }, buttonList: (state) => { if (state.map) { return state.map.buttonList; diff --git a/src/views/newMap/newMapdraft/mapoperate/floodGate.vue b/src/views/newMap/newMapdraft/mapoperate/floodGate.vue new file mode 100644 index 000000000..57225ba0a --- /dev/null +++ b/src/views/newMap/newMapdraft/mapoperate/floodGate.vue @@ -0,0 +1,211 @@ + + + + diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue index d93082c24..cac7ef77b 100644 --- a/src/views/newMap/newMapdraft/mapoperate/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/index.vue @@ -64,6 +64,7 @@ import ControlLamp from './controlLamp'; import SplitStation from './splitStation'; import Arrow from './arrow'; import SplitScreen from './splitScreen'; +import FloodGate from './floodGate'; import { EventBus } from '@/scripts/event-bus'; export default { @@ -91,7 +92,8 @@ export default { ControlLamp, SplitStation, Arrow, - SplitScreen + SplitScreen, + FloodGate }, props: { selected: { @@ -129,7 +131,8 @@ export default { {label:this.$t('map.image'), name:'Resource', menus:ImageControlDraft}, {label:this.$t('map.boundingBox'), name:'CheckBox', menus:CheckboxDraft}, {label:'站间分隔', name:'SplitStation', menus:SplitStation}, - {label:'箭头', name:'Arrow', menus:Arrow} + {label:'箭头', name:'Arrow', menus:Arrow}, + {label: '防淹门', name: 'FloodGate', menus: FloodGate} ], selectDevice:'', enabledTab: 'Section',