修改代码

2019-07-22 17:16:27 +08:00 · 2019-07-22 17:16:27 +08:00 · ee29e51779
commit ee29e51779
parent bc9f244d5f
9 changed files with 128 additions and 366 deletions
--- a/src/jmap/config/defaultSkin.js
+++ b/src/jmap/config/defaultSkin.js
@ -42,74 +42,6 @@ export default class DefaultSkin {
 		/** 目的码字体颜色*/
 		this.destinationTextFontColor = 'yellow';

-		/** line 颜色*/
-		this.lineWidthColor = '#FFFFFF';
-
-		/** link 宽度*/
-		this.linkWidth = 4.4;
-
-		/** link 线条颜色*/
-		this.linkColor = '#3F3F3F';
-
-		/** link 字体颜色*/
-		this.linkTextColor = '#FFFFFF';
-
-		/** StopPoint 颜色*/
-		this.stopPointColor = '#FE0000';
-
-		/** StopPoint 字体颜色*/
-		this.stopPointTextColor = '#FFFFFF';
-
-		this.zcControlGrayColor = '#00FF00';
-
-		this.limitControlColor = '#ECE9D8';
-
-		this.lcControlColor = '#FFFF00';
-
-		this.zcControlmodeR = 4;
-
-		/** 道岔单边长度 */
-		this.switchLen = 6;
-
-		/** 道岔边框颜色*/
-		this.switchTextBorderColor = '#FE0000';
-
-		/** 道岔失去颜色*/
-		this.switchTextLossColor = '#FFFFFF';
-
-		/** 道岔定位颜色*/
-		this.switchLocateTextColor = '#00FF00';
-
-		/** 道岔反位颜色*/
-		this.switchInversionColor = '#9C9D09';
-
-		/** 道岔单锁颜色*/
-		this.switchMonolockColor = '#870E10';
-
-		/** 公里表距离车站距离*/
-		this.stationKmRangeDistance = 22;
-
-		/** 计数器字体颜色*/
-		this.stationCounterTextColor = '#FFFFFF';
-
-		/** 计数器边框颜色*/
-		this.stationCounterBorderColor = '#E4EF50';
-
-		/** 延迟解锁倒计时和设备文字之间的距离*/
-		this.stationDelayUnlockDistance = 3;
-
-		/** 延时解锁字体颜色*/
-		this.stationDelayUnlockTextColor = '#FFFFFF';
-
-		/** 延迟解锁边框颜色*/
-		this.stationDelayUnlockBorderColor = '#FFFFFF';
-
-		// 停车点折返点目的码名字颜色
-		this.stopPointTexDestCodetColor = '#FFF07B';
-
-		/** 停车点目的码文字大小*/
-		this.textPointFontSize = 10;
-
 		/** 列车长度*/
 		this.trainWidth = 40;

--- a/src/jmap/config/deviceStyle.js
+++ b/src/jmap/config/deviceStyle.js
@ -1,14 +1,12 @@
 import beijingSkin from '../theme/bejing';
 import fuzhouSkin from '../theme/fuzhou';
-import batongSkin from '../theme/batong';
 import chengduSkin from '../theme/chengdu';

 /** 皮肤配置*/
 const deviceSkin = {
-	'02': fuzhouSkin,
-	'03': beijingSkin,
-	'04': batongSkin, // 八通
-	'05': chengduSkin // 成都
+	// '03': fuzhouSkin
+	// '03': beijingSkin
+	'03': chengduSkin
 };

 export function selectSkinStyle(code) {
--- a/src/jmap/shape/Link/index.js
+++ b/src/jmap/shape/Link/index.js
@ -17,6 +17,11 @@ class Link extends Group {
 		const model = this.model;
 		const style = this.style;

+		// let textPosition = 'insideBottom';
+		// if (model.lp.x !== model.rp.x && model.lp.y !== model.rp.y) {
+		// 	textPosition = model.lp.y > model.rp.y ? 'insideLeft' : 'insideRight';
+		// }
+
 		this.link = new Line({
 			zlevel: this.zlevel,
 			shape: {
@ -26,18 +31,17 @@ class Link extends Group {
 				y2: model.rp.y
 			},
 			style: {
-				lineWidth: style.linkWidth,
-				stroke: style.linkColor,
-				text: model.code,
-				textDistance: style.linkWidth * 2,
+				lineWidth: style.Link.linkWidth,
+				stroke: style.Link.linkColor,
+				text: model.name,
+				textDistance: style.Link.linkWidth * 2,
 				textPosition: 'inside',
 				textAlign: 'middle',
-				fontSize: style.textFontSize,
-				textFill: style.linkTextColor,
-				textStroke: style.backgroundColor
+				fontSize: style.Link.textFontSize,
+				textFill: style.Link.linkTextColor,
+				textStroke: style.Link.backgroundColor
 			}
 		});
-
 		this.add(this.link);
 	}

--- a/src/jmap/shape/StationStand/ESafeEmergent.js
+++ b/src/jmap/shape/StationStand/ESafeEmergent.js
@ -18,7 +18,7 @@ class ESafeEmergent extends Group {
 			shape: {
 				x: model.x,
 				y: model.y,
-				r: style.StationStand.standDistance / 2,
+				r: model.r,
 				n: model.n
 			},
 			style: {
--- a/src/jmap/shape/StationStand/index.js
+++ b/src/jmap/shape/StationStand/index.js
@ -84,8 +84,10 @@ class StationStand extends Group {
 			fill: style.StationStand.standNoHumanReentryColor
 		});

+		const distance = style.StationStand.standSafeHeight*2 - style.StationStand.standHeadFontSize/2 - 2;
+
 		/** 站台扣车*/
-		const detainD = style.StationStand.standDetainDirection ? model.height + style.StationStand.standHeadFontSize / 2 - 2: -style.StationStand.standSafeHeight;
+		const detainD = style.StationStand.standDetainDirection ? model.height - distance: -style.StationStand.standSafeHeight;
 		const detainH = drict > 0 ? style.StationStand.standEmergentR : style.StationStand.standEmergentR + style.StationStand.standDistance + detainD;
 		const detainX = model.position.x - (style.StationStand.standDetainDirection || drict) * (style.StationStand.standDetainOffset.x - model.width / 2);
 		const detainY = model.position.y + (style.StationStand.standDetainDirection || drict) * (style.StationStand.standDetainOffset.y) + drict * detainH;
@ -100,7 +102,7 @@ class StationStand extends Group {
 		});

 		/** 停站时间*/
-		const timeD = style.StationStand.standTimeDirection ? model.height + style.StationStand.standTextFontSize / 2 - 2: -style.StationStand.standSafeHeight;
+		const timeD = style.StationStand.standTimeDirection ? model.height - distance: -style.StationStand.standSafeHeight;
 		const timeH = drict > 0 ? style.StationStand.standEmergentR : style.StationStand.standEmergentR + style.StationStand.standDistance + timeD;
 		const timeX = model.position.x - (style.StationStand.standTimeDirection || drict) * (style.StationStand.standTimeOffset.x - model.width / 2);
 		const timeY = model.position.y + (style.StationStand.standTimeDirection || drict) * (style.StationStand.standTimeOffset.y) + drict * timeH;
@ -110,11 +112,11 @@ class StationStand extends Group {
 			style: style,
 			x: timeX,
 			y: timeY,
-			name: model.parkingTime
+			name: model.parkingTime || '30'
 		});

 		/** 运行等级*/
-		const levelD = style.StationStand.standLevelDirection ? model.height + style.StationStand.standTextFontSize / 2 - 2: -style.StationStand.standSafeHeight;
+		const levelD = style.StationStand.standLevelDirection ? model.height - distance: -style.StationStand.standSafeHeight;
 		const levelH = drict > 0 ? style.StationStand.standEmergentR : style.StationStand.standEmergentR + style.StationStand.standDistance + levelD;
 		const levelX = model.position.x - (style.StationStand.standLevelDirection || drict) * (style.StationStand.standLevelOffset.x - model.width / 2);
 		const levelY = model.position.y + (style.StationStand.standLevelDirection || drict) * (style.StationStand.standLevelOffset.y) + drict * levelH;
@ -124,7 +126,7 @@ class StationStand extends Group {
 			style: style,
 			x: levelX,
 			y: levelY,
-			name: model.intervalRunTime
+			name: model.intervalRunTime || '5'
 		});

 		this.add(this.safeDoor);
--- a/src/jmap/theme/batong.js
+++ b/src/jmap/theme/batong.js
@ -1,223 +0,0 @@
-import defaultSkin from '../config/defaultSkin';
-import deviceType from '../constant/deviceType';
-
-class Fuzhou extends defaultSkin {
-	constructor() {
-		super();
-		this.Link = {
-			textFontColor: ''
-		};
-		this[deviceType.Section] = {
-			/** 区段 宽度*/
-			sectionWidth: 5,
-			/** 区段宽超出宽度*/
-			sectionBeyondWidth: 1,
-			/** 计轴 半径*/
-			sectionAxleR: 3,
-			/** 计轴和区段之间的距离*/ /** 需要添加*/
-			sectionAxleDistance: 5,
-			/** 限速线的宽短*/
-			sectionSpeedLimitLinewidth: 1,
-			/** 限速线距离区段距离*/
-			sectionSpeedLimitDistance: 5,
-			sectionSeparatorWidth: 1.2, // 分隔符宽度
-			sectionEndSeparatorWidth: 3.5, // 尽头分隔符宽度
-			sectionEndSeparatorStroke: '#3F3F3F', // 尽头分隔符颜色
-			/** 区段侵入颜色*/
-			sectionInvadeColor: '#EF0C08',
-			/** 限速线颜色*/
-			sectionSpeedLimitColor: '#FFFF00',
-			sectionLogicalBackgroundColor: '#FFFF00', // 逻辑区段颜色
-			/** 区段计轴颜色*/
-			sectionAxleColor: '#FFFFFF',
-			/** 区段边界符颜色*/
-			sectionSeparatorColor: '#3149C3',
-			/** 区段空闲颜色*/
-			sectionSpareColor: '#3F3F3F',
-			/** 逻辑区段名称颜色*/
-			sectionLogicalTextColor: '#FFFFFF',
-			/** 区段通信车占用颜色**/
-			sectionCommunicationOccupiedColor: '#FF329A',
-			/** 区段非通讯车占用颜色*/
-			sectionUnCommunicationOccupiedColor: '#FE0000',
-			/** 区段路由锁定颜色*/
-			sectionRouteLockColor: '#FFFFFF',
-			/** 区段故障锁定颜色*/
-			sectionFaultLockColor: '#9B4A0A',
-			/** 区段未定义颜色*/
-			sectionUndefinedColor: '#0071C1',
-			/** 保护区段锁闭*/
-			sectionProtectionSectionLockedColor: '#FEFF00',
-			/** 区段计轴预复位*/
-			sectionAxleResetColor: '#00FFFF',
-			/** 区段封锁颜色*/
-			sectionBlockColor: '#800080',
-			/** 区段atc切除颜色*/
-			sectionAtcExcisionColor: '#A0522D',
-			/** 区段ats切除颜色*/
-			sectionAtsExcisionColor: '#A0522D',
-			/** 区段延时释放颜色*/
-			sectionTimeReleaseColor: '#3F3F3F',
-			/** 区段保护锁闭*/
-			sectionProtectiveLockColor: '#FFFF00',
-			/** 区段保护延时解锁*/
-			sectionProtectiveTimeReleaseColor: '#0071C1',
-			sectionAxleFailure: '#E6A23C' // #FFFF00 计轴失效
-		};
-		this[deviceType.Signal] = {
-			/** 信号机宽度 */
-			signalR: 5,
-			/** 自动信号宽度*/
-			signalSigPassWidth: 10,
-			/** 延迟解锁字体大小*/
-			signalDelayTextFontSize: 10,
-			/** 信号机名称字体大小*/
-			signalTextFontSize: 12,
-			/** 灯柱宽度*/
-			signalLampStandardWidth: 1.2,
-			/** 设备距离区段的距离*/
-			signalDistance: 3,
-			/** 信号灯按钮距离区段的距离*/
-			signalButtonDistance: 5,
-			/** 信号灯按钮边线*/
-			signalButtonDashColor: '#FFFFFF',
-			/** 信号灯按钮颜色*/
-			signalButtonColor: 'darkgreen',
-			/** 信号灯按钮闪烁颜色*/
-			signalButtonLightenColor: '#E4EF50',
-			/** 信号灯字体颜色*/
-			signalTextRed: '#EF0C08',
-			/** 信号机字体绿色*/
-			signalTextGreen: '#4DD43F',
-			/** 信号灯灯柱颜色*/
-			signalLampStandardColor: '#3149C3',
-			/** 信号灯锁闭*/
-			signalBlockColor: '#EF0C08',
-			/** 信号灯灰色*/
-			signalLampGrayColor: '#7F7F7F',
-			/** 信号灯红色*/
-			signalLampRedColor: '#FF0000',
-			/** 信号灯绿色*/
-			signalLampGreenColor: '#00FF00',
-			/** 信号灯黄色*/
-			signalLampYellowColor: '#FFFF00',
-			/** 信号灯白色*/
-			signalLampWhiteColor: '#FFFFFF',
-			/** 信号灯蓝色*/
-			signalLampBlueColor: '#0070C0'
-		};
-		this[deviceType.StationStand] = {
-			/** 站台和屏蔽门之间的距离*/
-			standDistance: 8,
-			/** 站台屏蔽门高度*/
-			standSafeHeight: 3,
-			/** 站台首端字体大小*/
-			standHeadFontSize: 10,
-			/** 站台默认字体大小*/
-			standTextFontSize: 10,
-			/** 站台紧急关闭半径*/
-			standEmergentR: 4,
-			/** 站台紧急关闭偏移量*/
-			standEmergentOffset: {x: 0, y: 40},
-			/** 扣车方向*/
-			standDetainDirection: -1,
-			/** 扣车偏移量*/
-			standDetainOffset: {x: -8, y: -6},
-			/** 运行时间方向*/
-			standTimeDirection: 1,
-			/** 运行时间偏移量*/
-			standTimeOffset: {x: -8, y: 26},
-			/** 运行等级方向*/
-			standLevelDirection: 1,
-			/** 运行等级偏移量*/
-			standLevelOffset: {x: -8, y: 6},
-			/** 折返方向*/
-			standReentryDirection: 0,
-			/** 折返偏移量*/
-			standReentryOffset: {x: -16, y: 20},
-			/** 扣车显示内容*/
-			standDetainText: 'H',
-			/** 站台无人折返*/
-			standNoHumanReentryColor: '#0F16DA',
-			/** 站台自动换端*/
-			standAutoChangeEndsColor: '#0BF400',
-			/** 站台空闲颜色*/
-			standSpareColor: '#606060',
-			/** 站台列车停站颜色*/
-			standStopColor: '#FEFE00',
-			/** 站台跳停颜色*/
-			standJumpStopColor: '#9A99FF',
-			/** 站台指定列车跳停颜色*/
-			standDesignatedJumpStopColor: 'lightSkyBlue',
-			/** 站台紧急关闭颜色*/
-			standEmergentCloseColor: '#F61107',
-			/** 停站时间字体颜色*/
-			standTimeTextColor: '#FFFFFF',
-			/** 停站等级字体颜色*/
-			standLevelTextColor: '#FFFFFF',
-			/** 车站扣车颜色*/
-			standDetainTrainColor: '#E4EF50',
-			/** 中心扣车颜色*/
-			standCenterDetainTrainColor: '#FFFFFF',
-			/** 车站+中心扣车颜色*/
-			standAndCenterDetainTrainColor: '#F61107',
-			/** 屏蔽门默认颜色*/
-			standDoorDefaultColor: '#00FF00',
-			/** 屏蔽门切除颜色*/
-			standSplitDoorColor: '#F61107',
-			/** 车站扣除文字颜色*/
-			standDetainTrainTextColor: '#E4EF50',
-			/** 计数器字体颜色*/
-			stationCounterTextColor: '#FFFFFF',
-			/** 计数器边框颜色*/
-			stationCounterBorderColor: '#E4EF50',
-			/** 延迟解锁倒计时和设备文字之间的距离*/
-			stationDelayUnlockDistance: 3,
-			/** 延时解锁字体颜色*/
-			stationDelayUnlockTextColor: '#FFFFFF',
-			/** 延迟解锁边框颜色*/
-			stationDelayUnlockBorderColor: '#FFFFFF'
-		};
-		this[deviceType.StationControl] = {
-			singleControlNum: 2,
-			arrowsShow: true,
-			/** 控制模式字体大小*/
-			stationControlTextSize: 10,
-			/** 控制模式灯的半径 */
-			stationControlmodeR: 4,
-			/** 控制模式之间灯之间的距离*/
-			stationControlDistance: 36,
-			/** 控制模式灰色*/
-			stationControlGrayColor: '#7F7F7F',
-			/** 控制模式绿色*/
-			stationControlGreenColor: '#00FF00',
-			/** 控制模式红色*/
-			stationControlRedColor: '#FF0000',
-			/** 控制模式黄色*/
-			stationControlYellowColor: '#FFFF00'
-		};
-		this[deviceType.Station] = {
-			kilometerPosition: 'up'
-		};
-		this[deviceType.Switch] = {
-			/** 道岔单边长度 */
-			switchLen: 6,
-			/** 道岔名称与区段距离*/
-			switchNameDistance: 2,
-			/** 道岔边框颜色*/
-			switchTextBorderColor: '#FE0000',
-			/** 道岔失去颜色*/
-			switchTextLossColor: '#FFFFFF',
-			/** 道岔定位颜色*/
-			switchLocateTextColor: '#00FF00',
-			/** 道岔反位颜色*/
-			switchInversionColor: '#9C9D09',
-			/** 道岔单锁颜色*/
-			switchMonolockColor: '#870E10'
-		};
-	}
-}
-
-const fuzhouSkin = new Fuzhou();
-
-export default fuzhouSkin;
--- a/src/jmap/theme/bejing.js
+++ b/src/jmap/theme/bejing.js
@ -4,8 +4,18 @@ import deviceType from '../constant/deviceType';
 class Beijing extends defaultSkin {
 	constructor() {
 		super();
-		this.Link = {
-			textFontColor: ''
+		this[deviceType.Link] = {
+			/** line 颜色*/
+			lineWidthColor: '#FFFFFF',
+
+			/** link 宽度*/
+			linkWidth: 4.4,
+
+			/** link 线条颜色*/
+			linkColor: '#3F3F3F',
+
+			/** link 字体颜色*/
+			linkTextColor: '#FFFFFF'
 		};
 		this[deviceType.Section] = {
 			sectionTextPosition: 1, // 区段名称位置 1 上行 -1 下面 0 默认
@ -70,9 +80,9 @@ class Beijing extends defaultSkin {
 		};
 		this[deviceType.Signal] = {
 			/** 信号机宽度 */
-			signalR: 6,
+			signalR: 7,
 			/** 自动信号宽度*/
-			signalSigPassWidth: 6,
+			signalSigPassWidth: 5,
 			/** 延迟解锁字体大小*/
 			signalDelayTextFontSize: 10,
 			/** 信号机名称字体大小*/
@ -80,7 +90,7 @@ class Beijing extends defaultSkin {
 			/** 灯柱宽度*/
 			signalLampStandardWidth: 1.2,
 			/** 设备距离区段的距离*/
-			signalDistance: 3,
+			signalDistance: 0,
 			/** 信号灯按钮距离区段的距离*/
 			signalButtonDistance: 5,
 			/** 自动进路方向*/
--- a/src/jmap/theme/chengdu.js
+++ b/src/jmap/theme/chengdu.js
@ -1,57 +1,70 @@
 import defaultSkin from '../config/defaultSkin';
 import deviceType from '../constant/deviceType';

-class Fuzhou extends defaultSkin {
+class Beijing extends defaultSkin {
 	constructor() {
 		super();
-		this.Link = {
-			textFontColor: ''
+		this[deviceType.Link] = {
+			/** line 颜色*/
+			lineWidthColor: '#FFFFFF',
+
+			/** link 宽度*/
+			linkWidth: 4.4,
+
+			/** link 线条颜色*/
+			linkColor: '#3F3F3F',
+
+			/** link 字体颜色*/
+			linkTextColor: '#FFFFFF'
 		};
 		this[deviceType.Section] = {
+			sectionTextPosition: 1, // 区段名称位置 1 上行 -1 下面 0 默认
 			/** 区段 宽度*/
 			sectionWidth: 5,
 			/** 区段宽超出宽度*/
-			sectionBeyondWidth: 1,
+			sectionBeyondWidth: 0,
 			/** 计轴 半径*/
 			sectionAxleR: 3,
-			/** 计轴和区段之间的距离*/ /** 需要添加*/
+			/** 计轴和区段之间的距离*/
 			sectionAxleDistance: 5,
-			/** 限速线的宽短*/
+			/** 限速线的宽度*/
 			sectionSpeedLimitLinewidth: 1,
 			/** 限速线距离区段距离*/
 			sectionSpeedLimitDistance: 5,
-			sectionSeparatorWidth: 1.2, // 分隔符宽度
-			sectionEndSeparatorWidth: 3.5, // 尽头分隔符宽度
-			sectionEndSeparatorStroke: '#3F3F3F', // 尽头分隔符颜色
+			/** 分隔符宽度*/
+			sectionSeparatorWidth: 1.2,
+			sectionEndSeparatorWidth: 1.2, // 尽头分隔符宽度
+			sectionEndSeparatorStroke: '#C0C0C0', // 尽头分隔符颜色
 			/** 区段侵入颜色*/
-			sectionInvadeColor: '#EF0C08',
+			sectionInvadeColor: '#C00808',
 			/** 限速线颜色*/
-			sectionSpeedLimitColor: '#FFFF00',
-			sectionLogicalBackgroundColor: '#FFFF00', // 逻辑区段颜色
+			sectionSpeedLimitColor: '#C0C000',
+			/** 逻辑区段颜色*/
+			sectionLogicalBackgroundColor: '#C0C000',
 			/** 区段计轴颜色*/
-			sectionAxleColor: '#FFFFFF',
+			sectionAxleColor: '#C0C0C0',
 			/** 区段边界符颜色*/
-			sectionSeparatorColor: '#3149C3',
+			sectionSeparatorColor: '#C0C0C0',
 			/** 区段空闲颜色*/
-			sectionSpareColor: '#3F3F3F',
+			sectionSpareColor: '#5B5893',
 			/** 逻辑区段名称颜色*/
 			sectionLogicalTextColor: '#FFFFFF',
 			/** 区段通信车占用颜色**/
-			sectionCommunicationOccupiedColor: '#FF329A',
+			sectionCommunicationOccupiedColor: '#FF00FF',
 			/** 区段非通讯车占用颜色*/
-			sectionUnCommunicationOccupiedColor: '#FE0000',
+			sectionUnCommunicationOccupiedColor: '#DE310C',
 			/** 区段路由锁定颜色*/
-			sectionRouteLockColor: '#FFFFFF',
+			sectionRouteLockColor: '#00FF00',
 			/** 区段故障锁定颜色*/
-			sectionFaultLockColor: '#9B4A0A',
+			sectionFaultLockColor: '#FFFFFF',
 			/** 区段未定义颜色*/
 			sectionUndefinedColor: '#0071C1',
 			/** 保护区段锁闭*/
-			sectionProtectionSectionLockedColor: '#FEFF00',
+			sectionProtectionSectionLockedColor: '#00FF00',
 			/** 区段计轴预复位*/
 			sectionAxleResetColor: '#00FFFF',
 			/** 区段封锁颜色*/
-			sectionBlockColor: '#800080',
+			sectionBlockColor: '#00FFFF',
 			/** 区段atc切除颜色*/
 			sectionAtcExcisionColor: '#A0522D',
 			/** 区段ats切除颜色*/
@ -59,16 +72,17 @@ class Fuzhou extends defaultSkin {
 			/** 区段延时释放颜色*/
 			sectionTimeReleaseColor: '#3F3F3F',
 			/** 区段保护锁闭*/
-			sectionProtectiveLockColor: '#FFFF00',
+			sectionProtectiveLockColor: '#00C957',
 			/** 区段保护延时解锁*/
 			sectionProtectiveTimeReleaseColor: '#0071C1',
-			sectionAxleFailure: '#E6A23C' // #FFFF00 计轴失效
+			/** 计轴失效*/
+			sectionAxleFailure: '#B18F38'
 		};
 		this[deviceType.Signal] = {
 			/** 信号机宽度 */
-			signalR: 5,
+			signalR: 6.5,
 			/** 自动信号宽度*/
-			signalSigPassWidth: 10,
+			signalSigPassWidth: 5,
 			/** 延迟解锁字体大小*/
 			signalDelayTextFontSize: 10,
 			/** 信号机名称字体大小*/
@ -76,11 +90,23 @@ class Fuzhou extends defaultSkin {
 			/** 灯柱宽度*/
 			signalLampStandardWidth: 1.2,
 			/** 设备距离区段的距离*/
-			signalDistance: 3,
+			signalDistance: 0,
 			/** 信号灯按钮距离区段的距离*/
 			signalButtonDistance: 5,
+			/** 自动进路方向*/
+			signalSigRouteDirection: false,
+			/** 自动进路偏移量*/
+			signalSigRouteOffset: { x: 4, y: -2 },
+			/** 自动通过方向*/
+			signalSigPassDirection: true,
+			/** 自动通过偏移量*/
+			signalSigPassOffset: { x: 4, y: 0},
+			/** 延时解锁方向*/
+			signalSigDelayDirection: false,
+			/** 延时解锁偏移量*/
+			signalSigDelayOffset: { x: 0, y: -5},
 			/** 信号灯按钮边线*/
-			signalButtonDashColor: '#FFFFFF',
+			signalButtonDashColor: '#C0C0C0',
 			/** 信号灯按钮颜色*/
 			signalButtonColor: 'darkgreen',
 			/** 信号灯按钮闪烁颜色*/
@ -88,9 +114,9 @@ class Fuzhou extends defaultSkin {
 			/** 信号灯字体颜色*/
 			signalTextRed: '#EF0C08',
 			/** 信号机字体绿色*/
-			signalTextGreen: '#4DD43F',
+			signalTextGreen: '#00FF00',
 			/** 信号灯灯柱颜色*/
-			signalLampStandardColor: '#3149C3',
+			signalLampStandardColor: '#FFFFFF',
 			/** 信号灯锁闭*/
 			signalBlockColor: '#EF0C08',
 			/** 信号灯灰色*/
@ -104,39 +130,41 @@ class Fuzhou extends defaultSkin {
 			/** 信号灯白色*/
 			signalLampWhiteColor: '#FFFFFF',
 			/** 信号灯蓝色*/
-			signalLampBlueColor: '#0070C0'
+			signalLampBlueColor: '#0000FF'
 		};
 		this[deviceType.StationStand] = {
 			/** 站台和屏蔽门之间的距离*/
-			standDistance: 8,
+			standDistance: 1.5,
 			/** 站台屏蔽门高度*/
-			standSafeHeight: 3,
+			standSafeHeight: 4,
 			/** 站台首端字体大小*/
-			standHeadFontSize: 10,
+			standHeadFontSize: 8,
 			/** 站台默认字体大小*/
-			standTextFontSize: 10,
+			standTextFontSize: 8,
 			/** 站台紧急关闭半径*/
 			standEmergentR: 4,
 			/** 站台紧急关闭偏移量*/
-			standEmergentOffset: {x: 0, y: 40},
+			standEmergentOffset: {x: 0, y: -15},
 			/** 扣车方向*/
 			standDetainDirection: -1,
 			/** 扣车偏移量*/
-			standDetainOffset: {x: -8, y: -6},
+			standDetainOffset: {x: -12, y: -20},
 			/** 运行时间方向*/
 			standTimeDirection: 1,
 			/** 运行时间偏移量*/
-			standTimeOffset: {x: -8, y: 26},
+			standTimeOffset: {x: -12, y: 5},
 			/** 运行等级方向*/
 			standLevelDirection: 1,
 			/** 运行等级偏移量*/
-			standLevelOffset: {x: -8, y: 6},
+			standLevelOffset: {x: -12, y: 20},
 			/** 折返方向*/
 			standReentryDirection: 0,
 			/** 折返偏移量*/
-			standReentryOffset: {x: -16, y: 20},
+			standReentryOffset: {x: -16, y: 18},
 			/** 扣车显示内容*/
-			standDetainText: 'H',
+			standDetainText: '扣',
+			/** 跳停显示内容*/
+			standJumpText: '跳',
 			/** 站台无人折返*/
 			standNoHumanReentryColor: '#0F16DA',
 			/** 站台自动换端*/
@ -179,8 +207,9 @@ class Fuzhou extends defaultSkin {
 			stationDelayUnlockBorderColor: '#FFFFFF'
 		};
 		this[deviceType.StationControl] = {
-			singleControlNum: 2,
-			arrowsShow: true,
+			singleControlNum: 3,
+			stationOffset: {x: 20, y: 0},
+			arrowsShow: false, // 控制模式箭头显隐
 			/** 控制模式字体大小*/
 			stationControlTextSize: 10,
 			/** 控制模式灯的半径 */
@ -197,7 +226,7 @@ class Fuzhou extends defaultSkin {
 			stationControlYellowColor: '#FFFF00'
 		};
 		this[deviceType.Station] = {
-			kilometerPosition: 'up'
+			kilometerPosition: 'down' // 公里标位置
 		};
 		this[deviceType.Switch] = {
 			/** 道岔单边长度 */
@ -207,17 +236,17 @@ class Fuzhou extends defaultSkin {
 			/** 道岔边框颜色*/
 			switchTextBorderColor: '#FE0000',
 			/** 道岔失去颜色*/
-			switchTextLossColor: '#FFFFFF',
+			switchTextLossColor: '#C00808',
 			/** 道岔定位颜色*/
-			switchLocateTextColor: '#00FF00',
+			switchLocateTextColor: '#08C008',
 			/** 道岔反位颜色*/
-			switchInversionColor: '#9C9D09',
+			switchInversionColor: '#C0C000',
 			/** 道岔单锁颜色*/
-			switchMonolockColor: '#870E10'
+			switchMonolockColor: '#FFFFFF'
 		};
 	}
 }

-const fuzhouSkin = new Fuzhou();
+const chengduSkin = new Beijing();

-export default fuzhouSkin;
+export default chengduSkin;
--- a/src/jmap/theme/fuzhou.js
+++ b/src/jmap/theme/fuzhou.js
@ -4,8 +4,18 @@ import deviceType from '../constant/deviceType';
 class Fuzhou extends defaultSkin {
 	constructor() {
 		super();
-		this.Link = {
-			textFontColor: ''
+		this[deviceType.Link] = {
+			/** line 颜色*/
+			lineWidthColor: '#FFFFFF',
+
+			/** link 宽度*/
+			linkWidth: 4.4,
+
+			/** link 线条颜色*/
+			linkColor: '#3F3F3F',
+
+			/** link 字体颜色*/
+			linkTextColor: '#FFFFFF'
 		};
 		this[deviceType.Section] = {
 			sectionTextPosition: 0, // 区段名称位置 1 上行 -1 下面 0 默认