diff --git a/src/jmapNew/theme/beijing_01/operationConfig.js b/src/jmapNew/theme/beijing_01/operationConfig.js index e5a9aa6db..e537a9d2a 100644 --- a/src/jmapNew/theme/beijing_01/operationConfig.js +++ b/src/jmapNew/theme/beijing_01/operationConfig.js @@ -142,7 +142,6 @@ export default { productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【停站时间控制】' }, - // { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击,选择【自动】', val: '01' }, { deviceType: '06', orderNum: 2, operateCode: '509', tip: '鼠标左键点击【确认】按钮' } ] }, diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue index 681ac7bed..9b2dc3c53 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue @@ -306,7 +306,7 @@ export default { }); } }, - arrangementRouteOperation(deviceList) { + arrangementRouteOperation(deviceList) { // 排列进路 信号重开操作 const operate = { operation: this.$store.state.menuOperation.buttonOperation }; @@ -315,14 +315,20 @@ export default { this.routeListFilter = []; this.routeList.forEach(item => { if (item.startSignalCode === deviceList[0].code) { - if (this.routeData[item.code].setting) { - isArrangementRoute = true; - } this.routeListFilter.push(item); } }); const signal = this.$store.getters['map/getDeviceByCode'](deviceList[0].code); - if (signal.redOpen && !signal.greenOpen && !signal.yellowOpen && isArrangementRoute) { + const sectionModel = this.$store.getters['map/getDeviceByCode'](signal.sectionCode); + if (sectionModel) { + const sectionLeft = this.$store.getters['map/getDeviceByCode'](sectionModel.leftSectionCode); + const sectionRight = this.$store.getters['map/getDeviceByCode'](sectionModel.rightSectionCode); + if (sectionLeft.routeLock || sectionRight.routeLock) { + isArrangementRoute = true; + } + } + if (signal.redOpen && !signal.greenOpen && !signal.yellowOpen && isArrangementRoute) { // 信号重启 + operate.over = true; operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL; operate.code = deviceList[0].code; operate.param = {signalCode: deviceList[0].code}; @@ -643,22 +649,20 @@ export default { } else if (buttonOperation === this.Section.fault.button.operation) { this.handelFaultSection(model); } else { - Handler.clear(); // 清空操作组 - this.$store.dispatch('menuOperation/setButtonOperation', null); + this.clearOperate(); } } else { - Handler.clear(); // 清空操作组 - this.$store.dispatch('menuOperation/setButtonOperation', null); + this.clearOperate(); } } else { - Handler.clear(); // 清空操作组 - this.$store.dispatch('menuOperation/setButtonOperation', null); + this.clearOperate(); } - } else { - Handler.clear(); // 清空操作组 - this.$store.dispatch('menuOperation/setButtonOperation', null); } } + }, + clearOperate() { + Handler.clear(); // 清空操作组 + this.$store.dispatch('menuOperation/setButtonOperation', null); } } }; diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js index a85665eb0..347ee8804 100644 --- a/src/jmapNew/theme/chengdu_03/operationConfig.js +++ b/src/jmapNew/theme/chengdu_03/operationConfig.js @@ -148,7 +148,7 @@ export default { { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' } ] }, - { // 不生成实训 + { maxDuration: 8, minDuration: 5, operateType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value, @@ -159,7 +159,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' }, - { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' } + { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' } ] }, { @@ -177,7 +177,7 @@ export default { { deviceType: '04', orderNum: 3, operateCode: '306', tip: '输入密码123,点击【确定】按钮' } ] }, - { // 不生成实训 + { maxDuration: 15, minDuration: 8, operateType: CMD.Signal.CMD_SIGNAL_BLOCK.value, @@ -206,7 +206,7 @@ export default { { deviceType: '04', orderNum: 3, operateCode: '307', tip: '输入密码123,点击【确认】按钮' } ] }, - { // 不生成实训 + { maxDuration: 15, minDuration: 8, operateType: CMD.Signal.CMD_SIGNAL_UNBLOCK.value, @@ -279,7 +279,7 @@ export default { { deviceType: '04', orderNum: 2, operateCode: '3150', tip: '鼠标左键点击【{3}】', codeType:'SIGNAL' } ] }, - { // 未生成实训 + { maxDuration: 15, minDuration: 8, operateType:CMD.Signal.CMD_SIGNAL_DETAIL.value, @@ -512,7 +512,7 @@ export default { { deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{9}】', codeType:'SECTION' } ] }, - { // 未生成实训 + { maxDuration: 15, minDuration: 8, operateType: CMD.Section.CMD_SECTION_DETAILS.value, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 836771751..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛