进路调整,绘图相关调整
This commit is contained in:
parent
e966312a03
commit
e9749daddb
@ -112,6 +112,9 @@ class Status {
|
|||||||
handleMapCycleButtonVO(device) {
|
handleMapCycleButtonVO(device) {
|
||||||
this.statusObj = { };
|
this.statusObj = { };
|
||||||
}
|
}
|
||||||
|
handleAutomaticRoute(device) {
|
||||||
|
this.statusObj = { };
|
||||||
|
}
|
||||||
handleOutFrame(device) {
|
handleOutFrame(device) {
|
||||||
this.statusObj = { };
|
this.statusObj = { };
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,9 @@ export default class Station extends Group {
|
|||||||
});
|
});
|
||||||
this.create();
|
this.create();
|
||||||
this.createTurnBack(); // 创建按图折返
|
this.createTurnBack(); // 创建按图折返
|
||||||
|
if (!this.prdType || style.Station.functionButtonShow.indexOf(this.prdType) !== -1) {
|
||||||
this.createGuideTotalLock(); // 创建引导总锁
|
this.createGuideTotalLock(); // 创建引导总锁
|
||||||
|
}
|
||||||
this.createControlMode();
|
this.createControlMode();
|
||||||
this.setState(model);
|
this.setState(model);
|
||||||
this.checkIsDrawMap();
|
this.checkIsDrawMap();
|
||||||
@ -115,7 +117,7 @@ export default class Station extends Group {
|
|||||||
createGuideTotalLock() { // 创建引导总锁
|
createGuideTotalLock() { // 创建引导总锁
|
||||||
const model = this.model;
|
const model = this.model;
|
||||||
const style = this.style;
|
const style = this.style;
|
||||||
if (model.guideTotalLock || !this.prdType || style.Station.functionButtonShow.indexOf(this.prdType) !== -1) {
|
if (model.guideTotalLock) {
|
||||||
this.guideLamp = new EControl({
|
this.guideLamp = new EControl({
|
||||||
zlevel: this.zlevel,
|
zlevel: this.zlevel,
|
||||||
z: this.z,
|
z: this.z,
|
||||||
|
@ -114,6 +114,13 @@ export default {
|
|||||||
tagType: (row) => { return ''; }
|
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'),
|
title: this.$t('map.startingSignalName'),
|
||||||
prop: 'startSignalCode'
|
prop: 'startSignalCode'
|
||||||
|
@ -10,14 +10,14 @@
|
|||||||
<el-option v-for="item in interBlockStationList" :key="item.code" :label="item.name" :value="item.code" />
|
<el-option v-for="item in interBlockStationList" :key="item.code" :label="item.name" :value="item.code" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('map.routeArc') + ':'" prop="ciControl">
|
<el-form-item :label="$t('map.routeArc') + ':'" prop="arc">
|
||||||
<el-radio-group v-model="addModel.ciControl">
|
<el-radio-group v-model="addModel.arc">
|
||||||
<el-radio :label="true">{{ $t('map.are') }}</el-radio>
|
<el-radio :label="true">{{ $t('map.are') }}</el-radio>
|
||||||
<el-radio :label="false">{{ $t('map.deny') }}</el-radio>
|
<el-radio :label="false">{{ $t('map.deny') }}</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('map.routeFlt') + ':'" prop="setFleetMode">
|
<el-form-item :label="$t('map.routeFlt') + ':'" prop="flt">
|
||||||
<el-radio-group v-model="addModel.setFleetMode">
|
<el-radio-group v-model="addModel.flt">
|
||||||
<el-radio :label="true">{{ $t('map.are') }}</el-radio>
|
<el-radio :label="true">{{ $t('map.are') }}</el-radio>
|
||||||
<el-radio :label="false">{{ $t('map.deny') }}</el-radio>
|
<el-radio :label="false">{{ $t('map.deny') }}</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
@ -250,8 +250,8 @@ export default {
|
|||||||
code: '',
|
code: '',
|
||||||
name: '', // 名字
|
name: '', // 名字
|
||||||
stationCode: '', // 所属站台
|
stationCode: '', // 所属站台
|
||||||
ciControl: false, // 是否自动追踪/联锁自动触发
|
arc: false, // 是否自动追踪/联锁自动触发
|
||||||
setFleetMode: false, // 是否车队/联锁自动进路
|
flt: false, // 是否车队/联锁自动进路
|
||||||
lockFirst:false, // 是否先锁闭——办理过程直接先锁闭区段
|
lockFirst:false, // 是否先锁闭——办理过程直接先锁闭区段
|
||||||
delayReleaseTime: '', // 延时解锁时间
|
delayReleaseTime: '', // 延时解锁时间
|
||||||
turnBack: false, // 是否折返进路
|
turnBack: false, // 是否折返进路
|
||||||
@ -421,6 +421,7 @@ export default {
|
|||||||
list.splice(index, 1);
|
list.splice(index, 1);
|
||||||
},
|
},
|
||||||
buildModel(overlapCode, code) {
|
buildModel(overlapCode, code) {
|
||||||
|
console.log(this.addModel, '=======');
|
||||||
const model = Object.assign({}, this.addModel);
|
const model = Object.assign({}, this.addModel);
|
||||||
model['mapId'] = this.mapInfo.id;
|
model['mapId'] = this.mapInfo.id;
|
||||||
if (code) { model['code'] = code; }
|
if (code) { model['code'] = code; }
|
||||||
|
@ -190,7 +190,6 @@ export default {
|
|||||||
// 创建对象
|
// 创建对象
|
||||||
create() {
|
create() {
|
||||||
this.$refs.make.validate((valid) => {
|
this.$refs.make.validate((valid) => {
|
||||||
console.log(valid, this.addModel, this.editModel);
|
|
||||||
if (valid) {
|
if (valid) {
|
||||||
const uid = getUID('AutomaticRoute', this.automaticRouteButtonList);
|
const uid = getUID('AutomaticRoute', this.automaticRouteButtonList);
|
||||||
let models = [];
|
let models = [];
|
||||||
|
@ -100,9 +100,9 @@
|
|||||||
@setCenter="setCenter"
|
@setCenter="setCenter"
|
||||||
/>
|
/>
|
||||||
</el-tab-pane>
|
</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
|
<automatic-route
|
||||||
ref="AutomacticRoute"
|
ref="AutomaticRoute"
|
||||||
:selected="selected"
|
:selected="selected"
|
||||||
@updateMapModel="updateMapModel"
|
@updateMapModel="updateMapModel"
|
||||||
@setCenter="setCenter"
|
@setCenter="setCenter"
|
||||||
|
Loading…
Reference in New Issue
Block a user