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/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/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') }}