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:
joylink_cuiweidong 2020-12-10 13:53:34 +08:00
parent 0bfc5cb330
commit 3f7eccdc2f
8 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/langs/en/map.js
View File

@ -168,7 +168,8 @@ export default {
automaticSignalUpdateSucceeded: 'Automatic signal update successful!',
automaticSignalUpdateFailed: 'Automatic signal update failed',
stationName: 'The station name:',
stationName: 'The station name',
stationNameColon: 'The station name:',
property: 'attribute',
counterCoding: 'Counter coding:',

3
src/i18n/langs/zh/map.js
View File

@ -156,7 +156,8 @@ export default {
interconnected: '联锁控名称',
buttonType: '所属类型',
stationName: '车站名称:',
stationNameColon: '车站名称:',
stationName: '车站名称',
property: '属性',
counterCoding: '计数器编码:',

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

@ -137,7 +137,7 @@ export default {
all:{
name:'',
item: [
{ prop: 'stationCode', label: this.$t('map.stationName'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
{ prop: 'stationCode', label: this.$t('map.stationNameColon'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
{ prop: 'type', label: this.$t('map.counterType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.typeList }
]
}

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

@ -135,7 +135,7 @@ export default {
all:{
name:'',
item: [
{ prop: 'stationCode', label: this.$t('map.stationName'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList }
{ prop: 'stationCode', label: this.$t('map.stationNameColon'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList }
]
}
}

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

@ -163,7 +163,7 @@ export default {
name: this.$t('map.drawData'),
item: [
{ prop: 'code', label: this.$t('map.stationCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.stationName'), type: 'input' },
{ prop: 'name', label: this.$t('map.stationNameColon'), type: 'input' },
{ prop: 'number', label: this.$t('map.stationNumber'), type: 'input' },
{ prop: 'sn', label: '车站序号', type: 'input' },
{ prop: 'position', label: this.$t('map.stationPosition'), type: 'coordinate', width: '120px', children: [

27
src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue
View File

@ -43,10 +43,12 @@ export default {
{ value: 5, label: '等级五' }
],
formModel: {
gernarateType:'01',
serviceNumber:'', // 服务号
beginTime: '', // 开始时间
overTime: '', // 结束时间
runLevel:'', // 运行等级
departureInterval:0, // 发车间隔
inboundRouting:'', // 回库交路code
outboundRouting:'', // 出库交路code
runningRouting1: '', // 环路code1
@ -66,6 +68,9 @@ export default {
runLevel: [
{ required: true, message: '请选择运行等级', trigger: 'change' }
],
departureInterval:[
{ required: true, message: '请填写发车间隔', trigger: 'blur' }
],
inboundRouting: [
{ required: true, message: '请选择回库交路', trigger: 'change' }
],
@ -93,14 +98,19 @@ export default {
labelWidth: '100px',
size:'small',
items: [
{ prop: 'serviceNumber', label: '服务号', type: 'text', rightWidth:true, maxlength:3 },
{ prop: 'gernarateType', label: '生成类型', type: 'checkBox', children: [
{ name: '单条服务', value: '01' },
{ name: '多条服务', value: '02' }
] },
{ prop: 'serviceNumber', label: '服务号', type: 'text', rightWidth:true, maxlength:3, show:this.formModel.gernarateType == '01'},
{ prop: 'beginTime', label: '开始时间', type: 'timePicker'},
{ prop: 'overTime', label: '结束时间', type: 'timePicker'},
{ prop: 'runLevel', label: '运行等级', type: 'select', options: this.runLevelList },
{ prop: 'outboundRouting', label: '出库交路', type: 'select', options: this.covertRouting('OUTBOUND'), noDataText:'请先设置交路' },
{ prop: 'runningRouting1', label: '环路交路1', type: 'select', options: this.covertRouting('LOOP'), noDataText:'请先设置交路', change:true, onChange:this.changeRoute('runningRouting2')},
{ prop: 'runningRouting2', label: '环路交路2', type: 'select', options: this.covertRouting('LOOP'), noDataText:'请先设置交路', change:true, onChange:this.changeRoute('runningRouting1')},
{ prop: 'inboundRouting', label: '入库交路', type: 'select', options: this.covertRouting('INBOUND'), noDataText:'请先设置交路' }
{ prop: 'departureInterval', label: '发车间隔', type: 'number', show:this.formModel.gernarateType == '02', min:0, step:1, precisionFlag:true, precision:0 },
{ prop: 'outboundRouting', label: '出库交路', type: 'select', options: this.covertRouting('OUTBOUND'), noDataText:'请先设置交路'},
{ prop: 'runningRouting1', label: '环路交路1', type: 'select', show:true, options: this.covertRouting('LOOP'), noDataText:'请先设置交路', change:true, onChange:this.changeRoute2 },
{ prop: 'runningRouting2', label: '环路交路2', type: 'select', show:true, options: this.covertRouting('LOOP'), noDataText:'请先设置交路', change:true, onChange:this.changeRoute1},
{ prop: 'inboundRouting', label: '入库交路', type: 'select', options: this.covertRouting('INBOUND'), noDataText:'请先设置交路'}
]
};
}
@ -141,6 +151,12 @@ export default {
}
}
},
changeRoute2() {
this.changeRoute('runningRouting2');
},
changeRoute1() {
this.changeRoute('runningRouting1');
},
changeRoute(runningRouting) {
if (this.formModel[runningRouting]) { this.$refs.dataform.validateField([runningRouting]); }
},
@ -158,6 +174,7 @@ export default {
this.$messageBox('结束时间必须大于开始时间');
return false;
}
delete this.formModel.gernarateType;
this.loading = true;
generatePlanTrain(this.$route.query.planId || this.loadRunPlanId, this.formModel).then(res => {
this.loading = false;

6
src/views/planMonitor/editTool/menus/populatingGenericData.vue
View File

@ -82,9 +82,9 @@ export default {
items: [
{ prop: 'beginTime', label: '开始时间', type: 'timePicker'},
{ prop: 'overTime', label: '结束时间', type: 'timePicker'},
{ prop: 'departureTimeInterval', label: '发车间隔', type: 'number'},
{ prop: 'parkedTime', label: '停站时间', type: 'number'},
{ prop: 'reentryTime', label: '折返时间', type: 'number'},
{ prop: 'departureTimeInterval', label: '发车间隔', type: 'number', min:0, step:1, precisionFlag:true, precision:0 },
{ prop: 'parkedTime', label: '停站时间', type: 'number', min:0, step:1, precisionFlag:true, precision:0},
{ prop: 'reentryTime', label: '折返时间', type: 'number', min:0, step:1, precisionFlag:true, precision:0},
{ prop: 'right', label: '发车类型', type: 'checkBox', children: [
{ name: '上行发车', value: 1 },
{ name: '下次发车', value: 2 },

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

@ -32,7 +32,7 @@
height="300"
class="el-parkSectionCode-table"
>
<el-table-column prop="stationCode" :label="$t('map.sectionName')">
<el-table-column prop="stationCode" :label="$t('map.stationName')">
<template slot-scope="scope">
<span>{{ formatName(scope.row.stationCode) }}</span>
</template>