diff --git a/src/api/ibp.js b/src/api/ibp.js index a80778999..a3b1bea69 100644 --- a/src/api/ibp.js +++ b/src/api/ibp.js @@ -70,7 +70,7 @@ export function getIbpInfoByStation(mapId, stationCode) { // 获取IBP盘数据 export function getIbpList(params) { return request({ - url: `/api/ibp/list`, + url: `/api/ibp`, method: 'get', params: params }); diff --git a/src/assets/ibp_images/key.png b/src/assets/ibp_images/key.png index 1ae5dc44d..7ab133914 100644 Binary files a/src/assets/ibp_images/key.png and b/src/assets/ibp_images/key.png differ diff --git a/src/assets/ibp_images/key_on.png b/src/assets/ibp_images/key_on.png index 7ab133914..1ae5dc44d 100644 Binary files a/src/assets/ibp_images/key_on.png and b/src/assets/ibp_images/key_on.png differ diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js index 528c66e39..542b1d872 100644 --- a/src/i18n/langs/en/router.js +++ b/src/i18n/langs/en/router.js @@ -87,5 +87,6 @@ export default { AuthorList: 'Authorization code list', questionsRuleManage: 'Question rule manage', preTheoryData: 'Pre Theory Data', - boardManage: 'Message Board Manage' + boardManage: 'Message Board Manage', + publishIBPManage:'publish IBP Manage' }; diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js index 353967be8..4b0964ce8 100644 --- a/src/i18n/langs/zh/router.js +++ b/src/i18n/langs/zh/router.js @@ -92,5 +92,6 @@ export default { AuthorList: '授权列表', questionsRuleManage: '出题规则管理', preTheoryData: '理论导入预处理', - boardManage: '留言板管理' + boardManage: '留言板管理', + publishIBPManage:'发布IBP盘管理' }; diff --git a/src/jmapNew/shape/StationStand/emergent/EEmergentCross.js b/src/jmapNew/shape/StationStand/emergent/EEmergentCross.js index 9060d3733..afd57c29d 100644 --- a/src/jmapNew/shape/StationStand/emergent/EEmergentCross.js +++ b/src/jmapNew/shape/StationStand/emergent/EEmergentCross.js @@ -14,13 +14,13 @@ class EEmergentCross extends Group { const model = this.model.modelData; const style = this.model.style; - const emergentOffset = model.inside ? style.StationStand.emergentCross.insideOffset : style.StationStand.emergentCross.outsideOffset; + const emergentOffset = model.inside ? style.StationStand.emergentRhombus.insideOffset : style.StationStand.emergentRhombus.outsideOffset; const emergentH = model.right ? 1 : -1; const emergentX = model.position.x + emergentH * emergentOffset.x; const emergentY = model.position.y + emergentH * emergentOffset.y; - model.r = style.StationStand.emergentCross.mergentR; - model.n = style.StationStand.emergentCross.mergentN; + model.r = style.StationStand.emergentRhombus.mergentR; + model.n = style.StationStand.emergentRhombus.mergentN; this.emergent = new Isogon({ zlevel: this.model.zlevel, @@ -33,7 +33,7 @@ class EEmergentCross extends Group { }, style: { lineWidth: 2, - stroke:style.StationStand.emergentCross.defaultColor + stroke:style.StationStand.emergentRhombus.defaultColor } }); this.add(this.emergent); @@ -52,7 +52,7 @@ class EEmergentCross extends Group { }, style:{ lineWidth:2, - stroke:style.StationStand.emergentCross.defaultColor + stroke:style.StationStand.emergentRhombus.defaultColor } }); this.emergentLine2 = new Line({ @@ -66,7 +66,7 @@ class EEmergentCross extends Group { }, style:{ lineWidth:2, - stroke:style.StationStand.emergentCross.defaultColor + stroke:style.StationStand.emergentRhombus.defaultColor } }); this.add(this.emergentLine1); diff --git a/src/jmapNew/shape/StationStand/safeStand/EHollowStand.js b/src/jmapNew/shape/StationStand/safeStand/EHollowStand.js index 6132f8af1..c59733a18 100644 --- a/src/jmapNew/shape/StationStand/safeStand/EHollowStand.js +++ b/src/jmapNew/shape/StationStand/safeStand/EHollowStand.js @@ -49,7 +49,7 @@ class EHollowStand extends Group { // 停车 model.trainParking && this.setColor(style.StationStand.hollowStand.doorOpenColor); // 紧急停车 - model.emergencyClosed && this.setColor(this.style.StationStand.hollowStand.spareColor); + model.emergencyClosed && this.setColor(style.StationStand.hollowStand.spareColor); } } diff --git a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js index 3c9b45fdf..221096554 100644 --- a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js +++ b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js @@ -84,7 +84,7 @@ class ESolidStand extends Group { model.trainParking && this.setColor(style.StationStand.solidStand.stopColor); model.trainParking && this.setStroke(style.StationStand.solidStand.doorOpenColor); // 紧急停车 - model.emergencyClosed && this.setColor(this.style.StationStand.solidStand.spareColor); + model.emergencyClosed && this.setColor(style.StationStand.solidStand.spareColor); } else { this.handlePassagerColor(model.num); } diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index c74ce85ec..85ba831c9 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -154,10 +154,10 @@ export default { } ], menuSpeed: [ - { - label: '确认运行至前方站', - handler: this.limitSpeed - } + // { + // label: '列车限速', + // handler: this.limitSpeed + // } ] }; }, diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue index 8569aa354..e58c2b90a 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue @@ -66,7 +66,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { mapGetters } from 'vuex'; import ConfirmControl from './childDialog/confirmControl'; -import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import { getStationList } from '@/api/runplan'; export default { name: 'StandRunLevel', @@ -84,7 +84,8 @@ export default { selection: [], isSelect: true, isConfirm: false, - time: '' + time: '', + sortStationList: [] }; }, computed: { @@ -132,6 +133,7 @@ export default { } }, mounted() { + this.sortStationList = []; this.$nextTick(() => { this.$store.dispatch('training/tipReload'); }); @@ -139,21 +141,33 @@ export default { methods: { loadInitData(selected) { this.tempData = []; - const index = this.stationList.findIndex(n => n.code == selected.stationCode); - if (selected.direction == '01') { // 下行 - // 下行时，此站不是最后一站 - if (index != 0) { - const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code); - const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode); - this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: selected.runLevelTime ? selected.runLevelTime : 0, check: !!selected.runLevelTimeForever }); - } + if (!this.sortStationList.length) { + getStationList(this.$route.query.mapId).then(resp => { + this.sortStationList = resp.data; + this.handleTempData(selected); + }); } else { - // 上行时，此站不是最后一站 - if (index != this.stationList.length) { - const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code); - const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode); - this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: selected.runLevelTime ? selected.runLevelTime : 0, check: !!selected.runLevelTimeForever }); - } + this.handleTempData(selected); + } + }, + handleTempData(selected) { + const stationIndex = this.sortStationList.findIndex((item) => item.code == selected.stationCode); + if (selected.right) { + const nextStation = this.sortStationList[stationIndex + 1]; + const nextStationStand = this.stationStandList.find(stand => stand.stationCode === nextStation.code && stand.right); + nextStation && nextStationStand && this.tempData.push({ + name: `${nextStationStand.name}(${nextStation.name})`, + time: selected.runLevelTime ? selected.runLevelTime : 0, + check: !!selected.runLevelTimeForever + }); + } else { + const nextStation = this.sortStationList[stationIndex - 1]; + const nextStationStand = this.stationStandList.find(stand => stand.stationCode === nextStation.code && !stand.right); + nextStation && nextStationStand && this.tempData.push({ + name: `${nextStationStand.name}(${nextStation.name})`, + time: selected.runLevelTime ? selected.runLevelTime : 0, + check: !!selected.runLevelTimeForever + }); } }, doShow(operate, selected) { diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue index 372879040..2c605c30b 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue @@ -230,7 +230,7 @@ export default { parkingTime: this.control === '01' ? -1 : this.time, parkingAlwaysValid: this.control === '01' ? true : this.effective }, - messages: [`${this.$t('menu.stopTime') + this.$t('global.colon') + this.stationName} - ${this.standName}, ${this.$t('menu.stopTimeIs')}${this.control == '01' ? this.$t('menu.automatic2') : this.time + this.$t('global.second')}, ${this.$t('menu.effectiveFrequencyIs')}${this.effective == false ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`] + messages: [`${this.$t('menu.stopTime') + this.$t('global.colon') + this.stationName} - ${this.standName}, ${this.$t('menu.stopTimeIs')}${this.control == '01' ? this.$t('menu.automatic2') : this.time + this.$t('global.second')}, ${this.$t('menu.effectiveFrequencyIs')}${this.effective == true ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`] }; this.loading = true; diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 31fe85e89..b943a1146 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -222,6 +222,19 @@ export default { }, watch: { '$store.state.menuOperation.setMenuChangeCount': function (val) { + const State2SimulationMap = { + '01': 'Local', // 现地工作站 + '02': 'Center' // 中心调度工作站 + }; + if (this.selected._type) { + const control = this.getStationControl(this.selected); + const type = State2SimulationMap[this.$store.state.training.prdType]; + if (control.controlMode != type) { + this.clearAllMenuShow(); + this.centralizedStationList = new Array(15).fill({}); + return false; + } + } this.selectedObj = this.selected; this.speedShowCon = false; if (this.selectedObj._type) { @@ -321,6 +334,23 @@ export default { } } }, + getStationControl(selected) { + let control; + if (selected._type == 'StationStand') { + control = this.$store.getters['map/getDeviceStationCodeByStationCode'](selected.deviceStationCode); + } else if (selected._type == 'Station') { + control = this.$store.getters['map/getDeviceStationCodeByStationCode'](selected.code); + } else if (selected._type == 'Train') { // 车次窗单独处理 + control = this.$store.getters['map/getStationCodeByTrain'](selected); + } else if (selected._type == 'TrainWindow') { + control = this.$store.getters['map/getDeviceTrainWindowCodeByStationCode'](selected.code); + } else if (selected._type == 'LimitControl') { + control = {controlMode: 'Center'}; + } else { + control = this.$store.getters['map/getDeviceStationCodeByStationCode'](selected.stationCode); + } + return control; + }, clickCommand(row) { this.clearAllMenuShow(); const commandList = ['ATP进路', '取消ATP', '联锁进路', '取消联锁', '引导进路', '取消引导']; diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue index b168223be..642257919 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue @@ -116,7 +116,6 @@ - @@ -172,7 +171,6 @@ import SignalBlock from './menuDialog/signalBlock'; import SignalDetail from './menuDialog/signalDetail'; import InitSignalMode from './menuDialog/initSignalMode'; import SignalMode from './menuDialog/signalMode'; -import SystemDetain from './menuDialog/systemDetain'; import RunningInterval from './menuDialog/runningInterval'; import AdjustStrategy from './menuDialog/adjustStrategy'; import TrainDepart from './menuDialog/trainDepart'; @@ -221,7 +219,6 @@ export default { SectionLock, InitSignalMode, SignalMode, - SystemDetain, RunningInterval, AdjustStrategy, TrainDepart, @@ -423,28 +420,28 @@ export default { children: [ { title: '开放/关闭', - click: this.standOpenOrClose, + click: this.standOpenOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain, + click: this.setStandDetain }, { title: '设置站间列车数量', // click: this.setIntervalStopNumber - click: this.undeveloped, + click: this.undeveloped }, { title: '分配停站时间', - click: this.setAllocateTime, + click: this.setAllocateTime }, { title: '授权转移', - click: this.authorizeTransfer, + click: this.authorizeTransfer }, { title: '显示', - click: this.showStandDetail, + click: this.showStandDetail } ] }, @@ -454,23 +451,23 @@ export default { children: [ { title: '命令', - click: this.setSwitchCommand, + click: this.setSwitchCommand }, { title: '封锁', - click: this.setBlockSwitch, + click: this.setBlockSwitch }, { title: '解除封锁', - click: this.setUnblockSwitch, + click: this.setUnblockSwitch }, { title: '请求动岔/请求或授权/取消', - click: this.setSwitchActive, + click: this.setSwitchActive }, { title: '显示', - click: this.showSwitchDetail, + click: this.showSwitchDetail } ] }, @@ -481,31 +478,31 @@ export default { { title: '引导', - click: this.setSignalGuide, + click: this.setSignalGuide }, { title: '取消允许锁闭', - click: this.setSignalCanBlock, + click: this.setSignalCanBlock }, { title: '进路/命令', - click: this.setRouteCommand, + click: this.setRouteCommand }, { title: '信号指示模式', - click: this.setSignalModel, + click: this.setSignalModel }, { title: '封锁', - click: this.setSignalBlock, + click: this.setSignalBlock }, { title: '解除封锁', - click: this.setSignalCancelBlock, + click: this.setSignalCancelBlock }, { title: '显示', - click: this.showSignalDetail, + click: this.showSignalDetail } ] }, @@ -515,19 +512,19 @@ export default { children: [ { title: '开放', - click: this.handleOpenSection, + click: this.handleOpenSection }, { title: '关闭', - click: this.handleCloseSection, + click: this.handleCloseSection }, { title: '临时限速', - click: this.handleLimitSpeed, + click: this.handleLimitSpeed }, { title: '显示', - click: this.handleSectionShow, + click: this.handleSectionShow } ] }, @@ -538,27 +535,27 @@ export default { { title: '取消转换锁闭', // click: this.handleLock - click: this.undeveloped, + click: this.undeveloped }, { title: '取消过岔锁闭', // click: this.handleUnLock - click: this.undeveloped, + click: this.undeveloped }, { title: '远程预复位使能', // click: this.handleRestoration - click: this.undeveloped, + click: this.undeveloped }, { title: '复位', // click: this.handleSectionRestoration - click: this.undeveloped, + click: this.undeveloped }, { title: '显示', // click: this.handleSectionStopShow - click: this.undeveloped, + click: this.undeveloped } ] }, @@ -1414,7 +1411,7 @@ export default { if (valid) { this.closeMenu(true); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.standDetain.doShow(); + this.$refs.standDetain.doShow({active:'first'}); } }); }, @@ -1789,7 +1786,8 @@ export default { if (valid) { this.closeMenu(true); this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); - this.$refs.systemDetain.doShow(operate); + // this.$refs.systemDetain.doShow(operate); + this.$refs.standDetain.doShow({active:'second'}); } }); }, diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue index 75cfe7510..06ce7dd72 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue @@ -1,56 +1,58 @@ - diff --git a/src/router/index_Common.js b/src/router/index_Common.js index ca459a933..84d337e8f 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -107,6 +107,7 @@ const RunPlanEveryDay = () => import('@/views/publish/runPlanEveryDay/index'); const RunplanView = () => import('@/views/publish/runPlanEveryDay/runPlanView'); const PublishExamRule = () => import('@/views/publish/examRule/index'); const PublishExamRuleDraft = () => import('@/views/publish/examRule/draft/index'); +const PublishIBP = () => import('@/views/publish/publishIBP/index'); const TrainingPlatform = () => import('@/views/trainingPlatform/index'); @@ -665,6 +666,13 @@ export const asyncRouter = [ path: 'examRule/draft/:mode/:ruleId/:lessonId', component: PublishExamRuleDraft, hidden: true + }, + { // 发布ibp盘 + path: 'ibp', + component: PublishIBP, + meta: { + i18n: 'router.publishIBPManage' + } } ] }, diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js index 3a2ce1772..6986c3420 100644 --- a/src/utils/loaddata.js +++ b/src/utils/loaddata.js @@ -58,7 +58,7 @@ export function handleMapData(mapData, type) { } } export function loadRunPlanData(group, dataError) { - if (!store.state.runPlan.runPlanInfo) { + if (!store.state.runPlan.runPlanInfo || !store.state.runPlan.runPlanInfo.templateId) { MessageBox.confirm('未获取到运行图信息！', '提示', { confirmButtonText: '确定', showCancelButton: false, diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index b84cb8787..850cb78af 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -184,7 +184,7 @@ export default { let res = {}; res = await createSimulationNew(data); if (res && res.code == 200) { - const query = { group: res.data, lineCode:this.courseModel.lineCode }; + const query = { group: res.data, lineCode:this.courseModel.lineCode, mapId: this.courseModel.mapId }; this.$router.push({ path: `/displayIscs/system`, query: query }); } } catch (error) { diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue index 4f7227dae..9b5523965 100644 --- a/src/views/designPlatform/bigScreen.vue +++ b/src/views/designPlatform/bigScreen.vue @@ -65,7 +65,7 @@ export default { this.$store.dispatch('map/setTrainWindowShow', false); this.$jlmap.off('zoom'); this.handleUpdateScreen(); - if (this.$route.query.group) { + if (this.$route.query.group && !this.$route.path.includes('displayIscs')) { this.subscribe(); } }, @@ -85,7 +85,7 @@ export default { await this.setWindowSize(); await this.initLoadData(); this.disPlay = true; - if (this.$route.path.includes('design/bigScreen') || this.$route.query.noPreLogout || this.$route.query.projectDevice) { + if (this.$route.path.includes('design/bigScreen') || this.$route.query.noPreLogout || this.$route.query.projectDevice || this.$route.path.includes('displayIscs')) { this.disPlay = false; } }, diff --git a/src/views/iscs/iscsSystem/stationConfig/index.vue b/src/views/iscs/iscsSystem/stationConfig/index.vue index b13b24a60..13fb18f19 100644 --- a/src/views/iscs/iscsSystem/stationConfig/index.vue +++ b/src/views/iscs/iscsSystem/stationConfig/index.vue @@ -2,7 +2,7 @@
- + @@ -14,7 +14,7 @@ - +
@@ -22,11 +22,18 @@ import PsdSystem from './psdSystem/index.vue'; import Substation from './powerMonitor/substation.vue'; import Normal from './environment/index.vue'; +import Schedule from './schedule'; +import BigScreen from '@/views/designPlatform/bigScreen'; +import { getSimulationInfoNew } from '@/api/simulation'; +import { getByGroupStationList } from '@/api/jmap/map'; +import { loadRunPlanData } from '@/utils/loaddata'; export default { components:{ + Schedule, PsdSystem, Substation, - Normal + Normal, + BigScreen }, data() { return { @@ -34,21 +41,44 @@ export default { deviceList: [] }; }, + computed: { + group() { + return this.$route.query.group; + } + }, watch: { '$route': function(val) { this.mode = this.$route.params.mode; + }, + '$store.state.socket.runPlanReloadCount': function (val) { + getSimulationInfoNew(this.group).then(res => { + this.$store.dispatch('runPlan/setRunPlanInfo', res.data.runPlan); + loadRunPlanData(this.group); + }); } - // '$store.state.iscs.selectedCount': function() { - // const device = this.$store.state.iscs.selected; - // if (device && device._type === 'IscsButton' && device.function === 'GraphicEle') { - // this.$refs.graphicEle.doShow(); - // } else if (device && this.deviceList.includes(device._type)) { - // this.$refs.deviceControl.doShow(device); - // } - // } }, mounted() { this.mode = this.$route.params.mode; + getSimulationInfoNew(this.group).then(res => { + this.$store.dispatch('runPlan/setRunPlanInfo', res.data.runPlan); + this.loadRunData(); + }); + }, + methods: { + loadRunData() { + this.$store.dispatch('runPlan/clear').then(() => { + if (this.group) { + // 获取排序的车站列表 + getByGroupStationList(this.group).then(response => { + this.$store.dispatch('runPlan/setStations', response.data).then(() => { + loadRunPlanData(this.group); + }); + }).catch(() => { + this.$messageBox(this.$t('display.schema.getStationListFail')); + }); + } + }); + } } }; diff --git a/src/views/iscs/iscsSystem/stationConfig/schedule.vue b/src/views/iscs/iscsSystem/stationConfig/schedule.vue new file mode 100644 index 000000000..5767caad0 --- /dev/null +++ b/src/views/iscs/iscsSystem/stationConfig/schedule.vue @@ -0,0 +1,507 @@ + + + + + diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue index 1e31eb0b0..8fd265e88 100644 --- a/src/views/iscs/iscsSystem/stationNav.vue +++ b/src/views/iscs/iscsSystem/stationNav.vue @@ -49,8 +49,8 @@ {{ button.name }}
-
-
{{ child.name }}
+
+
{{ child.name }}
@@ -260,7 +260,8 @@ export default { name: 'TIS管理器', mode: 'tis', id: 'tis', - type: 'interface' + type: 'interface', + disabled: true }, { name: '列车时刻表', @@ -278,7 +279,8 @@ export default { name: '全线信号系统界面', mode: 'allLineSignal', id: 'allLineSignal', - type: 'interface' + type: 'interface', + disabled: true } ]} // communication:{name:'通信', type:'totalSystem', id: 'communication', active:false, icon:iscs_icon7, @@ -398,8 +400,10 @@ export default { this.buttonId = button.id; }, gotoPage(button, child) { - button.active = false; - this.selectChildren(child.id, false); + if (!child.disabled) { + button.active = false; + this.selectChildren(child.id, false); + } }, changeStation(item) { this.selectStation = item; @@ -425,7 +429,7 @@ export default { if (station) { stationName = station.name; } - const query = {stationName: stationName, stationId: this.selectStation, group: this.group, lineCode:this.lineCode }; + const query = {stationName: stationName, stationId: this.selectStation, group: this.group, lineCode:this.lineCode, mapId: this.$route.query.mapId, noPreLogout:this.$route.query.noPreLogout }; if (isReplace) { this.$router.replace({ path: `/displayIscs/system/stationConfig/${type}`, query: query }); diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index 004aa2791..939e8b49f 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -7,6 +7,7 @@ IBP盘 大屏 + ISCS {{ $t('joinTraining.runGraphPreview') }}