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

进路调整，绘图相关调整

Browse Source 
(cherry picked from commit e9749da)
This commit is contained in:
joylink_fanyuhong 2020-03-06 18:25:05 +08:00
parent b92b2ff786
commit 7f53be45b1
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmapNew/constant/stateTransition.js
View File

@ -113,6 +113,9 @@ class Status {
handleMapCycleButtonVO(device) {
this.statusObj = { };
}
handleAutomaticRoute(device) {
this.statusObj = { };
}
handleOutFrame(device) {
this.statusObj = { };
}

7
src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
View File

@ -114,6 +114,13 @@ export default {
tagType: (row) => { return ''; }
},
{
title: '是否自动进路',
prop: 'flt',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.flt, this.turnBackList, ['value', 'label']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('map.startingSignalName'),
prop: 'startSignalCode'

13
src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
View File

@ -10,14 +10,14 @@
<el-option v-for="item in interBlockStationList" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
</el-form-item>
<el-form-item :label="$t('map.routeArc') + ':'" prop="ciControl">
<el-radio-group v-model="addModel.ciControl">
<el-form-item :label="$t('map.routeArc') + ':'" prop="arc">
<el-radio-group v-model="addModel.arc">
<el-radio :label="true">{{ $t('map.are') }}</el-radio>
<el-radio :label="false">{{ $t('map.deny') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('map.routeFlt') + ':'" prop="setFleetMode">
<el-radio-group v-model="addModel.setFleetMode">
<el-form-item :label="$t('map.routeFlt') + ':'" prop="flt">
<el-radio-group v-model="addModel.flt">
<el-radio :label="true">{{ $t('map.are') }}</el-radio>
<el-radio :label="false">{{ $t('map.deny') }}</el-radio>
</el-radio-group>
@ -250,8 +250,8 @@ export default {
code: '',
name: '', // 名字
stationCode: '', // 所属站台
ciControl: false, // 是否自动追踪/联锁自动触发
setFleetMode: false, // 是否车队/联锁自动进路
arc: false, // 是否自动追踪/联锁自动触发
flt: false, // 是否车队/联锁自动进路
lockFirst:false, // 是否先锁闭——办理过程直接先锁闭区段
delayReleaseTime: '', // 延时解锁时间
turnBack: false, // 是否折返进路
@ -421,6 +421,7 @@ export default {
list.splice(index, 1);
},
buildModel(overlapCode, code) {
console.log(this.addModel, '=======');
const model = Object.assign({}, this.addModel);
model['mapId'] = this.mapInfo.id;
if (code) { model['code'] = code; }

1
src/views/newMap/newMapdraft/mapoperate/automaticRoute.vue
View File

@ -190,7 +190,6 @@ export default {
// 创建对象
create() {
this.$refs.make.validate((valid) => {
console.log(valid, this.addModel, this.editModel);
if (valid) {
const uid = getUID('AutomaticRoute', this.automaticRouteButtonList);
let models = [];

4
src/views/newMap/newMapdraft/mapoperate/index.vue
View File

@ -100,9 +100,9 @@
@setCenter="setCenter"
/>
</el-tab-pane>
<el-tab-pane label="自动进路" class="tab_pane_box" name="AutomacticRoute">
<el-tab-pane label="自动进路" class="tab_pane_box" name="AutomaticRoute">
<automatic-route
ref="AutomacticRoute"
ref="AutomaticRoute"
:selected="selected"
@updateMapModel="updateMapModel"
@setCenter="setCenter"