diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js index dec9939ea..8cc4aa9ca 100644 --- a/src/jmapNew/config/skinCode/foshan_01.js +++ b/src/jmapNew/config/skinCode/foshan_01.js @@ -528,7 +528,7 @@ class SkinCode extends defaultStyle { lrPadding: 1, // 两边间隔 upPadding: 1, // 上边距离 trainBodyFillColor: '#000000', // 列车车身填充颜色 - trainNameFormat: 'targetCode:serviceNumber:tripNumber'// 列车显示格式 + trainNameFormat: 'serviceNumber:groupNumber'// 列车显示格式 }, directionArrow: { }, @@ -542,8 +542,8 @@ class SkinCode extends defaultStyle { trainNumberOffset: { x: 1, y: 1}// 目的地码偏移量 }, trainServer: { - serviceNumberPrefix: '000', // 服务号(表号)前缀 - defaultServiceNumber: 'BBB', // 默认服务号(表号) + serviceNumberPrefix: '00', // 服务号(表号)前缀 + defaultServiceNumber: 'BB', // 默认服务号(表号) trainServerOffset: { x: 26, y: 1}// 列车服务号偏移 }, trainTarget: { @@ -553,8 +553,8 @@ class SkinCode extends defaultStyle { trainTargetOffset: { x: 42, y: 1}// 列车车次号偏移 }, trainTargetNumber: { - groupNumberPrefix: '000', // 车组号前缀 - defaultGroupNumber: 'EEE', // 默认车组号 + groupNumberPrefix: '0000', // 车组号前缀 + defaultGroupNumber: 'EEEE', // 默认车组号 trainTargetNumberOffset: {x: -1, y: 1}// 车组号偏移量 }, trainHead: { @@ -567,10 +567,11 @@ class SkinCode extends defaultStyle { trainHeadFillColor: '#EF0C08'// 列车车头矩形填充颜色 }, common: { + useSelfFormat: true, useSelfText: true, trainHeight: 17, // 列车高度 trainHeadDistance: 2, // 列车和车头之间的间距 - trainWidth:68, // 列车长度 + trainWidth:50, // 列车长度 trainTextFontSize: 15, // 列车字号 fontFamily: 'consolas', // 默认字体 族类 nameFontSize: 15, // 字体大小 diff --git a/src/jmapNew/shape/SplitStation/index.js b/src/jmapNew/shape/SplitStation/index.js index 4eb05c5d7..8de845c16 100644 --- a/src/jmapNew/shape/SplitStation/index.js +++ b/src/jmapNew/shape/SplitStation/index.js @@ -41,5 +41,8 @@ export default class SplitStation extends Group { fill: style.SplitStation.triangleFillColor } }); + this.triangleRight = new Polygon({ + + }); } } diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js index 4c504a250..24c1ec280 100644 --- a/src/jmapNew/shape/Train/TrainBody.js +++ b/src/jmapNew/shape/Train/TrainBody.js @@ -149,7 +149,7 @@ export default class TrainBody extends Group { z: model.z + 1, x: parseInt(model.point.x + style.Train.trainTargetNumber.trainTargetNumberOffset.x), y: parseInt(model.point.y + style.Train.trainTargetNumber.trainTargetNumberOffset.y), - text: groupNumber.substring(groupNumber.length - 3), + text: groupNumber.substring(groupNumber.length - style.Train.trainTargetNumber.groupNumberPrefix.length), textFill: style.trainTextColor, textStroke: style.trainTextColor, textStrokeWidth: 0, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index e9046878d..7cedc6817 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.6:9000'; // 旭强 + BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.41:9000'; // 张赛