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/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 @@
-
+
{{ scope.row.recovered? 'Y':'N' }}
-
-
+
+
@@ -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/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);