道岔绘图代码调整

src/jmapNew/config/skinCode/fuzhou_01.js

@@ -222,7 +222,7 @@ class SkinCode extends defaultStyle {
             detainCar: { 										// 扣车
                 text: 'H', 										// 扣车显示内容
                 position: 1, 									// 扣车方向
-                offset: {x: -8, y: 23}, 						// 扣车偏移量
+                offset: {x: -8, y: 25}, 						// 扣车偏移量
                 trainColor: '#E4EF50', 							// 车站扣车颜色
                 centerTrainColor: '#FFFFFF', 					// 中心扣车颜色
                 andCenterTrainColor: '#F61107', 				// 车站+中心扣车颜色
@@ -236,8 +236,8 @@ class SkinCode extends defaultStyle {
             },
             level: { 											// 运行等级
                 position: 1, 									// 运行等级方向
-                offset: {x: -8, y: 6}, 							// 运行等级偏移量
+                offset: {x: -10, y: -10}, 							// 运行等级偏移量
-                textColor: '#FFFFFF' 							// 停站等级字体颜色
+                textColor: '#FFFFFF' 							// 运行等级字体颜色
             },
             trainStop: {}, 									// 停车标志
             trainDepart: {}, 								// 停车计时

src/jmapNew/shape/Switch/index.js

@@ -305,8 +305,12 @@ export default class Switch extends Group {
         this.locShelter.hide(); // 定位
         if (this.style.Switch.sectionAction.flag) { // 哈尔滨线路处理道岔相关区段颜色
             this.sheltertriangle.show();
+            this.setSectionState(this.sheltertriangle.getSection(), 'fill', this.model);
+        } else {
+            this.rhomboid.show();
+            this.setSectionState(this.rhomboid.getSection(), 'fill', this.model);
         }
-        this.setSectionState(this.sheltertriangle.getSection(), 'fill', this.model);
+
         if (this.style.Switch.core.graphShow) { // 佛山线路显示
             this.sheltertriangle.hide();
             this.locShelter.show();
@@ -483,10 +487,14 @@ export default class Switch extends Group {
     }
 
     setSectionState(section, style, state) {
-        if (section && !section.animators.length) {
+        // && !section.animators.length
+        if (section) {
             const sectionA = store.getters['map/getDeviceByCode'](state.sectionACode);
             /** 空闲 */
             section.setStyle(style, this.style.Section.line.spareColor);
+            section.setStyle('lineWidth', 0);
+            section.setStyle('stroke', this.style.Section.line.spareColor);
+
             /** 道岔保护区段锁闭 */
             if (sectionA.overlapLock) {
                 section.setStyle(style, this.style.Section.line.protectiveLockColor);
@@ -494,14 +502,20 @@ export default class Switch extends Group {
             /** 空闲锁闭或者叫进路锁闭 */
             if (sectionA.routeLock) {
                 section.setStyle(style, this.style.Section.line.routeLockColor);
+                section.setStyle('stroke', this.style.Section.line.routeLockColor);
+                section.setStyle('lineWidth', this.style.Section.line.beyondWidth);
             }
             /** 非CBTC车占用 */
             if (sectionA.nctOccupied) {
                 section.setStyle(style, this.style.Section.line.unCommunicationOccupiedColor);
+                section.setStyle('stroke', this.style.Section.line.unCommunicationOccupiedColor);
+                section.setStyle('lineWidth', this.style.Section.line.beyondWidth);
             }
             /** CBTC车占用 */
             if (sectionA.ctOccupied) {
                 section.setStyle(style, this.style.Section.line.communicationOccupiedColor);
+                section.setStyle('stroke', this.style.Section.line.communicationOccupiedColor);
+                section.setStyle('lineWidth', this.style.Section.line.beyondWidth);
             }
             if (state.cutOff) {
                 this.sectionCutOff(section);
@@ -528,6 +542,8 @@ export default class Switch extends Group {
         model.singleLock && this.setMonolock(); // 道岔单锁
         model.blockade && this.block(); // 道岔封锁
         model.singleLock && model.blockade && this.blockMonolock(); // 单锁&锁闭状态
+
+        model.routeLock && this.setSectionState(this.rhomboid.getSection(), 'fill', this.model);
         // this.interlockingReserved(); // 联锁预留道岔
 
         if (this.style.Switch.sectionAction.flag) { // 哈尔滨线路处理道岔相关区段颜色

src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue

@@ -80,7 +80,12 @@ export default {
                         cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
                     },
                     {
-                        label: this.$t('menu.menuSignal.guideRouteHandle'),
+                        label: this.$t('menu.menuSignal.signalOff'),
+                        handler: this.signalClose,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+                    },
+                    {
+                        label: '进路引导',
                         handler: this.guide,
                         cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
                     },
@@ -104,11 +109,6 @@ export default {
                         handler: this.cancelAutoTrigger,
                         cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
                     },
-                    {
-                        label: this.$t('menu.menuSignal.signalOff'),
-                        handler: this.signalClose,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
-                    },
                     {
                         label: '查询进路控制模式',
                         handler: this.detail,

src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue

@@ -22,9 +22,7 @@ import StandStopTime from './dialog/standStopTime';
 import StandDetainTrainAll from './dialog/standDetainTrainAll';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-// import Handler from '@/scripts/cmdPlugin/Handler';
 import { mapGetters } from 'vuex';
-// import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';