diff --git a/src/jmap/config/skinCode/bejing_01.js b/src/jmap/config/skinCode/bejing_01.js
index aa7be1736..d7433e709 100644
--- a/src/jmap/config/skinCode/bejing_01.js
+++ b/src/jmap/config/skinCode/bejing_01.js
@@ -27,7 +27,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			logicText: { // 逻辑区段名称
-				show: true,									// 逻辑区段名称显示
+				show: false,									// 逻辑区段名称显示
 				position: -1, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 11,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -138,6 +138,7 @@ class SkinCode extends defaultStyle {
 				standardWidth: 1.5									// 灯柱宽度
 			},
 			text: {
+				show: true,											// 信号机名称显示
 				distance: 3,										// 文字和灯杆的距离
 				isNoRotation: true,									// 是否禁止旋转
 				isAlignCenter: false,								// 信号字体对其方式
@@ -303,12 +304,16 @@ class SkinCode extends defaultStyle {
 		};
 
 		this[deviceType.Station] = {
+			text: {
+				show: true											// 公里标名称显示
+			},
 			kilometerPosition: 'down', 							 	// 公里标位置
 			fontWeight: 'bold'										// 文字错细
 		};
 
 		this[deviceType.Switch] = {
 			text: {
+				show: true,											// 道岔名称显示
 				position: 0, 										// 区段名称位置 1 上面 -1 下面 0 对称
 				offset: {x: -15, y: -10},							// 道岔名称与区段距离
 				fontSize: 10,										// 字体大小
diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js
index bb6a557c4..fc928d348 100644
--- a/src/jmap/config/skinCode/chengdu_03.js
+++ b/src/jmap/config/skinCode/chengdu_03.js
@@ -16,6 +16,7 @@ class SkinCode extends defaultStyle {
 				routeColor: true							// 进路触发颜色
 			},
 			text: {
+				show: true,									// 物理区段名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 10,								// 文字离区段距离
 				fontSize: 12, 								// 字体大小
@@ -26,6 +27,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			logicText: {
+				show: false,									// 逻辑区段名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 12,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -36,6 +38,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			standText: {
+				show: true,									// 站台轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 24,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -46,6 +49,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			reentryText: {
+				show: true,									// 折返轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 36,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -56,6 +60,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			transferText: {
+				show: true,									// 转换轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 36,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -66,6 +71,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			destinationText: {
+				show: true,									// 目的码名称显示
 				opposite: true,								// 对称相反
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 12,								// 文字离区段距离
@@ -135,6 +141,7 @@ class SkinCode extends defaultStyle {
 				standardWidth: 2							// 灯柱宽度
 			},
 			text: {
+				show: true,									// 信号机名称显示
 				distance: 3,								// 文字和灯杆的距离
 				isNoRotation: true,							// 是否禁止旋转
 				isAlignCenter: false,						// 信号字体对其方式
@@ -293,13 +300,17 @@ class SkinCode extends defaultStyle {
 		};
 
 		this[deviceType.Station] = {
+			text: {
+				show: true									// 公里标名称显示
+			},
 			kilometerPosition: 'up'							// 公里标朝向
 		};
 
 		this[deviceType.Switch] = {
 			text: {
-				position: 0, 									// 区段名称位置 1 上面 -1 下面 0 对称
-				offset: {x: 5, y: -10},							// 道岔名称与区段距离
+				show: true,									// 道岔名称显示
+				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+				offset: {x: 5, y: -10},						// 道岔名称与区段距离
 				fontSize: 11,								// 字体大小
 				fontColor: '#fff',							// 道岔名称颜色
 				fontWeight: 'normal',						// 字体粗细
diff --git a/src/jmap/config/skinCode/chengdu_04.js b/src/jmap/config/skinCode/chengdu_04.js
index c1fda0199..3123902d8 100644
--- a/src/jmap/config/skinCode/chengdu_04.js
+++ b/src/jmap/config/skinCode/chengdu_04.js
@@ -16,6 +16,7 @@ class SkinCode extends defaultStyle {
 				routeColor: false							// 进路触发颜色
 			},
 			text: {
+				show: true,									// 物理区段名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 10,								// 文字离区段距离
 				fontSize: 12, 								// 字体大小
@@ -25,7 +26,8 @@ class SkinCode extends defaultStyle {
 				textPosition: 'inside', 					// 文字位置
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
-			logicText: { 									// 逻辑区段名称
+			logicText: {									// 逻辑区段名称
+				show: false,								// 逻辑区段名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 12,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -36,6 +38,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			standText: {									// 站台
+				show: true,									// 站台轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 24,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -46,6 +49,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			reentryText: { 									// 折返
+				show: true,									// 折返轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 36,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -56,6 +60,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			transferText: { 								// 转换轨
+				show: true,									// 转换轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 36,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -66,6 +71,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			destinationText: { // 目的地
+				show: true,									// 目的码名称显示
 				opposite: true,								// 对称相反
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 12,								// 文字离区段距离
@@ -132,6 +138,7 @@ class SkinCode extends defaultStyle {
 				standardWidth: 2							// 灯柱宽度
 			},
 			text: {
+				show: true,											// 信号机名称显示
 				distance: 3,								// 文字和灯杆的距离
 				isNoRotation: true,							// 是否禁止旋转
 				isAlignCenter: false,						// 信号字体对其方式
@@ -290,11 +297,15 @@ class SkinCode extends defaultStyle {
 		};
 
 		this[deviceType.Station] = {
+			text: {
+				show: true											// 公里标名称显示
+			},
 			kilometerPosition: 'up'							// 公里标朝向
 		};
 
 		this[deviceType.Switch] = {
 			text: {
+				show: true,									// 道岔名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				offset: {x: 5, y: -10},						// 道岔名称与区段距离
 				fontSize: 11,								// 字体大小
diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js
index 76a712c84..6d576f3c8 100644
--- a/src/jmap/config/skinCode/fuzhou_01.js
+++ b/src/jmap/config/skinCode/fuzhou_01.js
@@ -16,6 +16,7 @@ class SkinCode extends defaultStyle {
 				routeColor: false							// 进路触发颜色
 			},
 			text: {
+				show: true,									// 物理区段名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 18,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -26,6 +27,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			logicText: {
+				show: true,									// 逻辑区段名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 6,								// 文字离区段距离
 				fontSize: 8, 								// 字体大小
@@ -36,6 +38,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			standText: {
+				show: true,									// 站台轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 30,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -46,6 +49,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			reentryText: {
+				show: true,									// 折返轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 30,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -56,6 +60,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			transferText: {
+				show: true,									// 转换轨名称显示
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 28,								// 文字离区段距离
 				fontSize: 11, 								// 字体大小
@@ -66,6 +71,7 @@ class SkinCode extends defaultStyle {
 				textVerticalAlign: 'middle' 				// 文字垂直对齐方式
 			},
 			destinationText: {
+				show: true,									// 目的码名称显示
 				opposite: true,								// 对称相反
 				position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
 				distance: 10,								// 文字离区段距离
@@ -125,6 +131,7 @@ class SkinCode extends defaultStyle {
 				standardWidth: 2								// 灯珠宽度
 			},
 			text: {
+				show: true,										// 信号机名称显示
 				distance: 0,									// 文字和灯杆的距离
 				isNoRotation: true,								// 是否禁止旋转
 				isAlignCenter: true,							// 信号字体对其方式
@@ -272,11 +279,15 @@ class SkinCode extends defaultStyle {
 		};
 
 		this[deviceType.Station] = {
+			text: {
+				show: true											// 公里标名称显示
+			},
 			kilometerPosition: 'up'								// 公里标朝向
 		};
 
 		this[deviceType.Switch] = {
 			text: {
+				show: true,											// 道岔名称显示
 				position: 0, 									// 区段名称位置 1 上面 -1 下面 0 对称
 				offset: {x: 0, y: 8},							// 道岔名称与区段距离
 				fontSize: 11,									// 字体大小
diff --git a/src/jmap/map.js b/src/jmap/map.js
index fc7f7d66b..7ae9e4a77 100644
--- a/src/jmap/map.js
+++ b/src/jmap/map.js
@@ -80,10 +80,10 @@ class Jlmap {
 		// 保存皮肤类型
 		if (map.skinVO) {
 			this.skinCode = map.skinVO.code;
-			this.$options.scaleRate = map.skinVO.scaling;
-			this.$options.offsetX = map.skinVO.origin.x;
-			this.$options.offsetY = map.skinVO.origin.y;
-			this.$painter.updateTransform({ scaleRate: map.skinVO.scaling, offsetX: map.skinVO.origin.x, offsetY: map.skinVO.origin.y });
+			this.$options.scaleRate = map.skinVO.scaling || 1;
+			this.$options.offsetX = map.skinVO.origin ? map.skinVO.origin.x : 0;
+			this.$options.offsetY = map.skinVO.origin ? map.skinVO.origin.y : 0;
+			this.$painter.updateTransform({ scaleRate: this.$options.scaleRate, offsetX: this.$options.offsetX, offsetY: this.$options.offsetY });
 		}
 
 		// 保存原始数据
diff --git a/src/jmap/painter.js b/src/jmap/painter.js
index e299bd411..442e53db1 100644
--- a/src/jmap/painter.js
+++ b/src/jmap/painter.js
@@ -67,11 +67,15 @@ class Painter {
      * @param {*} device
      */
 	add(device) {
-		const instance = shapefactory(device, this.$jmap);
-		if (instance) {
-			device.instance = instance;
-			this.$transformHandle.transformView(instance);
-			this.mapInstanceLevel[device._type].add(instance);
+		try {
+			const instance = shapefactory(device, this.$jmap);
+			if (instance) {
+				device.instance = instance;
+				this.$transformHandle.transformView(instance);
+				this.mapInstanceLevel[device._type].add(instance);
+			}
+		} catch (err) {
+			console.error(err);
 		}
 	}
 
@@ -136,15 +140,19 @@ class Painter {
      */
 	update(device) {
 		if (device) {
-			if (device._dispose) {
-				this.delete(device);
-			} else if (deviceType.Train == device._type) {
-				this.updateTrain(device);
-			} else {
-				const instance = device.instance;
-				if (instance) {
-					instance.setState(device);
+			try {
+				if (device._dispose) {
+					this.delete(device);
+				} else if (deviceType.Train == device._type) {
+					this.updateTrain(device);
+				} else {
+					const instance = device.instance;
+					if (instance) {
+						instance.setState(device);
+					}
 				}
+			} catch (err) {
+				console.error(err);
 			}
 		}
 	}
diff --git a/src/jmap/shape/Section/index.js b/src/jmap/shape/Section/index.js
index c6ba1f7f8..40235857d 100644
--- a/src/jmap/shape/Section/index.js
+++ b/src/jmap/shape/Section/index.js
@@ -228,8 +228,8 @@ export default class Section extends Group {
 			const y = Math.min(model.points[0].y, model.points[model.points.length - 1].y) + Math.abs(model.points[model.points.length - 1].y - model.points[0].y) / 2;
 			const traingle = new JTriangle(model.points[0], model.points[model.points.length - 1]);
 			const drict = model.trainPosType != '01' ? 1 : -1;
-			/** 区段名称*/
-			if (model.nameShow) {
+			/** 区段名称 (逻辑区段名称 或 物理区段名称 是否显示)*/
+			if (style.Section.logicText.show || style.Section.text.show) {
 				let tempx = x;
 				let tempy = y;
 				// 创建区段名称
@@ -238,23 +238,26 @@ export default class Section extends Group {
 						const opposite = style.Section.logicText.opposite ? -1: 1;
 						tempx += traingle.getSin(style.Section.logicText.distance);
 						tempy += traingle.getCos(style.Section.logicText.distance) * (style.Section.logicText.position || opposite * drict);
-						this.name = new ETextName({
-							zlevel: this.zlevel,
-							z: this.z + 2,
-							style: this.style,
-							silent: false,
-							x: tempx + model.namePosition.x,
-							y: tempy + model.namePosition.y,
-							fontWeight: style.Section.logicText.fontWeight,
-							fontSize: style.Section.logicText.fontSize,
-							fontFamily: style.fontFamily,
-							text: model.name,
-							textFill: style.Section.logicText.fontColor,
-							textAlign: style.Section.logicText.textAlign,
-							textPosition: style.Section.logicText.textPosition,
-							textVerticalAlign: style.Section.logicText.textVerticalAlign
-						});
-					} else {
+						if (style.Section.logicText.show) {
+							this.name = new ETextName({
+								zlevel: this.zlevel,
+								z: this.z + 2,
+								style: this.style,
+								silent: false,
+								x: tempx + model.namePosition.x,
+								y: tempy + model.namePosition.y,
+								fontWeight: style.Section.logicText.fontWeight,
+								fontSize: style.Section.logicText.fontSize,
+								fontFamily: style.fontFamily,
+								text: model.name,
+								textFill: style.Section.logicText.fontColor,
+								textAlign: style.Section.logicText.textAlign,
+								textPosition: style.Section.logicText.textPosition,
+								textVerticalAlign: style.Section.logicText.textVerticalAlign
+							});
+							this.add(this.name);
+						}
+					} else if (style.Section.text.show && !model.isSwitchSection) {
 						const opposite = style.Section.text.opposite ? -1: 1;
 						tempx += traingle.getSin(style.Section.text.distance);
 						tempy += traingle.getCos(style.Section.text.distance) * (style.Section.text.position || opposite * drict);
@@ -274,30 +277,33 @@ export default class Section extends Group {
 							textPosition: style.Section.text.textPosition,
 							textVerticalAlign: style.Section.text.textVerticalAlign
 						});
+						this.add(this.name);
 					}
 				} else {
-					this.name = new ETextName({
-						zlevel: this.zlevel,
-						z: this.z + 2,
-						style: this.style,
-						silent: false,
-						x: tempx + model.namePosition.x,
-						y: tempy + model.namePosition.y + style.Section.text.distance * drict,
-						fontWeight: style.Section.text.fontWeight,
-						fontSize: style.Section.text.fontSize,
-						fontFamily: style.fontFamily,
-						text: model.name,
-						textFill: style.Section.text.fontColor,
-						textAlign: style.Section.text.textAlign,
-						textPosition: style.Section.text.textPosition,
-						textVerticalAlign: style.Section.text.textVerticalAlign
-					});
+					if (style.Section.text.show) {
+						this.name = new ETextName({
+							zlevel: this.zlevel,
+							z: this.z + 2,
+							style: this.style,
+							silent: false,
+							x: tempx + model.namePosition.x,
+							y: tempy + model.namePosition.y + style.Section.text.distance * drict,
+							fontWeight: style.Section.text.fontWeight,
+							fontSize: style.Section.text.fontSize,
+							fontFamily: style.fontFamily,
+							text: model.name,
+							textFill: style.Section.text.fontColor,
+							textAlign: style.Section.text.textAlign,
+							textPosition: style.Section.text.textPosition,
+							textVerticalAlign: style.Section.text.textVerticalAlign
+						});
+						this.add(this.name);
+					}
 				}
-				this.add(this.name);
 			}
 
 			/** 站台轨名称*/
-			if (model.isStandTrack && model.standTrackNameShow) {
+			if (model.isStandTrack && model.standTrackNameShow && style.Section.standText.show) {
 				const opposite = style.Section.standText.opposite ? -1: 1;
 				const tempx = x + traingle.getSin(style.Section.standText.distance);
 				const tempy = y + traingle.getCos(style.Section.standText.distance) * (style.Section.standText.position || opposite * drict);
@@ -320,7 +326,7 @@ export default class Section extends Group {
 			}
 
 			/** 折返轨名称*/
-			if (model.isReentryTrack && model.reentryTrackNameShow) {
+			if (model.isReentryTrack && model.reentryTrackNameShow && style.Section.reentryText.show) {
 				const opposite = style.Section.reentryText.opposite ? -1: 1;
 				const tempx = x + traingle.getSin(style.Section.reentryText.distance);
 				const tempy = y + traingle.getCos(style.Section.reentryText.distance) * (style.Section.reentryText.position || opposite * drict);
@@ -343,7 +349,7 @@ export default class Section extends Group {
 			}
 
 			/** 转换轨名称*/
-			if (model.isTransferTrack && model.transferTrackNameShow) {
+			if (model.isTransferTrack && model.transferTrackNameShow && style.Section.transferText.show) {
 				const opposite = style.Section.transferText.opposite ? -1: 1;
 				const tempx = x + traingle.getSin(style.Section.transferText.distance);
 				const tempy = y + traingle.getCos(style.Section.transferText.distance) * (style.Section.transferText.position || opposite * drict);
@@ -366,7 +372,7 @@ export default class Section extends Group {
 			}
 
 			/** 目的码名称*/
-			if (model.destinationCode && model.destinationCodeShow) {
+			if (model.destinationCode && model.destinationCodeShow && style.Section.destinationText.show) {
 				const opposite = style.Section.destinationText.opposite ? -1: 1;
 				const tempx = x + traingle.getSin(style.Section.destinationText.distance);
 				const tempy = y + traingle.getCos(style.Section.destinationText.distance) * (style.Section.destinationText.position || opposite * drict);
@@ -731,7 +737,7 @@ export default class Section extends Group {
 	/** 设置状态*/
 	setState(model) {
 		this.recover();
-		if (model.status == '01') {
+		if (model.status == '01' || model.status == '00' || model.status == undefined) {
 			if (this.name && this.style.Section.active.routeColor) {
 				this.name.setStyle({textFill: this.style.Section.text.fontColor});
 			}
diff --git a/src/jmap/shape/Signal/EMouse.js b/src/jmap/shape/Signal/EMouse.js
index dbc9c924e..1b7ef9e6a 100644
--- a/src/jmap/shape/Signal/EMouse.js
+++ b/src/jmap/shape/Signal/EMouse.js
@@ -47,7 +47,7 @@ export default class EMouse extends Group {
 		this.device.lamps.forEach(elem => {
 			elem.setBorderColor(this.style.Signal.mouseOverStyle.lampBorderLineColor);
 		});
-		this.device.sigName.setColor(this.style.backgroundColor);
+		this.device.sigName && this.device.sigName.setColor(this.style.backgroundColor);
 	}
 
 	mouseout(e) {
diff --git a/src/jmap/shape/Signal/index.js b/src/jmap/shape/Signal/index.js
index 9ab5ff302..e0efe7c5b 100644
--- a/src/jmap/shape/Signal/index.js
+++ b/src/jmap/shape/Signal/index.js
@@ -150,7 +150,7 @@ class Signal extends Group {
 
 		this.add(this.sigPost);
 		this.lamps.forEach(lamp => { this.add(lamp); });
-		this.model.nameShow ? this.add(this.sigName) : null;
+		this.style.Signal.text.show ? this.add(this.sigName) : null;
 		this.add(this.sigAuto);
 		this.add(this.sigRoute);
 		this.add(this.sigDelay);
diff --git a/src/jmap/shape/Station/index.js b/src/jmap/shape/Station/index.js
index a25fab0d5..cfd8c5562 100644
--- a/src/jmap/shape/Station/index.js
+++ b/src/jmap/shape/Station/index.js
@@ -21,7 +21,7 @@ export default class Station extends Group {
 		const model = this.model;
 		const style = this.style;
 
-		if (model.visible) {
+		if (style.Station.text.show) {
 			this.stationText = new ETextName({
 				zlevel: this.zlevel,
 				z: this.z,
diff --git a/src/jmap/shape/StationControl/index.js b/src/jmap/shape/StationControl/index.js
index b84702861..aced10c05 100644
--- a/src/jmap/shape/StationControl/index.js
+++ b/src/jmap/shape/StationControl/index.js
@@ -113,24 +113,24 @@ export default class StationControl extends Group {
 	setState(model) {
 		switch (model.status) {
 		case '00': // 无状态
-			this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
 			break;
 		case '01': // 中控
-			this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.centerControl.setColor(this.style.StationControl.lamp.greenColor);
+			this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.greenColor);
 			break;
 		case '02': // 站控
-			this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.substationControl.setColor(this.style.StationControl.lamp.yellowColor);
-			this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.yellowColor);
+			this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
 			break;
 		case '03': // 紧急站控
-			this.emergencyControl.setColor(this.style.StationControl.lamp.redColor);
-			this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.redColor);
+			this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
+			this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
 			break;
 		}
 	}
diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js
index f8e15a6ed..732860278 100644
--- a/src/jmap/shape/StationStand/index.js
+++ b/src/jmap/shape/StationStand/index.js
@@ -196,7 +196,7 @@ class StationStand extends Group {
 
 	/** 空闲*/
 	spare() {
-		this.safeStand.setColor(this.style.StationStand.stand.spareColor);
+		this.safeStand && this.safeStand.setColor(this.style.StationStand.stand.spareColor);
 	}
 
 	/** 列车停站*/
diff --git a/src/jmap/shape/Switch/index.js b/src/jmap/shape/Switch/index.js
index 34786f860..503d61400 100644
--- a/src/jmap/shape/Switch/index.js
+++ b/src/jmap/shape/Switch/index.js
@@ -135,7 +135,7 @@ export default class Switch extends Group {
 			nameTextY: nameTextY,
 			sectionName: model.sectionName,
 			name: model.name,
-			nameShow: model.nameShow,
+			nameShow: style.Switch.text.show,
 			triangle: this.triangle
 		});
 
@@ -188,7 +188,7 @@ export default class Switch extends Group {
 
 	/** 设置岔芯颜色*/
 	setSwitchCoreColor(color) {
-		this.swCore.setColor(color);
+		this.swCore && this.swCore.setColor(color);
 	}
 
 	/** 设置道岔文字颜色*/
diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue
index 9b94b9fa2..b8b5fd3b7 100644
--- a/src/views/demonstration/deomonList/index.vue
+++ b/src/views/demonstration/deomonList/index.vue
@@ -110,7 +110,7 @@ export default {
 					launchFullscreen();
 					await putJointTrainingSimulationEntrance(this.group);
 					const rest = await getPublishMapInfo(this.mapId);
-					const query = { skinStyle: rest.data.skinStyle, mapId: this.mapId, group: this.group };
+					const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.group };
 					this.$router.push({ path: `/jointTraining`, query: query });
 				} else if (this.state == '01') {
 					const query = { group: this.group };
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index adc95b882..10b24ee54 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -2,7 +2,7 @@
   <el-card v-loading="loading">
     <div slot="header" style="text-align: center;">
       <span v-if="hasProduct"><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
-      <span v-else>{{$t('demonstration.noSimulationProducts')}}</span>
+      <span v-else>{{ $t('demonstration.noSimulationProducts') }}</span>
     </div>
     <el-tabs
       type="border-card"
@@ -20,22 +20,22 @@
       >
         <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: height-170 +'px' }">
           <p class="list-item">
-            <span class="list-label">{{$t('demonstration.productDescription')}}</span>
+            <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
             <span class="list-elem">{{ courseModel.remarks }}</span>
           </p>
           <p class="list-item">
-            <span class="list-label">{{$t('global.permissionList')}}</span>
+            <span class="list-label">{{ $t('global.permissionList') }}</span>
           </p>
           <limit-list :ref="`limit_${item.code}`" :course-model="courseModel" @initLoadPage="initLoadPage" />
         </el-scrollbar>
       </el-tab-pane>
       <div v-if="hasProduct" class="btn-buy">
-        <el-button :loading="buttonLoading" type="success" @click="buy">{{$t('global.buy')}}</el-button>
-        <el-button v-if="hasPermssion" :loading="buttonLoading" type="primary" @click="distribute">{{$t('global.distributePermission')}}</el-button>
-        <el-button v-if="hasPermssion" :loading="buttonLoading" type="primary" @click="transfer">{{$t('global.transferQRCode')}}</el-button>
-        <el-button v-show="isStartDemon" :loading="buttonLoading" type="primary" @click="start">{{$t('demonstration.startSimulation')}}</el-button>
-        <el-button v-show="isCreateRoom" :loading="buttonLoading" type="primary" @click="start">{{$t('demonstration.createRoom')}}</el-button>
-        <el-button v-show="isInRoom" :loading="buttonLoading" type="primary" @click="joinRoom">{{$t('demonstration.enterRoom')}}</el-button>
+        <el-button :loading="buttonLoading" type="success" @click="buy">{{ $t('global.buy') }}</el-button>
+        <el-button v-if="hasPermssion" :loading="buttonLoading" type="primary" @click="distribute">{{ $t('global.distributePermission') }}</el-button>
+        <el-button v-if="hasPermssion" :loading="buttonLoading" type="primary" @click="transfer">{{ $t('global.transferQRCode') }}</el-button>
+        <el-button v-show="isStartDemon" :loading="buttonLoading" type="primary" @click="start">{{ $t('demonstration.startSimulation') }}</el-button>
+        <el-button v-show="isCreateRoom" :loading="buttonLoading" type="primary" @click="start">{{ $t('demonstration.createRoom') }}</el-button>
+        <el-button v-show="isInRoom" :loading="buttonLoading" type="primary" @click="joinRoom">{{ $t('demonstration.enterRoom') }}</el-button>
       </div>
     </el-tabs>
   </el-card>
@@ -279,7 +279,7 @@ export default {
 				launchFullscreen();
 			}).catch(error => {
 				this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                this.buttonLoading = false;
+				this.buttonLoading = false;
 			});
 		},
 		buy() {
diff --git a/src/views/demonstration/list/demonList.vue b/src/views/demonstration/list/demonList.vue
index 6f93274f2..d554427b5 100644
--- a/src/views/demonstration/list/demonList.vue
+++ b/src/views/demonstration/list/demonList.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card v-loading="loading" class="map-list-main">
     <div slot="header" class="clearfix">
-      <span>{{$t('global.mapList')}}</span>
+      <span>{{ $t('global.mapList') }}</span>
       <!-- <div v-if="role" class="back-home" @click="backHome">返回首页</div> -->
     </div>
     <filter-city ref="filerCity" filter-empty :query-function="queryFunction" @filterSelectChange="refresh" @changeFilter="clearMapSelect" />
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index 6f468b7d5..163787bfb 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -158,15 +158,15 @@ export default {
 		trainingId() {
 			return this.$route.query.trainingId;
 		},
-		skinCode() {
-			return this.$route.query.skinCode;
-		},
 		mapId() {
 			return this.$route.query.mapId;
 		},
 		prdType() {
 			return this.$route.query.prdType;
 		},
+		skinCode() {
+			return this.$route.query.skinCode;
+		},
 		isLesson() {
 			return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
 		},
diff --git a/src/views/jointTraining/index.vue b/src/views/jointTraining/index.vue
index 621935079..32873365d 100644
--- a/src/views/jointTraining/index.vue
+++ b/src/views/jointTraining/index.vue
@@ -72,6 +72,7 @@ export default {
 			userRole: '',
 			group: '',
 			mapId: '',
+			skinCode: '',
 			simulationShow: false,
 			drivingShow: false
 		};
@@ -90,10 +91,7 @@ export default {
 		]),
 		...mapGetters('config', [
 			'canvasId'
-		]),
-		skinCode() {
-			return this.$route.query.skinCode;
-		}
+		])
 	},
 	watch: {
 		'$store.state.config.menuBarLoadedCount': function (val) {
@@ -135,6 +133,7 @@ export default {
 	async created() {
 		this.group = this.$route.query.group;
 		this.mapId = this.$route.query.mapId;
+		this.skinCode = this.$route.query.skinCode;
 	},
 	async mounted() {
 		await this.initLoadData();
@@ -283,6 +282,8 @@ export default {
 			this.$store.dispatch('training/end', TrainingMode.NORMAL);
 			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
 
+			console.log(this.skinCode);
+
 			if (this.skinCode) {
 				// 01 现地 02 行调 '' 观众
 				const resp = await this.getUserRole();
diff --git a/src/views/jointTraining/menuDemon.vue b/src/views/jointTraining/menuDemon.vue
index 2a1b65e0e..b17b0dcc7 100644
--- a/src/views/jointTraining/menuDemon.vue
+++ b/src/views/jointTraining/menuDemon.vue
@@ -122,13 +122,13 @@ export default {
 			this.setPosition();
 		},
 		'$store.state.map.map.stationList': function (val) { // 执行一次 以后不会有变化
-			if (val.length) {
+			if (val && val.length) {
 				this.stationList = val;
 				this.stationLists = val;
 			}
 		},
 		'$store.state.socket.roleInfo': function (val) {
-			if (val.length) {
+			if (val && val.length) {
 				this.addrolesList(val);
 				this.$nextTick(() => {
 					this.$store.dispatch('config/updateMenuBar');
diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue
index 459539f36..f4357bcd6 100644
--- a/src/views/trainRoom/index.vue
+++ b/src/views/trainRoom/index.vue
@@ -132,8 +132,8 @@
               v-if="userId == roomInfo.creatorId"
               type="primary"
               style="float: right;"
-              @click="start"
               :loading="loading"
+              @click="start"
             >
               开始仿真</el-button>
           </div>
@@ -141,16 +141,16 @@
             <el-button
               type="primary"
               style="float: right; margin-right: 10px;"
-              @click="joinJointTrain"
               :loading="loading"
+              @click="joinJointTrain"
             >
               进入仿真</el-button>
             <el-button
               v-if="userId == roomInfo.creatorId"
               type=""
               style="float: right; margin-right: 10px;"
-              @click="stop"
               :loading="loading"
+              @click="stop"
             >
               结束仿真</el-button>
           </div>
@@ -158,8 +158,8 @@
             v-if="userId == roomInfo.creatorId"
             type=""
             style="float: right; margin-right: 0px;"
-            @click="postCode"
             :loading="loading"
+            @click="postCode"
           >生成二维码
           </el-button>
           <el-button type="" style="float: right; margin-right: 10px;" @click="backRoom">返回
@@ -168,8 +168,8 @@
             v-if="userId == roomInfo.creatorId"
             type="danger"
             style="float: right; margin-right: 0px;"
-            @click="exit"
             :loading="loading"
+            @click="exit"
           >销毁房间
           </el-button>
         </div>
@@ -263,7 +263,7 @@ export default {
 			starting: false,
 			mapId: '',
 			num: 0,
-            loading: false
+			loading: false
 		};
 	},
 	watch: {
@@ -372,7 +372,7 @@ export default {
 		},
 		async joinJointTrain() {
 			// launchFullscreen();
-            this.loading = true;
+			this.loading = true;
 			await putJointTrainingSimulationEntrance(this.$route.query.group);
 			const rest = await getPublishMapInfo(this.mapId);
 			const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.$route.query.group };
@@ -553,11 +553,11 @@ export default {
 					this.$refs.qrCode.doShow(param);
 				}
 			}
-            this.loading = false;
+			this.loading = false;
 		},
 		async start() {
 			let flag = true;
-            this.loading = true;
+			this.loading = true;
 			this.equipmentList.forEach(item => {
 				if (!item.deviceCode) {
 					flag = false;
@@ -567,14 +567,14 @@ export default {
 			if (flag) {
 				try {
 					await startJointTraining(this.$route.query.group);
-                    this.loading = false;
+					this.loading = false;
 				} catch (error) {
 					this.messageInfo('开始综合演练失败。', 'error');
-                    this.loading = false;
+					this.loading = false;
 				}
 			} else {
 				this.messageInfo('车站值班员所属车站不能为空', 'error');
-                this.loading = false;
+				this.loading = false;
 			}
 		},
 		async stop() {