diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index 6b3c86b4c..f44bef52c 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -144,7 +144,7 @@ :disabled="isTableBtnDisabled(button, scope.$index, scope.row)" :loading="scope.row['loading'+idx]" > - + {{ getTableBtnName(button.name, scope.$index, scope.row) }} diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js index e963637ca..0d6e14dea 100644 --- a/src/jmapNew/config/skinCode/xian_02.js +++ b/src/jmapNew/config/skinCode/xian_02.js @@ -436,6 +436,27 @@ class SkinCode extends defaultStyle { grayColor: '#7F7F7F' } } + }; + + this[deviceType.StationTurnBack] = { // 站后折返 + displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） + spliceShow: true, // 西安二号线特殊显示 + lamp: { + fill: '#FFFF00', // 填充色 + radiusR: 6 // 控制灯大小 + }, + text: { + titleTextShow: false, + fontWeight: 580, + fontSize: 12, + distance: 10 + }, + rect: { + fill: 'rgba(0,0,0,0)', + stroke: '#fff', + lineWidth: 2, + padding: 6 + } }; this[deviceType.Switch] = { @@ -625,13 +646,14 @@ class SkinCode extends defaultStyle { } }; this[deviceType.ReturnModeGroup] = { - displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） + displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） insideDistance: 2, // 折返模块边框内部距离 outsideDistance: 10, // 折返模块边框之间距离 rectWidth: 20, // 折返模块宽度 lineWidth: 3, // 折返模块线宽 fillColor: 'rgba(0,0,0,0)', // 填充色 - strokeColor: '#9F9C9C' // 线颜色 + strokeColor: '#9F9C9C', // 线颜色 + highlightColor: '#fff' // 高亮颜色 }; this[deviceType.ModeStatusGroup] = { // 车站状态模式 displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） diff --git a/src/jmapNew/shape/StationTurnBack/EFoldbackMode.js b/src/jmapNew/shape/StationTurnBack/EFoldbackMode.js new file mode 100644 index 000000000..417ab14d4 --- /dev/null +++ b/src/jmapNew/shape/StationTurnBack/EFoldbackMode.js @@ -0,0 +1,141 @@ +import Group from 'zrender/src/container/Group'; +import Rect from 'zrender/src/graphic/shape/Rect'; +import Line from 'zrender/src/graphic/shape/Line'; + +export default class EFoldbackMode extends Group { + constructor(model) { + super(); + this.model = model; + this.zlevel = model.zlevel; + this._subType = model._subType; + this.z = model.z; + this.onmouseover = model.mouseover; + this.onmouseout = model.mouseout; + this.create(model); + } + create(model) { + const style = model.style; + this.lateralLinePriorityRect = new Rect({ + zlevel: this.zlevel, + z: this.z, + shape: { + x: model.x, + y: model.y, + width: model.width, + height:model.width + }, + style: { + lineWidth: style.ReturnModeGroup.lineWidth, + stroke: style.ReturnModeGroup.strokeColor, + fill: style.ReturnModeGroup.fillColor + } + }); + this.lateralLinePriority1 = new Line({ + zlevel: model.zlevel, + z: model.z, + shape: { + x1: model.x + model.style.ReturnModeGroup.insideDistance, + y1: model.y + model.style.ReturnModeGroup.insideDistance, + x2: model.x + model.width - style.ReturnModeGroup.insideDistance, + y2: model.y + model.width - style.ReturnModeGroup.insideDistance + }, + style: { + lineWidth: model.style.ReturnModeGroup.lineWidth, + stroke: model.style.ReturnModeGroup.strokeColor + } + }); + this.lateralLinePriority2 = new Line({ + zlevel: model.zlevel, + z: model.z, + shape: { + x1: model.x + model.width - style.ReturnModeGroup.insideDistance, + y1: model.y + style.ReturnModeGroup.insideDistance, + x2: model.x + style.ReturnModeGroup.insideDistance, + y2: model.y + model.width - style.ReturnModeGroup.insideDistance + }, + style: { + lineWidth: style.ReturnModeGroup.lineWidth, + stroke: style.ReturnModeGroup.strokeColor + } + }); + this.add(this.lateralLinePriorityRect); + this.add(this.lateralLinePriority1); + this.add(this.lateralLinePriority2); + this.linearFoldbackRect = new Rect({ + zlevel: this.zlevel, + z: this.z, + shape: { + x: model.x + model.width + style.ReturnModeGroup.outsideDistance, + y: model.y, + width: model.width, + height:model.width + }, + style: { + lineWidth: style.ReturnModeGroup.lineWidth, + stroke: style.ReturnModeGroup.strokeColor, + fill: style.ReturnModeGroup.fillColor + } + }); + this.linearFoldback = new Line({ + zlevel: model.zlevel, + z: model.z, + shape: { + x1: model.x + model.width + style.ReturnModeGroup.outsideDistance + style.ReturnModeGroup.insideDistance, + y1: model.y + model.width / 2, + x2: model.x + model.width * 2 + style.ReturnModeGroup.outsideDistance - style.ReturnModeGroup.insideDistance, + y2: model.y + model.width / 2 + }, + style: { + lineWidth: style.ReturnModeGroup.lineWidth, + stroke: style.ReturnModeGroup.strokeColor + } + }); + this.add(this.linearFoldbackRect); + this.add(this.linearFoldback); + this.lateralLineRect = new Rect({ + zlevel: this.zlevel, + z: this.z, + shape: { + x: model.x + model.width * 2 + style.ReturnModeGroup.outsideDistance * 2, + y: model.y, + width: model.width, + height:model.width + }, + style: { + lineWidth: style.ReturnModeGroup.lineWidth, + stroke: style.ReturnModeGroup.strokeColor, + fill: style.ReturnModeGroup.fillColor + } + }); + this.lateralLine = new Line({ + zlevel: model.zlevel, + z: model.z, + shape: { + x1: model.x + model.width * 2 + style.ReturnModeGroup.outsideDistance * 2 + style.ReturnModeGroup.insideDistance, + y1: model.y + model.width - style.ReturnModeGroup.insideDistance, + x2: model.x + model.width * 3 + style.ReturnModeGroup.outsideDistance * 2 - style.ReturnModeGroup.insideDistance, + y2: model.y + style.ReturnModeGroup.insideDistance + }, + style: { + lineWidth: style.ReturnModeGroup.lineWidth, + stroke: style.ReturnModeGroup.strokeColor + } + }); + this.add(this.lateralLineRect); + this.add(this.lateralLine); + } + + highlightType1(color) { + this.lateralLinePriorityRect && this.lateralLinePriorityRect.setStyle('stroke', color); + this.lateralLinePriority1 && this.lateralLinePriority1.setStyle('stroke', color); + this.lateralLinePriority2 && this.lateralLinePriority2.setStyle('stroke', color); + } + highlightType2(color) { + this.linearFoldbackRect && this.linearFoldbackRect.setStyle('stroke', color); + this.linearFoldback && this.linearFoldback.setStyle('stroke', color); + } + highlightType3(color) { + this.lateralLineRect && this.lateralLineRect.setStyle('stroke', color); + this.lateralLine && this.lateralLine.setStyle('stroke', color); + } +} diff --git a/src/jmapNew/shape/StationTurnBack/index.js b/src/jmapNew/shape/StationTurnBack/index.js index 28de520d2..91ce98ef6 100644 --- a/src/jmapNew/shape/StationTurnBack/index.js +++ b/src/jmapNew/shape/StationTurnBack/index.js @@ -2,6 +2,7 @@ import Group from 'zrender/src/container/Group'; import Circle from 'zrender/src/graphic/shape/Circle'; import Text from 'zrender/src/graphic/Text'; import Rect from 'zrender/src/graphic/shape/Rect'; +import EFoldbackMode from './EFoldbackMode'; import Vue from 'vue'; export default class StationTurnBack extends Group { @@ -20,9 +21,9 @@ export default class StationTurnBack extends Group { } create() { const model = this.model; - const style = this.style; + const style = this.style; - if (model.show) { + if (model.show && !style.StationTurnBack.spliceShow) { this.control = new Circle({ zlevel: this.zlevel, z: this.z, @@ -94,23 +95,49 @@ export default class StationTurnBack extends Group { this.add(this.controlRect); this.add(this.text); this.add(this.strategyText); - } + } + if (style.StationTurnBack.spliceShow) { + this.control = new EFoldbackMode({ + zlevel: this.zlevel, + z: this.z, + x: model.position.x, + y: model.position.y, + width: style.ReturnModeGroup.rectWidth, + style: style + }); + this.add(this.control); + } } recover() { const path = window.location.href; if (!path.includes('/map/draw')) { - this.strategyText.hide(); - } + this.strategyText && this.strategyText.hide(); + } + this.control && this.control.highlightType1(this.style.ReturnModeGroup.highlightColor); + + // this.control && this.control.highlightType1(this.style.ReturnModeGroup.strokeColor); + this.control && this.control.highlightType2(this.style.ReturnModeGroup.strokeColor); + this.control && this.control.highlightType3(this.style.ReturnModeGroup.strokeColor); } handleStatus(name) { - this.strategyText.show(); - this.strategyText.attr({ + this.strategyText && this.strategyText.show(); + this.strategyText && this.strategyText.attr({ style: { text: name } - }); + }); + this.control && this.control.highlightType1(this.style.ReturnModeGroup.strokeColor); + this.control && this.control.highlightType2(this.style.ReturnModeGroup.strokeColor); + this.control && this.control.highlightType3(this.style.ReturnModeGroup.strokeColor); + if (name == '优先折返') { + this.control && this.control.highlightType1(this.style.ReturnModeGroup.highlightColor); + } else if (name == '直线折返') { + this.control && this.control.highlightType2(this.style.ReturnModeGroup.highlightColor); + } else if (name == '侧线折返') { + this.control && this.control.highlightType3(this.style.ReturnModeGroup.highlightColor); + } } // 设置状态 @@ -125,7 +152,6 @@ export default class StationTurnBack extends Group { } }); } - // console.log(model, '站后折返model'); } setShowMode() { @@ -142,8 +168,6 @@ export default class StationTurnBack extends Group { this.eachChild(item => { item.show(); }); - // this.isShowShape = true; - // this.setState(this.model); } else { this.eachChild(item => { item.hide(); diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue index 3bc6a114d..ede2941ca 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue @@ -97,6 +97,7 @@ + + diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue index c3200aef8..3eda8e4b8 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue @@ -14,8 +14,8 @@ -
站台
-
+
站台
+
@@ -52,14 +52,14 @@ import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus' import { mapGetters } from 'vuex'; export default { - name: 'RouteSelection', + name: 'TrainDistribution', components: { NoticeInfo }, data() { return { tempData: [], - tableData: [{}], + tableData: [], activeName: 'first', beforeSectionList: [], dialogShow: false, @@ -191,4 +191,17 @@ export default { border-right: 2px solid #696969; color: #000; } + .menu-box-title { + width: 100%; + border: 2px solid #696969; + border-bottom: 0; + color: #000; + padding-left: 5px; + } + .menu-box { + width: 100%; + height: 350px; + overflow: scroll; + border: 2px solid #696969; + } diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue index c5239d392..c4a5c3df1 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue @@ -11,35 +11,42 @@ :close-on-click-modal="false" > - 车体号: - 追踪号: + 车体号: + 追踪号: - - + + + + + + + + + 实际的DID + + + + + + 被请求的DID + + + + + + + DID浏览选项 - - 实际的DID - - - - - - 被请求的DID - - - - - - DID浏览选项 - - - - + +
{{ item.name }}
+ + + 确定 @@ -65,7 +72,15 @@ export default { data() { return { trainNoList: [], - selected: null, + selected: null, + optionList: [ + { name: '0001 北客站一韦曲南站 往返运营', id: 1 }, + { name: '0002 北客站一韦曲南站 北客站站前折返 往返运营', id: 2 }, + { name: '0003 北客站一韦曲南站 韦曲南站站前折返 往返运营', id: 3 }, + { name: '0004 北客站一韦曲南站 北客站和韦曲南站均站前折返 往返运营', id: 4 }, + { name: '0005 北客站一会展中心 往返运营', id: 5 }, + { name: '0006 北客站一会展中心 北客站站前折返 往返运营', id: 6 } + ], addModel: { stationName: '', trainWindowCode: '', @@ -174,9 +189,14 @@ export default { }; diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue index 2ecae142a..f357f763a 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue @@ -286,11 +286,11 @@ export default { // 排列进路 arrangementRoute() { let step = ''; - let routeCode = ''; + let routeCode = ''; if (this.selected.isTerminalSignal) { const endSignalRouteList = this.$store.state.menuOperation.endSignalRouteList; endSignalRouteList.forEach(item => { - if (item.endSignalCode === this.selected.code) { + if (item.endButtonSignalCode === this.selected.code) { routeCode = item.routeCode; } }); @@ -313,14 +313,14 @@ export default { this.resetRouteSignal(); const updateDeviceList = []; updateDeviceList.push({code: this.selected.code, _type: 'Signal', isStartSignal: 1}); - const endSignalRouteList = []; + const endSignalRouteList = []; this.routeList.forEach(item => { if (item.startSignalCode === this.selected.code) { - endSignalRouteList.push({endSignalCode: item.endSignalCode, routeCode: item.code}); - updateDeviceList.push({code: item.endSignalCode, _type: 'Signal', isTerminalSignal: 1}); + endSignalRouteList.push({endButtonSignalCode: item.endButtonSignalCode, routeCode: item.code}); + updateDeviceList.push({code: item.endButtonSignalCode, _type: 'Signal', isTerminalSignal: 1}); } }); - this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList}); + this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList}); this.$store.dispatch('training/updateMapState', updateDeviceList); } this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -525,9 +525,9 @@ export default { updateDeviceList.push({code: startSignalCode, _type: 'Signal', isStartSignal: 0}); } endSignalRouteList.forEach(item => { - updateDeviceList.push({code: item.endSignalCode, _type: 'Signal', isTerminalSignal: 0}); + updateDeviceList.push({code: item.endButtonSignalCode, _type: 'Signal', isTerminalSignal: 0}); }); - this.$store.dispatch('menuOperation/setRouteSelectStartSignal', { startSignalCode: '', endSignalRouteList: [] }); + this.$store.dispatch('menuOperation/setRouteSelectStartSignal', { startSignalCode: '', endSignalRouteList: [] }); this.$store.dispatch('training/updateMapState', updateDeviceList); }, enabledConfirm() { diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index 64a975dd5..7b608f3b8 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -71,8 +71,8 @@ export default { children: [ { label: '目的地ID', - // handler: this.updateDestination, - handler: this.undeveloped, + handler: this.updateDestination, + // handler: this.undeveloped, cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE }, { diff --git a/src/store/modules/map.js b/src/store/modules/map.js index a6a0825a0..bf67f6a56 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -787,7 +787,7 @@ const map = { state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => { state.routeData[item.automaticRouteCode].automaticRouteCode = item.code; }); - state.routeList = routeDataList; + state.routeList = routeDataList; }, setOverlapData: (state, overlapList) => { state.overlapData = {}; diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js index 1f60d4daa..9fa064818 100644 --- a/src/utils/loaddata.js +++ b/src/utils/loaddata.js @@ -66,7 +66,7 @@ export function covertData(resp, resolve) { resolve(); }); }); - const routeData = resp.data.logicDataNew.routeList; // 设置进路数据 + const routeData = resp.data.logicDataNew.routeList; // 设置进路数据 const overlapData = resp.data.logicDataNew.overlapList; const autoReentryData = resp.data.logicDataNew.autoReentryList; // 自动折返数据 const signalApproachSectionData = resp.data.logicDataNew.signalApproachSectionList; // 信号机接近区段数据 diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 18716d655..7e76e1c03 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -19,7 +19,7 @@ :device-code="deviceCode" :countdown-time="countdownTime" @passflow="passflow" - @faultdevice = "faultdevice" + @faultdevice="faultdevice" @getUserRole="getUserRole" @hidepanel="hidepanel" @devicemodel="devicemodel" @@ -487,16 +487,16 @@ export default { window.open(routeData.href, '_blank', 'noopener noreferrer'); }, faultdevice() { - const routeData = this.$router.resolve({ - path:'/jlmap3d/maintainer', - query:{ - mapid:this.mapId, - group:this.group, - project: this.project, - noPreLogout: true - } - }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + const routeData = this.$router.resolve({ + path:'/jlmap3d/maintainer', + query:{ + mapid:this.mapId, + group:this.group, + project: this.project, + noPreLogout: true + } + }); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, showdriving() { this.panelShow = true; diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index bcf3d3edf..eeb727466 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -5,7 +5,6 @@
菜单
- {{ $t('display.demon.deviceView') }} diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index a9157d91d..97a88bbee 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -15,7 +15,6 @@ {{ $t('joinTraining.faultSetting') }} - {{ faultMode?' 切换到普通模式':'切换到故障模式' }} {{ directiveMode? '切换到普通模式':'切换到指令模式' }} diff --git a/src/views/newMap/newMapdraft/ciConfig.vue b/src/views/newMap/newMapdraft/ciConfig.vue index 833cf244c..4c7e4f1dc 100644 --- a/src/views/newMap/newMapdraft/ciConfig.vue +++ b/src/views/newMap/newMapdraft/ciConfig.vue @@ -85,7 +85,8 @@ export default { overlapOnlyOneSwitch: false, generateCycle: false, routeButton: false, - likeHa1: false, + likeHa1: false, + getNearlySignal: false, overlapSettingByTrigger: false, overlapReleaseTime: 45, routeReleaseTime: 60 @@ -94,7 +95,7 @@ export default { focus: false, booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch', 'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen', - 'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'likeHa1', 'overlapSettingByTrigger', 'generateFls'], + 'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls'], selectList: [], numberList: ['overlapReleaseTime', 'routeReleaseTime'], optionsMap: { @@ -119,7 +120,8 @@ export default { routeReleaseTime: '默认进路解锁时间', generateCycle: '是否生成自动折返', routeButton: '是否生成进路结束按钮', - likeHa1: '是否类似哈尔滨一号线，联锁分为ATP信号、地面信号、引导信号', + likeHa1: '是否类似哈尔滨一号线，联锁分为ATP信号、地面信号、引导信号', + getNearlySignal: '生成进路信号按钮，进路信号按钮是否取最近的一个信号机', overlapSettingByTrigger: '延续保护的建立方式：是-通过触发建立，否-随进路建立', generateFls: '是否生成侧防：是-生成侧防，不要联动道岔，否-不生成侧防，用联动道岔' } diff --git a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue index 8bb68656f..0687b620e 100644 --- a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue +++ b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue @@ -3,13 +3,18 @@
-
-
站后折返数据
+
+ 站后折返数据
- - - + + + + + +