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

问题调整

Browse Source
This commit is contained in:
fan 2021-02-23 18:17:15 +08:00
parent 1eb5dd05c3
commit f0cd6ff07c
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/langs/en/planMonitor.js
View File

@ -212,7 +212,7 @@ export default {
addTaskHint1: 'Please set the section running time of the start section ', addTaskHint1: 'Please set the section running time of the start section ',
addTaskHint2: 'to the section', addTaskHint2: 'to the section',
addTaskHint3: '', addTaskHint3: '',
normalNew: 'Normal new', normalNew: 'New',
createFromTheReleaseRunGraph: 'Create from the release run graph', createFromTheReleaseRunGraph: 'Create from the release run graph',
releaseRunGraph: 'Release run graph', releaseRunGraph: 'Release run graph',
newRunGraph: 'New run graph', newRunGraph: 'New run graph',

2
src/i18n/langs/zh/planMonitor.js
View File

@ -215,7 +215,7 @@ export default {
addTaskHint1: '请先设置开始区段', addTaskHint1: '请先设置开始区段',
addTaskHint2: '终到区段', addTaskHint2: '终到区段',
addTaskHint3: '的站间运行时间', addTaskHint3: '的站间运行时间',
normalNew: '正常新建', normalNew: '新建',
runGraphName: '运行图名称', runGraphName: '运行图名称',
createFromTheReleaseRunGraph: '从发布运行图创建', createFromTheReleaseRunGraph: '从发布运行图创建',
releaseRunGraph: '发布运行图', releaseRunGraph: '发布运行图',

6
src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue
View File

@ -69,13 +69,13 @@
</el-table-column> </el-table-column>
<el-table-column prop="confirmedUserName" label="确认人编号" width="120px" /> <el-table-column prop="confirmedUserName" label="确认人编号" width="120px" />
<el-table-column prop="confirmTime" label="确认时间" width="150px" /> <el-table-column prop="confirmTime" label="确认时间" width="150px" />
<el-table-column prop="recoverTime" label="恢复"> <el-table-column prop="recovered" label="恢复">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.recovered? 'Y':'N' }}</span> <span>{{ scope.row.recovered? 'Y':'N' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="恢复时间" /> <el-table-column prop="recoverTime" label="恢复时间" width="150px" />
<el-table-column prop="address" label="备注信息" width="200px" /> <el-table-column prop="address" label="备注信息" width="100px" />
</el-table> </el-table>
</div> </div>
</el-dialog> </el-dialog>

2
src/views/newMap/newMapdraft/mapoperate/line.vue
View File

@ -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: '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: '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: '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: { map: {

8
src/views/planMonitor/editTool/routingoperate/routeConfig.vue
View File

@ -487,17 +487,13 @@ export default {
addStartSectionData(isStation) { addStartSectionData(isStation) {
if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '') { if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '') {
this.isStartSelected = true; this.isStartSelected = true;
const result = this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation); this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation);
return result;
} }
return false;
}, },
addEndSectionData(isStation) { addEndSectionData(isStation) {
if (this.addModel.endStationCode != '' && this.addModel.endSectionCode != '') { if (this.addModel.endStationCode != '' && this.addModel.endSectionCode != '') {
const result = this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom', isStation); this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom', isStation);
return result;
} }
return false;
}, },
buildModel(code) { buildModel(code) {
const model = Object.assign({}, this.addModel); const model = Object.assign({}, this.addModel);