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

src/jmapNew/config/skinCode/nanjing_02.js

@@ -90,7 +90,7 @@ class SkinCode extends defaultStyle {
                 invalidColor: '#ff0000', // 计轴故障
                 undefinedColor: '#0071C1', 						// 区段未定义颜色
                 protectionLockedColor: '#FEFF00', 				// 保护区段锁闭(未用)
-                blockColor: '#000080', 							// 区段封锁颜色  深蓝色
+                blockColor: '#0010FF', 							// 区段封锁颜色  深蓝色
                 atcExcisionColor: '#A0522D', 					// 区段atc切除颜色
                 atsExcisionColor: '#A0522D', 					// 区段ats切除颜色
                 timeReleaseColor: '#ffff00', 					// 区段延时释放颜色
@@ -118,15 +118,16 @@ class SkinCode extends defaultStyle {
                 leftName: true,	// 左侧限速值是否展示
 				rightName: false, // 右侧限速值是否展示
                 nameBackgroundIsRect: true,	// 限速值背景是否为矩形
-                nameBackgroundBorderWidth: 1, // 限速值背景是否边框宽度
+                nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度
                 nameBackgroundBorderColor: '#C00808', // 限速值背景边框颜色
                 limitValueDistance: 18,
 				kilometerFontSize: 0,						// 公里标大小
+				nameAlone: true,								// 只显示一个限速名称
                 nameNumberFontSize: 11,						// 限速值大小
                 nameNumberColor: '#C00808',					// 限速值颜色
                 nameBackground: '#000',						// 限速名称背景颜色
                 drogueWidth: 15,							// 浮标宽度
-                drogueHeight: 12							// 浮标高度
+				drogueHeight: 12,							// 浮标高度
             },
             separator: {
                 z: 3,											// 分割符层级

src/jmapNew/shape/Responder/index.js

@@ -31,7 +31,7 @@ export default class Responder extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        this.z = model.zIndex || 1;
+        this.z = model.z || 19;
         if (model.previewOrMapDraw) {
             this.create();
             this.setState(model);
@@ -41,8 +41,8 @@ export default class Responder extends Group {
     create() {
         const model = this.model;
         const responderStyle = this.style.Responder || defaultStyle;
-        const distanceX = responderStyle.distance * Math.sin(model.rotate);
+        const distanceX = responderStyle.distance * Math.cos(model.rotate-90);
-        const distanceY = responderStyle.distance * Math.cos(model.rotate);
+        const distanceY = responderStyle.distance * Math.sin(model.rotate-90);
         const blockWidth = responderStyle.block.width || 5;
         const blockHeight = responderStyle.block.height || 12;
         const blockStyle = responderStyle.block.mapStyle[model.type] || { fill: '#fff'};

src/jmapNew/shape/Section/index.js

@@ -246,6 +246,12 @@ export default class Section extends Group {
     setSpeedUpperLimit(speedUpLimit) {
         if (this.style.Section.line.speedLimitColor) { // 宁波三号线 独有
             this.line.setStyle({stroke: this.style.Section.line.speedLimitColor});
+		} else if (this.style.Section.speedLimitName.nameAlone && this.model.type == '03') {	// 南京2，道岔区段只显示一个名称
+			const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode];
+			if (switchModel && switchModel.sectionACode == this._code) {
+				this.speedLimit && this.speedLimit.show();
+				this.speedLimitName && this.speedLimitName.show(speedUpLimit);
+			}
 		} else {
             this.speedLimit && this.speedLimit.show();
             this.speedLimitName && this.speedLimitName.show(speedUpLimit);

src/jmapNew/theme/nanjing_02/menus/menuBar.vue

@@ -442,7 +442,7 @@ export default {
     $menuItemPadding: 5px;
 
     #menuBar {
-        z-index: 37;
+        z-index: 16;
         position: absolute;
         width: inherit;
     }

src/jmapNew/theme/nanjing_02/menus/menuButton.vue

@@ -578,9 +578,13 @@ export default {
             this.basicParamList.forEach((basic, index) => {
                 this.centralizedStationList[index] = basic;
             });
+
 			this.tempData = [];
 			const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+			if (station) {
 				this.tempData.push(station);
+			}
+
             this.param = {
                 stationCode: this.$store.state.map.showCentralizedStationCode,
                 stationCodes: [this.$store.state.map.showCentralizedStationCode]
@@ -652,9 +656,9 @@ export default {
             if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
                 this.param.speedLimitValue = this.speedLimitValue;
                 this.centralizedStationList = new Array(15).fill({ name: '' });
-                [15, 25, 40, 60].forEach((el, i) => {
+                [65, 55, 45, 35, 25, 0].forEach((el, i) => {
                     this.centralizedStationList[i] = {
-                        name: `${el} s`,
+                        name: `${el} km/h`,
                         cmdType: this.cmdType,
                         operate: OperationEvent.StationControl.requestStationControl.menu,
                         next: true,
@@ -888,8 +892,8 @@ export default {
             this.sectionParamList = [
                 { name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, show: false, securityCommand: true },
                 { name: '轨区消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, show: false, securityCommand: true },
-                { name: '强行消限', cmdType: '', operate: OperationEvent.Section.cancelSpeed.menuButton, show: false, securityCommand: true },
+                { name: '强行消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, show: false, securityCommand: true },
-                { name: '强解区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
+                { name: '强解区段', cmdType: CMD.Section.CMD_SECTION_FORCE_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
                 { name: '预复位', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.cancelSpeed.menuButton, show: false, securityCommand: true },
                 { name: '封锁区段', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, show: false },
                 { name: '解封区段', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, show: false, securityCommand: true }
@@ -899,7 +903,7 @@ export default {
                 { name: '岔区消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, show: false, securityCommand: true },
                 { name: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.locate.menuButton, show: false },
                 { name: '强行转岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.locate.menuButton, show: false, securityCommand: true },
-                { name: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
+                { name: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
                 { name: '挤岔恢复', cmdType: '', operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
                 { name: '单独锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, show: false },
                 { name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, show: false, securityCommand: true },

src/scripts/cmdPlugin/CommandEnum.js

@@ -20,6 +20,8 @@ export default {
         CMD_SWITCH_AXIS_PRE_RESET: {value:'Switch_Axis_Pre_Reset', label: '计轴预复位'},
         /** 故障解锁 */
 		CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
+		/** 强解道岔*/
+		CMD_SWITCH_FORCE_UNLOCK: {value:'', label: '强解道岔'},
         /** 转动 */
         CMD_SWITCH_TURN: {value:'Switch_Turn', label: '转动'},
         /** 强扳 */
@@ -132,6 +134,8 @@ export default {
         CMD_SECTION_FAULT_UNLOCK: {value:'Section_Fault_Unlock', label: '故障解锁'},
         /** 取消临时限速 */
 		CMD_SECTION_CANCEL_LIMIT_SPEED:{value:'Section_Cancel_Limit_Speed', label: '取消临时限速'},
+		/** 强解区段*/
+		CMD_SECTION_FORCE_UNLOCK: {value: 'Section_Force_Unlock', label: '强解区段'},
         /** 确认计轴有效 */
         CMD_SECTION_COMFIRMATION_AXLE:{value:'Section_Confirm_Axis_Valid', label: '确认计轴有效'},
         /** 详情 */

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

@@ -134,6 +134,16 @@ export default {
             } else if (!selected) {
                 this.$emit('deviceSelect', '');
             }
+		},
+		edit() {
+			if (this.$refs.respModel) {
+				this.$refs.respModel.edit()
+			}
+		},
+		deleteObj() {
+			if (this.$refs.respModel) {
+				this.$refs.respModel.deleteObj()
+			}
 		}
     }
 };