diff --git a/src/i18n/langs/en/planMonitor.js b/src/i18n/langs/en/planMonitor.js index 9a00d9953..9e652dc71 100644 --- a/src/i18n/langs/en/planMonitor.js +++ b/src/i18n/langs/en/planMonitor.js @@ -212,7 +212,7 @@ export default { addTaskHint1: 'Please set the section running time of the start section ', addTaskHint2: 'to the section', addTaskHint3: '', - normalNew: 'Normal new', + normalNew: 'New', createFromTheReleaseRunGraph: 'Create from the release run graph', releaseRunGraph: 'Release run graph', newRunGraph: 'New run graph', diff --git a/src/i18n/langs/zh/planMonitor.js b/src/i18n/langs/zh/planMonitor.js index 7f237d34d..c8087acea 100644 --- a/src/i18n/langs/zh/planMonitor.js +++ b/src/i18n/langs/zh/planMonitor.js @@ -215,7 +215,7 @@ export default { addTaskHint1: '请先设置开始区段', addTaskHint2: '终到区段', addTaskHint3: '的站间运行时间', - normalNew: '正常新建', + normalNew: '新建', runGraphName: '运行图名称', createFromTheReleaseRunGraph: '从发布运行图创建', releaseRunGraph: '发布运行图', diff --git a/src/jmapNew/shape/Station/EStationText.js b/src/jmapNew/shape/Station/EStationText.js index 51ec8f7aa..cca7d4fb4 100644 --- a/src/jmapNew/shape/Station/EStationText.js +++ b/src/jmapNew/shape/Station/EStationText.js @@ -83,7 +83,6 @@ class EStationText extends Group { setBackground(color) { const style = this.model.style; if (style.Station.StationControl.disPlayNone) { - console.log('///////////'); this.stationName.setStyle('textBackgroundColor', color); this.subheadText && this.subheadText.setStyle('textBackgroundColor', color); } diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index a68f47670..7ce68abdb 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -568,7 +568,7 @@ export default class Station extends Group { handleComplexControl(controller) { // const controller = model.controller; const memberData = store.state.training.memberData; - console.log(controller, memberData[controller], memberData[controller].userId, store.state.user.id, '88888888'); + // console.log(controller, memberData[controller], memberData[controller].userId, store.state.user.id, '88888888'); if (memberData[controller].userId && memberData[controller].userId == store.state.user.id) { this.stationText.setColor(this.style.Station.stationText.currentModeColor); } else { diff --git a/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue index a77c1b0f3..b237878a1 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue @@ -69,13 +69,13 @@ - + - - + + @@ -136,7 +136,7 @@ export default { confirmAlarm(this.$route.query.group, codes).then(resp => { this.queryData(true); }).catch(() => { - EventBus.$emit('sendMsg', {message: '确认消息失败！'}); + EventBus.$emit('sendMsg', {message: '确认消息失败！'}); }); }, handleDeviceName(code) { diff --git a/src/views/newMap/mapsystemNew/index.vue b/src/views/newMap/mapsystemNew/index.vue index 9897d7ca7..01c78d377 100644 --- a/src/views/newMap/mapsystemNew/index.vue +++ b/src/views/newMap/mapsystemNew/index.vue @@ -48,8 +48,7 @@ export default { '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态 this.mapBoxP = document.getElementById(this.canvasId).children[0]; this.mapBoxP.style.cursor = ''; - this.initMemberUserInfo(); - this.subscribe(); + this.initMemberUserInfo(true); }, '$store.state.socket.memberChangeCount': function () { // 仿真成员变更 this.initMemberUserInfo(); @@ -164,18 +163,21 @@ export default { } }, 1000); }, - initMemberUserInfo() { + initMemberUserInfo(isFirst = false) { // 获取仿真成员列表 getSimulationMemberList(this.$route.query.group).then(resp => { this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.$store.state.user.id }); + getAllSimulationUser(this.$route.query.group).then(resp => { + this.$store.dispatch('training/setSimulationUserList', resp.data); + if (isFirst) { + this.subscribe(); + } + }).catch(() => { + this.$messageBox('获取所有仿真用户失败！'); + }); }).catch(() => { this.$messageBox('获取仿真成员列表失败！'); }); - getAllSimulationUser(this.$route.query.group).then(resp => { - this.$store.dispatch('training/setSimulationUserList', resp.data); - }).catch(() => { - this.$messageBox('获取所有仿真用户失败！'); - }); }, handlerMemberOnOff(data) { this.$store.dispatch('training/updateMemberAndUser', { simulationUserList: data, userId: this.userId }); diff --git a/src/views/newMap/newMapdraft/mapoperate/line.vue b/src/views/newMap/newMapdraft/mapoperate/line.vue index db9677c0a..74b1b7d99 100644 --- a/src/views/newMap/newMapdraft/mapoperate/line.vue +++ b/src/views/newMap/newMapdraft/mapoperate/line.vue @@ -119,7 +119,7 @@ export default { { prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }, { prop: 'stationCode', label: this.$t('map.equipmentStation') + ':', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.centralizedStationList }, { prop: 'offsetX', label: '右侧设备X偏移:', type: 'number', min: 0, isHidden: !this.isFoldLine }, - { prop: 'offsetY', label: '左侧设备Y偏移:', type: 'number', min: 0, isHidden: !this.isFoldLine } + { prop: 'offsetY', label: '右侧设备Y偏移:', type: 'number', min: 0, isHidden: !this.isFoldLine } ] }, map: { diff --git a/src/views/planMonitor/editTool/routingoperate/routeConfig.vue b/src/views/planMonitor/editTool/routingoperate/routeConfig.vue index 4cc5e0235..7b01d6e01 100644 --- a/src/views/planMonitor/editTool/routingoperate/routeConfig.vue +++ b/src/views/planMonitor/editTool/routingoperate/routeConfig.vue @@ -487,17 +487,13 @@ export default { addStartSectionData(isStation) { if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '') { this.isStartSelected = true; - const result = this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation); - return result; + this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation); } - return false; }, addEndSectionData(isStation) { if (this.addModel.endStationCode != '' && this.addModel.endSectionCode != '') { - const result = this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom', isStation); - return result; + this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom', isStation); } - return false; }, buildModel(code) { const model = Object.assign({}, this.addModel);