预复位调整

src/jmapNew/config/skinCode/foshan_01.js

@@ -98,6 +98,10 @@ class SkinCode extends defaultStyle {
                 logicalTextColor: '#FFFFFF', 					// 逻辑区段名称颜色 (未用)
                 invalidColor: '#A25100' 						// 区段ARB故障颜色
             },
+            sectionMiddle: {
+                preResetColor: '#4169E1',						// 区段计轴预复位
+                z: 2
+            },
             speedLimit: { 										// 限速元素
                 z: 2,
                 width: 1, 										// 限速线的宽短

src/jmapNew/config/skinCode/fuzhou_01.js

@@ -6,7 +6,7 @@ class SkinCode extends defaultStyle {
         super();
         this.fontFamily = '宋体';
         this[deviceType.Section] = {
-            elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit'],
+            elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit', 'sectionMiddle'],
             active: {
                 routeColor: false							// 进路触发颜色
             },
@@ -98,6 +98,10 @@ class SkinCode extends defaultStyle {
                 logicalTextColor: '#FFFFFF', 					// 逻辑区段名称颜色 (未用)
                 invalidColor: '#A25100' 						// 区段ARB故障颜色
             },
+            sectionMiddle: {
+                preResetColor: '#00FFFF',						// 区段计轴预复位
+                z: 2
+            },
             speedLimit: { 										// 限速元素
                 z: 2,
                 width: 1, 										// 限速线的宽短

src/jmapNew/theme/components/utils/menuOperate.js

@@ -224,7 +224,7 @@ export const menuOperate = {
         axlePreReset:{
             // 计轴预复位
             operation: OperationEvent.Switch.axlePreReset.menu.operation,
-            cmdType: CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
+            cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET
         },
         hookLock:{
             // 道岔钩锁

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

@@ -144,7 +144,7 @@
     <button
       id="mbm_14"
       :style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"
-      @click="buttonDown('mbm_14')"
+      @click="buttonDown('Section.axlePreReset.button.operation')"
     >
       <span style="color: red">
         <center>
@@ -323,6 +323,7 @@ export default {
             const operate = {
                 operation: operation
             };
+            console.log(operate, '=====');
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下

src/jmapNew/theme/foshan_01/menus/menuSection.vue

@@ -27,6 +27,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import AllLineCancelLimit from './dialog/allLineCancelLimit';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'SectionMenu',
@@ -143,6 +144,11 @@ export default {
             } else {
                 this.doClose();
             }
+        },
+        '$store.state.menuOperation.selectedCount': function(val) {
+            if (this.buttonOperation && this.$store.state.menuOperation.selected._type == 'Switch') {
+                this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected);
+            }
         }
     },
     mounted() {
@@ -186,6 +192,24 @@ export default {
                 this.$refs.popMenu.close();
             }
         },
+        operationHandler(buttonOperation, selectType) {
+            switch (buttonOperation) {
+            case OperationEvent.Switch.locate.button.operation: {
+                // 道岔总定
+                if (!selectType.normalPosition && selectType.reversePosition) {
+                    this.locate(selectType);
+                }
+                break;
+            }
+            case OperationEvent.Switch.reverse.button.operation: {
+                // 道岔总反
+                if (selectType.normalPosition && !selectType.reversePosition) {
+                    this.reverse(selectType);
+                }
+                break;
+            }
+            }
+        },
         loadSpare() {
             commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
                 if (valid) {

src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue

@@ -388,7 +388,7 @@ export default {
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
-                operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET;
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });

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

@@ -82,7 +82,7 @@ export default {
                     {
                         label: '计轴预复位',
                         handler: this.axlePreReset,
-                        cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
+                        cmdType:CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET
                     },
                     {
                         label: this.$t('menu.menuSwitch.sectionResection'),

src/jmapNew/theme/fuzhou_01/operationConfig.js

@@ -577,7 +577,7 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: 'Switch_Axis_Pre_Reset',
+            operateType: 'Switch_Axle_Pre_Reset',
             skinCode: '02',
             trainingName: '道岔计轴预复位({7})',
             trainingRemark: '道岔计轴预复位功能',

src/jmapNew/theme/fuzhou_01/operationConfigGlobal.js

@@ -512,7 +512,7 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: 'Switch_Axis_Pre_Reset',
+            operateType: 'Switch_Axle_Pre_Reset',
             skinCode: '05',
             trainingName: 'Turnout section axile pre reset({7})',
             trainingRemark: 'Turnout section axile pre reset function',

src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue

@@ -388,7 +388,7 @@ export default {
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
-                operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET;
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });

src/jmapNew/theme/nanjing_02/menus/dialog/switchCmdControl.vue

@@ -388,7 +388,7 @@ export default {
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
-                operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET;
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });

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

@@ -1014,7 +1014,7 @@ export default {
                 { name: '挤岔恢复', cmdType: '', operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
                 { name: '单独锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
                 { name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
-                { name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
+                { name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
                 { name: '封锁道岔', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
                 { name: '解封道岔', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
                 { name: '强行消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }

src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue

@@ -390,7 +390,7 @@ export default {
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
-                operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET;
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });

src/jmapNew/theme/xian_01/menus/menuSwitch.vue

@@ -81,7 +81,7 @@ export default {
                     {
                         label: '计轴预复位',
                         handler: this.axlePreReset,
-                        cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
+                        cmdType:CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET
                     },
                     {
                         label: '区段切除',

src/jmapNew/theme/xian_01/operationConfig.js

@@ -545,7 +545,7 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: 'Switch_Axis_Pre_Reset',
+            operateType: 'Switch_Axle_Pre_Reset',
             skinCode: '02',
             trainingName: '道岔区段计轴预复位({7})',
             trainingRemark: '道岔区段计轴预复位功能',

src/scripts/cmdPlugin/CommandEnum.js

@@ -17,7 +17,7 @@ export default {
         /** 取消临时限速 */
         CMD_SWITCH_CANCEL_LIMIT_SPEED: {value:'Switch_Cancel_Limit_Speed', label: '取消临时限速'},
         /** 计轴预复位 */
-        CMD_SWITCH_AXIS_PRE_RESET: {value:'Switch_Axis_Pre_Reset', label: '计轴预复位'},
+        CMD_SWITCH_AXLE_PRE_RESET: {value:' Switch_Axle_Pre_Reset', label: '计轴预复位'},
         /** 故障解锁 */
         CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
         /** 强解道岔*/

src/utils/baseUrl.js

@@ -2,10 +2,10 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://api.joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.8.129:9000'; // 旭强
-        // BASE_API = 'http://192.168.8.119:9000'; // 张赛
+        BASE_API = 'http://192.168.8.119:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康