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

大铁线路调整30

Browse Source
This commit is contained in:
fan 2022-05-05 17:08:17 +08:00
parent 86b955698b
commit aee6474645
8 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/jmap/mapdraft.js
View File

@ -743,3 +743,10 @@ export function generateDepotCiData(mapId, stationCode) {
method: 'post'
});
}
// 大铁线路批量生成进路
export function generateRoute(mapId) {
return request({
url: `/api/draftMap/${mapId}/route/railway/generate`,
method: 'post'
});
}

6
src/jmapNew/shape/graph/SignalButton/index.js
View File

@ -135,7 +135,7 @@ export default class SignalButton extends Group {
});
this.add(this.bottomBoard);
this.bottomBoard.hide();
const hasTextList = ['PASS', 'ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'ACCIDENT', 'CHANGE_DIRECTION', ''];
const hasTextList = ['PASS', 'ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'ACCIDENT', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'];
if (hasTextList.includes(model.type)) {
this.buttonText = new Text({
zlevel: this.zlevel,
@ -185,7 +185,7 @@ export default class SignalButton extends Group {
}
getTypeColor() {
let color = '';
const list = ['ASSIST', 'ACCIDENT', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION'];
const list = ['ASSIST', 'ACCIDENT', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'];
if (this.model.type === 'FLEXIBLE' || this.model.type === 'SHUNT_TERMINAL') {
color = '#808080';
} else if (this.model.type === 'GUIDE') {
@ -218,7 +218,7 @@ export default class SignalButton extends Group {
// { value: 'ASSIST', label: '总辅助按钮' },
// { value: 'PICK_ASSIST', label: '接辅助按钮' },
// { value: 'DEPART_ASSIST', label: '发辅助按钮' },
const list = ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION'];
const list = ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION'];
if (list.includes(model.type)) {
if (this.rectButton) {
if (model.pressDown) {

8
src/jmapNew/shape/graph/Station/index.js
View File

@ -574,7 +574,7 @@ export default class Station extends Group {
});
this.add(this.interconnectedControl);
}
this.veryControl && this.veryControl.setStyle({fill: this.style.station.StationControl.veryControl.lightColor});
this.veryControl && this.veryControl.setColor(this.style.Station.StationControl.veryControl.lightColor);
}
handleCenter() { // 中控
@ -606,7 +606,7 @@ export default class Station extends Group {
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
this.stationControlCC && this.stationControlCC.setStyle({text:'LC', textFill:this.style.Station.StationControl.text.stationControlColor});
this.selfDisciplineControl && this.selfDisciplineControl.setStyle({fill: this.style.Station.StationControl.selfDisciplineControl.lightColor});
this.selfDisciplineControl && this.selfDisciplineControl.setColor(this.style.Station.StationControl.selfDisciplineControl.lightColor);
// if (this.style.Station.StationControl.disPlayNone) {
// this.stationText && this.stationText.setStyle('textFill', '#fff');
// if (this.model.subheadDisplay) { // 副标题
@ -673,8 +673,8 @@ export default class Station extends Group {
this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.stationControlCC && this.stationControlCC.setStyle({text:'EL', textFill:this.style.Station.StationControl.text.emergencyControlColor});
this.veryControl && this.veryControl.setStyle({fill: this.style.station.StationControl.veryControl.defaultColor});
this.selfDisciplineControl && this.selfDisciplineControl.setStyle({fill: this.style.Station.StationControl.selfDisciplineControl.defaultColor});
this.veryControl && this.veryControl.setColor(this.style.Station.StationControl.veryControl.defaultColor);
this.selfDisciplineControl && this.selfDisciplineControl.setColor(this.style.Station.StationControl.selfDisciplineControl.defaultColor);
if (this.style.Station.stationText.isSpecialType) {
this.stationText.setColor(this.style.Station.stationText.noneModeColor);
this.stationText.setBackground(this.style.Station.stationText.defaultBackColor);

4
src/utils/baseUrl.js
View File

@ -24,11 +24,11 @@ export function handlerUrl(data) {
if (process.env.NODE_ENV === 'development') {
// const data = null;
// BASE_API = 'https://joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://114.116.51.125/jlcloud';
// BASE_API = 'http://192.168.8.152:9000'; // 袁琪
// BASE_API = 'http://192.168.8.172:9200'; // 旭强
// BASE_API = 'http://192.168.3.15:9000'; // 张赛
BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康
// BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
// BASE_API = 'http://b29z135112.zicp.vip';

5
src/views/newMap/newMapdraft/ciConfig.vue
View File

@ -93,7 +93,7 @@ export default {
'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen',
'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly',
'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls', 'signalApproachNotPassPreSignal',
'generateDestination', 'ctcOverlapOnlyTurnBackStationLock', 'routeInterlockDoNotIncludeStandHoldTrain', 'handleDepot'
'generateDestination', 'ctcOverlapOnlyTurnBackStationLock', 'routeInterlockDoNotIncludeStandHoldTrain', 'handleDepot', 'railway'
],
multipleList: ['sharingECStations'],
selectList: [],
@ -129,7 +129,8 @@ export default {
sharingECStations: '共享紧急关闭效果的车站',
ctcOverlapOnlyTurnBackStationLock: 'CTC列车进路延续保护仅折返站处锁闭',
routeInterlockDoNotIncludeStandHoldTrain: '进路联锁不包含站台扣车',
handleDepot: '是否处理停车场/车辆段逻辑'
handleDepot: '是否处理停车场/车辆段逻辑',
railway: '是否大铁线路'
}
};
},

29
src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue
View File

@ -1,7 +1,11 @@
<template>
<el-dialog v-dialogDrag :title="$t('map.routePreview')" :visible.sync="show" width="95%" :before-do-close="doClose" append-to-body>
<div>
<div v-if="$route.query.lineCode == '16'" style="display: flex;justify-content: right;">
<el-button size="small" type="primary" @click="generationRoute">一键生成</el-button>
</div>
<QueryListPage
style="margin-top: 10px;"
ref="queryListPage"
:pager-config="pagerConfig"
:query-form="queryForm"
@ -13,7 +17,7 @@
</el-dialog>
</template>
<script>
import { getBigRouteList, deleteBigRoute } from '@/api/jmap/mapdraft';
import { getBigRouteList, deleteBigRoute, generateRoute } from '@/api/jmap/mapdraft';
export default {
name:'BigRouteDetail',
props: {
@ -236,7 +240,7 @@ export default {
let name = '';
const device = this.$store.getters['map/getDeviceByCode'](code);
if (device) {
name = device.name || '';
name = device.name || device.code;
}
return name;
},
@ -262,8 +266,25 @@ export default {
}).catch(error=>{
this.$messageBox('删除进路失败：' + error.meessage);
});
}
},
generationRoute() {
this.$confirm('是否确认一键生成进路？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.loading = true;
generateRoute(this.$route.params.mapId).then(response => {
this.$message.success('一键生成进路成功');
}).catch(() => {
this.$messageBox('一键生成进路失败');
}).finally(() => {
this.loading = false;
});
}).catch(() => {
this.$message.info('已取消一键生成进路');
});
}
}
};
</script>

2
src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
View File

@ -42,7 +42,7 @@
@click="hover('sectionList')"
>{{ $t('map.activate') }}</el-button>
</el-form-item>
<el-form-item label="关心信号机:" prop="signalCode">
<el-form-item label="关联信号机:" prop="signalCode">
<el-select v-model="addModel.signalCode" :placeholder="$t('map.pleaseSelect')">
<el-option
v-for="item in signalList"

6
src/views/newMap/newMapdraft/mapoperate/signalButton.vue
View File

@ -91,7 +91,9 @@ export default {
{ value: 'PICK_ASSIST', label: '接辅助按钮' },
{ value: 'DEPART_ASSIST', label: '发辅助按钮' },
{ value: 'ACCIDENT', label: '事故按钮' },
{ value: 'CHANGE_DIRECTION', label: '改方按钮' }
{ value: 'CHANGE_DIRECTION', label: '改方按钮' },
{ value: 'RECOVERY', label: '复原按钮' },
{ value: 'OCCLUSION', label: '闭塞按钮' }
],
centralizedStationList: [], // 设备集中站列表
directionList: [{label:'X',value:'X'},{label:'XF',value:'XF'},{label:'XD',value:'XD'},{label:'S',value:'S'},{label:'SF',value:'SF'},{label:'SD',value:'SD'}],
@ -213,7 +215,7 @@ export default {
return this.editModel.type === 'FLEXIBLE';
},
isLinkDirection() {
return ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'ACCIDENT', 'CHANGE_DIRECTION'].includes(this.editModel.type);
return ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'ACCIDENT', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'].includes(this.editModel.type);
}
},
methods: {