diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index 211982a16..a33bbf495 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -16,11 +16,11 @@ class MenuContextHandler { getStationControl(selected) { let control; if (selected._type == 'StationStand') { - control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode); + control = store.getters['map/getDeviceStationCodeByStationCode'](selected.deviceStationCode); } else if (selected._type == 'Station') { - control = store.getters['map/getStationControlByStationCode'](selected.code); + control = store.getters['map/getDeviceStationCodeByStationCode'](selected.code); } else { - control = store.getters['map/getStationControlByStationCode'](selected.stationCode); + control = store.getters['map/getDeviceStationCodeByStationCode'](selected.deviceStationCode); } return control; } diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index e8de8798c..55f030758 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -229,7 +229,6 @@ export default { const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType }; schedulingNotify(data).then(resp => { const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser }; - console.log(this.drawWay, '-------xinban'); if (this.drawWay) { this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query }); } else { diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index efffb7621..4a4962bbf 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -134,17 +134,17 @@ export default { } } else { - getEveryDayRunPlanNew(this.group).then(resp => { - this.$store.dispatch('runPlan/setPlanData', resp.data); - this.viewDisabled = false; - }).catch(error => { - this.$store.dispatch('runPlan/setPlanData', []); - if (error.code == 30001) { - this.$messageBox(this.$t('display.schema.todayRunDiagramNoLoad')); - } else { - this.$messageBox(this.$t('display.schema.getRunDiagramFail')); - } - }); + // getEveryDayRunPlanNew(this.group).then(resp => { + // this.$store.dispatch('runPlan/setPlanData', resp.data); + // this.viewDisabled = false; + // }).catch(error => { + // this.$store.dispatch('runPlan/setPlanData', []); + // if (error.code == 30001) { + // this.$messageBox(this.$t('display.schema.todayRunDiagramNoLoad')); + // } else { + // this.$messageBox(this.$t('display.schema.getRunDiagramFail')); + // } + // }); } }); }).catch(() => {