diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js index b98648520..ef7de6b20 100644 --- a/src/api/jmap/mapdraft.js +++ b/src/api/jmap/mapdraft.js @@ -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' + }); +} diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index 030916970..f59d29f5e 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -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) { diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 7a5777e2e..d932cd269 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -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); diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index ce530d24f..0fc3289a1 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -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'; diff --git a/src/views/newMap/newMapdraft/ciConfig.vue b/src/views/newMap/newMapdraft/ciConfig.vue index 24b2de0ca..d30f6a5e5 100644 --- a/src/views/newMap/newMapdraft/ciConfig.vue +++ b/src/views/newMap/newMapdraft/ciConfig.vue @@ -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: '是否大铁线路' } }; }, diff --git a/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue index 9994ad01c..771738d52 100644 --- a/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue +++ b/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue @@ -1,7 +1,11 @@ diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue index 5a62ea38f..9fa314e2c 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue @@ -42,7 +42,7 @@ @click="hover('sectionList')" >{{ $t('map.activate') }} - +