joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj

Browse Source
This commit is contained in:
ival 2021-03-08 09:17:30 +08:00
commit 46d139e8a5
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
View File

@ -137,7 +137,7 @@ export default {
},
computed: {
title() {
return this.$t('planMonitor.modifying.modifyRunLevel');
return this.$t('planMonitor.modifying.modifyRunLevel') + ' (单位：秒)';
}
},
mounted() {

9
src/views/planMonitor/editTool/routingoperate/runplanConfig.vue
View File

@ -143,14 +143,13 @@ export default {
}
}
reentryData[each.code] = temp;
} else {
if (each.reentryData.tbBack || each.reentryData.tbFrom || each.reentryData.tbTo) {
tbBackList.push(each.stationName);
}
}
if (each.reentryData.tbBack || each.reentryData.tbFrom || each.reentryData.tbTo) {
tbBackList.push(each.stationName);
}
});
if (tbBackList.length > 0) {
this.$messageBox('请设置【' + reentryData.toString() + '】站后折返信息');
this.$messageBox('请设置【' + tbBackList.toString() + '】站后折返信息');
return;
} else if (Object.keys(reentryData).length == 0) {
// JSON.stringify(reentryData) == '{}'

2
src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue
View File

@ -137,7 +137,7 @@ export default {
},
computed: {
title() {
return this.$t('planMonitor.modifying.modifyRunLevel');
return this.$t('planMonitor.modifying.modifyRunLevel') + ' (单位：秒)';
}
},
mounted() {