进路调整,绘图相关调整

(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

View File

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

View File

@ -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'

View File

@ -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; }

View File

@ -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 = [];

View File

@ -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"