Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
#	src/views/newMap/newMapdraft/mapoperate/index.vue

src/jmapNew/config/skinCode/bejing_01.js

@@ -242,6 +242,22 @@ class SkinCode extends defaultStyle {
             }
         };
 
+        /** 引导总锁 */
+        this[deviceType.GuideLock] = {
+            // 是否显示
+            displayCondition: '03', // 显示条件 prdType
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
+            }
+        };
+
         this[deviceType.StationStand] = {
             common: { 												// 通用属性
                 textFontSize: 8, 									// 站台默认字体大小

src/jmapNew/config/skinCode/chengdu_03.js

@@ -490,6 +490,23 @@ class SkinCode extends defaultStyle {
 
             }
         };
+
+        /** 引导总锁 */
+        this[deviceType.GuideLock] = {
+            // 是否显示
+            displayCondition: '03', // 显示条件 prdType
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
+            }
+        };
+
         this[deviceType.TrainWindow] = {
             lineColor: '#4DD43F',							// 车次窗颜色
             lineDash: null,									// 车次窗虚线间隔

src/jmapNew/config/skinCode/ningbo_01.js

@@ -487,6 +487,8 @@ class SkinCode extends defaultStyle {
                 controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
             }
         };
+
+        /** 引导总锁 */
         this[deviceType.GuideLock] = {
             // 是否显示
             displayCondition: '03', // 显示条件 prdType

src/jmapNew/shape/Automactic/EMouse.js

@@ -31,10 +31,8 @@ export default class EMouse extends Group {
         if (e.target && e.target._subType == 'Text') {
             this.text.show();
         } else {
-			this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
+            // this.device.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
+            // this.device.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
         }
     }
 
@@ -43,10 +41,8 @@ export default class EMouse extends Group {
             if (e.target && e.target._subType == 'Text') {
                 this.text.hide();
             } else {
-				this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
+                // this.device.setControlColor(this.device.style.LcControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
+                // this.device.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
             }
         }
     }

src/jmapNew/shape/Automactic/index.js

@@ -33,7 +33,7 @@ export default class Automactic extends Group {
         this.control = new Arc({
             _subType: 'Control',
             zlevel: this.zlevel,
-            z: this.z,
+            z: this.z + 1,
             shape: {
                 cx: model.position.x,
                 cy: model.position.y,
@@ -48,7 +48,7 @@ export default class Automactic extends Group {
         this.text = new Text({
             _subType: 'Text',
             zlevel: this.zlevel,
-            z: this.z,
+            z: this.z + 1,
             position: [0, 0],
             style: {
                 x: model.position.x,
@@ -170,4 +170,15 @@ export default class Automactic extends Group {
         this.subtitleText && this.subtitleText.hide();
         this.arcBorder && this.arcBorder.hide();
     }
+
+    setControlColor(color) {
+        if (color) {
+            this.control.setStyle('fill', color);
+        }
+    }
+    setTextColor(color) {
+        if (color) {
+            this.text.setStyle('textFill', color);
+        }
+    }
 }

src/jmapNew/shape/GuideLock/EMouse.js

@@ -31,10 +31,8 @@ export default class EMouse extends Group {
         if (e.target && e.target._subType == 'Text') {
             this.text.show();
         } else {
-            this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
+            // this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
-            this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
+            // this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
-            this.device.control.setTextBorder(true);
-            this.device.control.setArcBorder(true);
         }
     }
 
@@ -43,10 +41,8 @@ export default class EMouse extends Group {
             if (e.target && e.target._subType == 'Text') {
                 this.text.hide();
             } else {
-                this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
+                // this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
-                this.device.control.setTextColor('#FFFFFF');
+                // this.device.control.setTextColor('#FFFFFF');
-                this.device.control.setTextBorder(false);
-                this.device.control.setArcBorder(false);
             }
         }
     }

src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue

@@ -261,9 +261,10 @@ export default {
             this.getAutoMaticList();
         },
         deviceSelect(selected) {
+            debugger;
             this.$refs.dataform.resetFields();
             this.$refs.make.resetFields();
-            if (selected && selected._type.toUpperCase() == 'AutomaticRoute'.toUpperCase() || selected._type.toUpperCase() == 'AutoTurnBack'.toUpperCase() || selected._type.toUpperCase() == 'AxleReset'.toUpperCase() || selected._type.toUpperCase() == 'LimitControl'.toUpperCase()) {
+            if (selected && selected._type.toUpperCase() == 'AutomaticRoute'.toUpperCase() || selected._type.toUpperCase() == 'MapCycleButtonVO'.toUpperCase() || selected._type.toUpperCase() == 'AxleReset'.toUpperCase() || selected._type.toUpperCase() == 'LimitControl'.toUpperCase() || selected._type.toUpperCase() == 'GuideLock'.toUpperCase()) {
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
                 this.editModel.type = selected._type;

src/views/newMap/newMapdraft/mapoperate/index.vue

@@ -301,7 +301,7 @@ export default {
                 this.enabledTab = 'Esp';
             } else if (this.feild) {
                 this.enabledTab = 'Section';
-            } else if (type == 'AutomaticRoute' || type == 'AutoTurnBack' || type == 'AxleReset' || type == 'LimitControl') {
+            } else if (type == 'AutomaticRoute' || type == 'MapCycleButtonVO' || type == 'AxleReset' || type == 'LimitControl' || type == 'GuideLock') {
                 this.enabledTab = 'ControlDraft';
             } else {
                 this.enabledTab = type;