From 418e8b86a4c7d0e16adcc2e0b1413b2d9524d078 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 25 Dec 2020 18:06:08 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=89=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E8=A1=8C=E8=B0=83=E6=93=8D=E4=BD=9C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menuDialog/initSectionLimitSpeed.vue | 114 ++++++++++-------- .../menus/menuDialog/initSectionOpen.vue | 84 +++++++------ .../menus/menuDialog/sectionLimitSpeed.vue | 2 +- .../menus/menuDialog/sectionOpen.vue | 2 +- 4 files changed, 109 insertions(+), 93 deletions(-) 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/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') }} - + 打开 @@ -27,13 +27,20 @@ 所有站台(F) - 系统 + +
+
系统状态
+
+ +
+
+
-
设置状态
- 设置 +
扣车
+ 设置
取消
@@ -75,7 +82,9 @@ export default { allChecked: false, dialogShow: false, loading: false, - selected: null + selected: null, + activeName: 'first', + active: '未激活' }; }, computed: { @@ -93,10 +102,10 @@ export default { }, domIdConfirm() { return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : ''; - }, - domIdApply() { + }, + domIdApply() { return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menuButton.domId : ''; - }, + }, title() { return '扣车'; } @@ -129,8 +138,11 @@ export default { expandPath() { console.log('展开进路预览'); }, - doShow(operate, selected) { - this.selected = selected; + doShow(data) { + if (data.active == 'second') { + this.status = true; + } + this.activeName = data.active; // 如果不是断点激活，而是第一次显示，则需要设置初始值 this.dialogShow = true; this.$nextTick(function () { @@ -143,18 +155,18 @@ export default { this.$refs.singleTable.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); }, - commit(isClose=false) { + commit(isClose = false) { let cmdCommand = menuOperate.StationStand.setDetainTrain; if (this.standStatus) { cmdCommand = menuOperate.StationStand.cancelDetainTrain; - } + } commitOperate(cmdCommand, {standCode: this.selected.code}, 3).then((valid)=>{ if (valid) { isClose && this.doClose(); } }).catch(() => { - isClose && this.doClose(); + isClose && this.doClose(); this.$refs.noticeInfo.doShow(); }); }, @@ -205,16 +217,39 @@ export default { color: #000; } .set-status-box { - position: relative; - top: 200px; - border: 1px solid #AFAFAF; - padding-left: 10px; + position: absolute; + top: 150px; + border: 1px solid #AFAFAF; + padding-left: 10px; + padding-right: 20px; } .set-status-title{ - position: relative; + position: absolute; top: -15px; background: #F0F0F0; - width: 60px; + width: 46px; text-align: center; } + .systemStatus{ + width: 60px; + background: #f0f0f0; + position: absolute; + top: -15px; + left: 15px; + text-align: center; + } + .activeStatus{ + width: 260px; + margin-top: 20px; + margin-left: 15px; + margin-bottom: 15px; + } + .systemStatusOut{ + margin-top: 100px; + position: relative; + display: inline-block; + margin-left: 22px; + border: 1px #ccc solid; + width: 290px; + } diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/systemDetain.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/systemDetain.vue deleted file mode 100644 index 030a72e57..000000000 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/systemDetain.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - From cdb3ab25c0ab30c6a92d6cce26359f3af3a54145 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 28 Dec 2020 14:27:38 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=20=E5=8F=91=E5=B8=83ibp?= =?UTF-8?q?=E7=9B=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ibp.js | 2 +- src/i18n/langs/en/router.js | 3 +- src/i18n/langs/zh/router.js | 3 +- src/router/index_Common.js | 8 +++ src/views/publish/publishIBP/index.vue | 90 ++++++++++++++++++++++++++ 5 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 src/views/publish/publishIBP/index.vue 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/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/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/views/publish/publishIBP/index.vue b/src/views/publish/publishIBP/index.vue new file mode 100644 index 000000000..e9245f6e8 --- /dev/null +++ b/src/views/publish/publishIBP/index.vue @@ -0,0 +1,90 @@ + + From 16206cd0030eed0f9aed1dc9b8f24f3b8ea62d7c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 28 Dec 2020 15:01:25 +0800 Subject: [PATCH 07/10] =?UTF-8?q?bug:=201=20&=20=E7=B4=A7=E6=80=A5?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E8=B0=83=E6=95=B4=20&=20bug:=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shape/StationStand/emergent/EEmergentCross.js | 12 ++++++------ .../shape/StationStand/safeStand/EHollowStand.js | 2 +- .../shape/StationStand/safeStand/ESolidStand.js | 2 +- .../theme/fuzhou_01/menus/dialog/standStopTime.vue | 2 +- src/utils/loaddata.js | 2 +- .../planMonitor/editTool/menus/createEmptyPlan.vue | 2 +- .../newEditTool/menus/createEmptyPlan.vue | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) 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/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/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/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue index 0fbb2122a..ec3b60631 100644 --- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue +++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue @@ -129,7 +129,7 @@ export default { } }, doShow() { - this.newModel.map = this.$route.params.mapId || this.$route.query.mapId; + this.newModel.mapId = this.$route.params.mapId || this.$route.query.mapId; this.pullModel.mapId = this.$route.params.mapId || this.$route.query.mapId; this.dialogShow = true; this.initLoad(); diff --git a/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue b/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue index 4c27f9218..169275855 100644 --- a/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue +++ b/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue @@ -129,7 +129,7 @@ export default { } }, doShow() { - this.newModel.map = this.$route.params.mapId || this.$route.query.mapId; + this.newModel.mapId = this.$route.params.mapId || this.$route.query.mapId; this.pullModel.mapId = this.$route.params.mapId || this.$route.query.mapId; this.dialogShow = true; this.initLoad(); From 908aa12c2137862f14982f51c26abf719dd1f62e Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 28 Dec 2020 16:00:55 +0800 Subject: [PATCH 08/10] =?UTF-8?q?bug:=2011=20=E8=AE=BE=E7=BD=AE=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E7=AD=89=E7=BA=A7=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuzhou_01/menus/dialog/standRunLevel.vue | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue index 8569aa354..fa3d153c7 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,40 @@ 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]; + let nextStationStand = ''; + this.stationStandList.forEach(stand => { + if (stand.stationCode === nextStation.code && stand.right) { nextStationStand = stand; } + }); + 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]; + let nextStationStand = ''; + this.stationStandList.forEach(stand => { + if (stand.stationCode === nextStation.code && stand.right) { nextStationStand = stand; } + }); + console.log(nextStation, nextStationStand, '========'); + nextStation && nextStationStand && this.tempData.push({ + name: `${nextStationStand.name}(${nextStation.name})`, + time: selected.runLevelTime ? selected.runLevelTime : 0, + check: !!selected.runLevelTimeForever + }); } }, doShow(operate, selected) { From dbbd817aad6d8f7daf2254335943720cde29f65b Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 28 Dec 2020 16:25:29 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E4=BB=BF?= =?UTF-8?q?=E7=9C=9F=E7=BA=BF=E8=B7=AF=E9=87=8C=E7=9A=84=E4=BA=A4=E5=87=BA?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=EF=BC=88bug12=EF=BC=89=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/haerbin_01/menus/menuButton.vue | 30 +++++++++++++++++++ src/views/publish/publishIBP/index.vue | 8 ++--- 2 files changed, 34 insertions(+), 4 deletions(-) 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/views/publish/publishIBP/index.vue b/src/views/publish/publishIBP/index.vue index e9245f6e8..60731ef89 100644 --- a/src/views/publish/publishIBP/index.vue +++ b/src/views/publish/publishIBP/index.vue @@ -67,13 +67,13 @@ export default { methods:{ async loadInitData() { const res = await getPublishMapListOnline(); - res.data.forEach(each=>{ - this.queryForm.queryObject.mapId.config.data.push({label:each.name, value:each.code}); - this.mapListMap[each.code] = each.name; + res.data.forEach(elem=>{ + this.queryForm.queryObject.mapId.config.data.push({label:elem.name, value:elem.id}); + this.mapListMap[elem.id] = elem.name; }); }, covertMap(row) { - return this.mapListMap[row.code]; + return this.mapListMap[row.mapId]; } // covertData(row) { // // const staitonlist = this.stationList.filter(element => { From b24e59bc9ad6e293474847363e2bc291c9c1a917 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 28 Dec 2020 16:41:37 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/fuzhou_01/menus/dialog/standRunLevel.vue | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue index fa3d153c7..e58c2b90a 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue @@ -154,10 +154,7 @@ export default { const stationIndex = this.sortStationList.findIndex((item) => item.code == selected.stationCode); if (selected.right) { const nextStation = this.sortStationList[stationIndex + 1]; - let nextStationStand = ''; - this.stationStandList.forEach(stand => { - if (stand.stationCode === nextStation.code && stand.right) { nextStationStand = stand; } - }); + 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, @@ -165,11 +162,7 @@ export default { }); } else { const nextStation = this.sortStationList[stationIndex - 1]; - let nextStationStand = ''; - this.stationStandList.forEach(stand => { - if (stand.stationCode === nextStation.code && stand.right) { nextStationStand = stand; } - }); - console.log(nextStation, nextStationStand, '========'); + 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,