From 00dd2689189eb77da0c769923af7cd0b61246ccc Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 19 Feb 2020 11:47:38 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=88=97=E8=BD=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/bejing_01.js | 23 +++++-------- src/jmapNew/config/skinCode/chengdu_01.js | 23 +++++-------- src/jmapNew/config/skinCode/chengdu_03.js | 34 ++++++++----------- src/jmapNew/config/skinCode/fuzhou_01.js | 19 ++++------- src/jmapNew/config/skinCode/haerbin_01.js | 19 ++++------- src/jmapNew/config/skinCode/ningbo_01.js | 23 +++++-------- src/jmapNew/constant/deviceState.js | 6 ++++ src/jmapNew/constant/stateTransition.js | 12 +++++++ src/jmapNew/shape/Train/index.js | 11 +++--- .../beijing_01/menus/dialog/trainAddPlan.vue | 4 ++- .../chengdu_01/menus/dialog/trainInitPlan.vue | 2 ++ .../chengdu_03/menus/dialog/trainInitPlan.vue | 2 ++ .../ningbo_01/menus/dialog/trainAddPlan.vue | 2 ++ src/utils/baseUrl.js | 4 +-- 14 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index 55b8e78e4..fd1f58756 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -550,42 +550,37 @@ class SkinCode extends defaultStyle { { type: '02', lineLShow: false, lineRShow: true }, { type: '03', lineLShow: true, lineRShow: false } ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 - runModeStatus: [ + driveModeStatus: [ { - status: '01', - trainLColor: '#FFFFFF', - trainRColor: '#FFFFFF' - }, - { - status: '02', + status: 'AM', trainLColor: '#00FF00', trainRColor: '#00FF00' }, { - status: '03', + status: 'CM', trainLColor: '#FFFF00', trainRColor: '#FFFF00' }, { - status: '04', + status: 'RM', trainLColor: '#A0522D', trainRColor: '#A0522D' }, { - status: '05', + status: 'NRM', trainLColor: '#A0522D', trainRColor: '#A0522D' } - ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM + ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM runControlStatus: [ { status: '01', hShow: false, sShow: false }, { status: '02', hShow: true, sShow: false }, { status: '03', hShow: false, sShow: true } ], // 设置运行控制状态类型 01正常 02扣车 03停跳 doorStatus: [ - { status: '01', dShow: false }, - { status: '02', dShow: true } - ], // 设置车门状态类型 01关门 02开门 + {status: true, dShow: false}, + {status: false, dShow: true} + ], // 设置车门状态类型 true车门关闭且锁闭 communicationStatus: [ { status: '01', trainColor: '#725A64' }, { status: '02', trainColor: '#C0C0C0' } diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index 94d5ea340..3670f3abf 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -521,33 +521,28 @@ class SkinCode extends defaultStyle { lineRShow: false } ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 - runModeStatus: [ + driveModeStatus: [ { - status: '01', - trainLColor: '#FFFFFF', - trainRColor: '#FFFFFF' - }, - { - status: '02', + status: 'AM', trainLColor: '#00FF00', trainRColor: '#00FF00' }, { - status: '03', + status: 'CM', trainLColor: '#FFFF00', trainRColor: '#FFFF00' }, { - status: '04', + status: 'RM', trainLColor: '#A0522D', trainRColor: '#A0522D' }, { - status: '05', + status: 'NRM', trainLColor: '#A0522D', trainRColor: '#A0522D' } - ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM + ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM runControlStatus: [ { status: '01', @@ -566,9 +561,9 @@ class SkinCode extends defaultStyle { } ], // 设置运行控制状态类型 01正常 02扣车 03停跳 doorStatus: [ - {status: '01', dShow: false}, - {status: '02', dShow: true} - ], // 设置车门状态类型 01关门 02开门 + {status: true, dShow: false}, + {status: false, dShow: true} + ], // 设置车门状态类型 true车门关闭且锁闭 communicationStatus: [ {status: '01', trainColor: '#725A64'}, {status: '02', trainColor: '#C0C0C0'} diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 2314c74f8..212ba9646 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -536,33 +536,28 @@ class SkinCode extends defaultStyle { lineRShow: false } ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 - runModeStatus: [ + driveModeStatus: [ { - status: '01', - trainLColor: '#00FF00', - trainRColor: '#00FF00' - }, - { - status: '02', + status: 'AM', trainLColor: '#FF8000', trainRColor: '#FF8000' }, { - status: '03', + status: 'CM', trainLColor: '#FFFF00', trainRColor: '#FFFF00' }, { - status: '04', + status: 'RM', trainLColor: '#C2C2C2', trainRColor: '#C2C2C2' }, { - status: '05', - trainLColor: '#C2C2C2', - trainRColor: '#C2C2C2' + status: 'NRM', + trainLColor: '#FF0000', + trainRColor: '#FF0000' } - ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM + ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM runControlStatus: [ { status: '01', @@ -581,13 +576,14 @@ class SkinCode extends defaultStyle { } ], // 设置运行控制状态类型 01正常 02扣车 03停跳 doorStatus: [ - {status: '01', dShow: false}, - {status: '02', dShow: true} - ], // 设置车门状态类型 01关门 02开门 + {status: true, dShow: false}, + {status: false, dShow: true} + ], // 设置车门状态类型 true车门关闭且锁闭 communicationStatus: [ - {status: '01', trainColor: '#725A64'}, - {status: '02', trainColor: '#C0C0C0'} - ], // 设置通信状态 01正常 02故障 + {status: 'CBTC', trainColor: '#000099'}, + {status: 'ITC', trainColor: '#747474'}, + {status: 'IL', trainColor: '#747474'} + ], // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL alarmStatus: [ {status: '01', aShow: false}, {status: '02', aShow: true} diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index 813a764f2..1520d55eb 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -527,35 +527,30 @@ class SkinCode extends defaultStyle { {type: '02', lineLShow: false, lineRShow: true}, {type: '03', lineLShow: true, lineRShow: false} ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 - runModeStatus: [ + driveModeStatus: [ { - status: '01', - trainLColor: '#EF0C08', - trainRColor: '#EF0C08' - }, - { - status: '02', + status: 'AM', trainLColor: '#00FF00', trainRColor: '#00FF00' }, { - status: '03', + status: 'CM', trainLColor: '#FFFF00', trainRColor: '#FFFF00' }, { - status: '04', + status: 'RM', trainLColor: '#EA700D', trainRColor: '#EA700D' }, { - status: '05', + status: 'NRM', trainLColor: '#A0522D', trainRColor: '#A0522D' } - ], // 列车运行模式对应车头颜色 01信号中断 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM + ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false} - doorStatus: [], // 设置车门状态类型 eg:{status: '01', dShow: false} + doorStatus: [], // 设置车门状态类型 communicationStatus: [], // 设置通信状态 eg:{status: '01', trainColor:'#725A64'} alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false} serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'} diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 5f2cf2567..567ecf950 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -534,35 +534,30 @@ class SkinCode extends defaultStyle { { type: '02', lineLShow: false, lineRShow: true }, { type: '03', lineLShow: true, lineRShow: false } ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 - runModeStatus: [ + driveModeStatus: [ { - status: '01', - trainLColor: '#EF0C08', - trainRColor: '#EF0C08' - }, - { - status: '02', + status: 'AM', trainLColor: '#00FF00', trainRColor: '#00FF00' }, { - status: '03', + status: 'CM', trainLColor: '#FFFF00', trainRColor: '#FFFF00' }, { - status: '04', + status: 'RM', trainLColor: '#EA700D', trainRColor: '#EA700D' }, { - status: '05', + status: 'NRM', trainLColor: '#A0522D', trainRColor: '#A0522D' } - ], // 列车运行模式对应车头颜色 01信号中断 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM + ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false} - doorStatus: [], // 设置车门状态类型 eg:{status: '01', dShow: false} + doorStatus: [], // 设置车门状态类型 communicationStatus: [], // 设置通信状态 eg:{status: '01', trainColor:'#725A64'} alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false} serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'} diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index bb83c7fc1..3f7c94c26 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -522,33 +522,28 @@ class SkinCode extends defaultStyle { lineRShow: false } ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 - runModeStatus: [ + driveModeStatus: [ { - status: '01', - trainLColor: '#FFFFFF', - trainRColor: '#FFFFFF' - }, - { - status: '02', + status: 'AM', trainLColor: '#00FF00', trainRColor: '#00FF00' }, { - status: '03', + status: 'CM', trainLColor: '#FFFF00', trainRColor: '#FFFF00' }, { - status: '04', + status: 'RM', trainLColor: '#A0522D', trainRColor: '#A0522D' }, { - status: '05', + status: 'NRM', trainLColor: '#A0522D', trainRColor: '#A0522D' } - ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM + ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM runControlStatus: [ { status: '01', @@ -567,9 +562,9 @@ class SkinCode extends defaultStyle { } ], // 设置运行控制状态类型 01正常 02扣车 03停跳 doorStatus: [ - {status: '01', dShow: false}, - {status: '02', dShow: true} - ], // 设置车门状态类型 01关门 02开门 + {status: true, dShow: false}, + {status: false, dShow: true} + ], // 设置车门状态类型 true车门关闭且锁闭 communicationStatus: [ {status: '01', trainColor: '#725A64'}, {status: '02', trainColor: '#C0C0C0'} diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js index a2bb557a1..48eb2f031 100644 --- a/src/jmapNew/constant/deviceState.js +++ b/src/jmapNew/constant/deviceState.js @@ -210,6 +210,12 @@ deviceState[deviceType.Train] = { // State01: '01', /** 无报警 */ // State02: '02' /** 有报警 */ // }, + /** 车门是否关闭且锁闭 */ + doorCloseLock: true, + /** 列车运行级别 */ + runLevel: 'CBTC', + /** 驾驶模式 */ + driveMode: 'AM', /** 是否停车 */ stop: 1, /** 所在区段code */ diff --git a/src/jmapNew/constant/stateTransition.js b/src/jmapNew/constant/stateTransition.js index 9224bb899..df8a17567 100644 --- a/src/jmapNew/constant/stateTransition.js +++ b/src/jmapNew/constant/stateTransition.js @@ -72,6 +72,18 @@ class Status { } handleTrain(device) { this.statusObj = { + groupNumber: device.groupNumber, /** 车组号 */ + serviceNumber: device.serviceNumber, /** 服务号 */ + tripNumber: device.tripNumber, /** 车次号 */ + destinationCode: device.destinationCode, /** 目的地码 */ + sectionCode: device.sectionCode, /** 列车所在区段 */ + speed: device.speed, /** 列车速度 */ + right: device.right, /** 列车方向 */ + doorCloseLock: device.doorCloseLock, /** 车门是否关闭且锁闭 */ + stop: device.stop, /** 列车是否停稳 */ + type: device.type, /** 列车类型 */ + runLevel: device.runLevel, /** 列车运行级别 */ + driveMode: device.driveMode, /** 驾驶模式 */ fault: device.fault /** 非故障*/ }; } diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index 3cb898fde..e57e64165 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -227,9 +227,9 @@ export default class Train extends Group { } } // 设置运行模式 - setRunMode(status) { - if (this.style.Train.trainStatusStyle.runModeStatus.length > 0) { - this.style.Train.trainStatusStyle.runModeStatus.some((item) => { + setDriveMode(status) { + if (this.style.Train.trainStatusStyle.driveModeStatus.length > 0) { + this.style.Train.trainStatusStyle.driveModeStatus.some((item) => { if (status === item.status) { this.trainL && this.trainL.setColor(item.trainLColor); this.trainR && this.trainR.setColor(item.trainRColor); @@ -300,8 +300,11 @@ export default class Train extends Group { const flag = model.trainWindowModel ? model.trainWindowModel.reversal : false; if (model) { this.recover(); - this.setRunMode('01'); + this.setDriveMode(model.driveMode); this.setRunStatus(model.stop, flag); + this.setCommunicationStatus(model.runLevel); + // this.setTrainTypeStatus(model.type); 配合早晚点设置 + this.setDoorStatus(model.doorCloseLock); } // let points = []; // if (model) { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue index fbaf340b7..5c354ee6b 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue @@ -125,6 +125,8 @@ export default { this.tripNumberList.push(item); } }); + }).catch(error => { + this.$messageBox(error.message); }); this.dialogShow = true; this.$nextTick(function () { @@ -204,4 +206,4 @@ export default { padding: 0 5px; background-color: #F0F0F0; } - \ No newline at end of file + diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainInitPlan.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainInitPlan.vue index 59493ae3d..77ee79df7 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainInitPlan.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/trainInitPlan.vue @@ -135,6 +135,8 @@ export default { this.tripNumberList.push(item); } }); + }).catch(error => { + this.$messageBox(error.message); }); this.dialogShow = true; this.$nextTick(function () { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue index 256e499f7..26704ee1a 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue @@ -135,6 +135,8 @@ export default { this.tripNumberList.push(item); } }); + }).catch(error => { + this.$messageBox(error.message); }); this.dialogShow = true; this.$nextTick(function () { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue index 18d085d53..7e9323109 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue @@ -136,6 +136,8 @@ export default { this.tripNumberList.push(item); } }); + }).catch(error => { + this.$messageBox(error.message); }); this.dialogShow = true; this.$nextTick(function () { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index f639d80e8..9946eeea7 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,12 +3,12 @@ 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://b29z135112.zicp.vip'; + // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; From 847aa2d794c1d3ac5e52c1243f27af550179d462 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 19 Feb 2020 14:06:43 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E9=97=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/constant/deviceState.js | 10 +++------- src/jmapNew/constant/stateTransition.js | 5 +++-- src/jmapNew/shape/Psd/index.js | 2 +- src/utils/baseUrl.js | 4 ++-- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js index a2bb557a1..55a2a178c 100644 --- a/src/jmapNew/constant/deviceState.js +++ b/src/jmapNew/constant/deviceState.js @@ -76,6 +76,9 @@ deviceState[deviceType.Station] = { }; deviceState[deviceType.Psd] = { + close: 0, // 屏蔽门是否关闭 + lock: 0, // 屏蔽门是否锁闭 + interlockRelease: 0, // 是否互锁解除 /** 屏蔽门状态*/ // screenDoorStatus: { // Default: '01', /** 关门（缺省值）*/ @@ -83,13 +86,6 @@ deviceState[deviceType.Psd] = { // State02: '02', /** 故障 */ // State03: '03' /** 切除 */ // }, - // /** 屏蔽门开门状态*/ - screenDoorOpenStatus: 0, - // screenDoorOpenStatus: { - // Default: '01', /** 关门（缺省值）*/ - // State01: '01', /** 关门 */ - // State02: '02' /** 开门 */ - // }, /** 是否故障*/ fault: false /** 非故障*/ }; diff --git a/src/jmapNew/constant/stateTransition.js b/src/jmapNew/constant/stateTransition.js index 9224bb899..dfb565caf 100644 --- a/src/jmapNew/constant/stateTransition.js +++ b/src/jmapNew/constant/stateTransition.js @@ -1,5 +1,4 @@ import { deepAssign } from '@/utils/index'; -import deviceType from './deviceType'; // 所有默认状态在这里都要有 用来转换后台发送的数据状态 class Status { @@ -61,7 +60,9 @@ class Status { } handlePsd(device) { this.statusObj = { - screenDoorOpenStatus: device.screenDoorOpenStatus, // 屏蔽门是否开门 + screenDoorOpenStatus: device.close, // 屏蔽门是否开门 + lock: device.lock, // 屏蔽门是否锁闭 + interlockRelease: device.interlockRelease, // 是否互锁解除 fault: device.fault /** 非故障*/ }; } diff --git a/src/jmapNew/shape/Psd/index.js b/src/jmapNew/shape/Psd/index.js index 0229977ca..e4868d912 100644 --- a/src/jmapNew/shape/Psd/index.js +++ b/src/jmapNew/shape/Psd/index.js @@ -65,7 +65,7 @@ export default class Line2 extends Group { setState(model) { /** 设置屏蔽门开关*/ - model.screenDoorOpenStatus != 0 && this.openDoor(); /** 开门*/ + model.screenDoorOpenStatus != 0 && this.openDoor(); /** 开门*/ model.screenDoorOpenStatus == 0 && this.closeDoor(); /** 关门*/ // /** 设置屏蔽门状态*/ diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index f639d80e8..9946eeea7 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,12 +3,12 @@ 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://b29z135112.zicp.vip'; + // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; From 4efea9cfc20e5ccacdeda21951d3de91c9340961 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 19 Feb 2020 16:01:18 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/bejing_01.js | 7 ++++--- src/jmapNew/config/skinCode/chengdu_01.js | 7 ++++--- src/jmapNew/config/skinCode/haerbin_01.js | 6 +++++- src/jmapNew/config/skinCode/ningbo_01.js | 7 ++++--- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index fd1f58756..28e2cd92c 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -582,9 +582,10 @@ class SkinCode extends defaultStyle { {status: false, dShow: true} ], // 设置车门状态类型 true车门关闭且锁闭 communicationStatus: [ - { status: '01', trainColor: '#725A64' }, - { status: '02', trainColor: '#C0C0C0' } - ], // 设置通信状态 01正常 02故障 + {status: 'CBTC', trainColor: '#725A64'}, + {status: 'ITC', trainColor: '#C0C0C0'}, + {status: 'IL', trainColor: '#C0C0C0'} + ], // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL alarmStatus: [ { status: '01', aShow: false }, { status: '02', aShow: true } diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index 3670f3abf..508700e16 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -565,9 +565,10 @@ class SkinCode extends defaultStyle { {status: false, dShow: true} ], // 设置车门状态类型 true车门关闭且锁闭 communicationStatus: [ - {status: '01', trainColor: '#725A64'}, - {status: '02', trainColor: '#C0C0C0'} - ], // 设置通信状态 01正常 02故障 + {status: 'CBTC', trainColor: '#000099'}, + {status: 'ITC', trainColor: '#747474'}, + {status: 'IL', trainColor: '#747474'} + ], // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL alarmStatus: [ {status: '01', aShow: false}, {status: '02', aShow: true} diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 567ecf950..946de8c4e 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -558,7 +558,11 @@ class SkinCode extends defaultStyle { ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false} doorStatus: [], // 设置车门状态类型 - communicationStatus: [], // 设置通信状态 eg:{status: '01', trainColor:'#725A64'} + communicationStatus: [ + {status: 'CBTC', trainColor: '#000000'}, + {status: 'ITC', trainColor: '#C0C0C0'}, + {status: 'IL', trainColor: '#C0C0C0'} + ], // 设置通信状态 alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false} serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'} } diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index 3f7c94c26..37c2c7d15 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -566,9 +566,10 @@ class SkinCode extends defaultStyle { {status: false, dShow: true} ], // 设置车门状态类型 true车门关闭且锁闭 communicationStatus: [ - {status: '01', trainColor: '#725A64'}, - {status: '02', trainColor: '#C0C0C0'} - ], // 设置通信状态 01正常 02故障 + {status: 'CBTC', trainColor: '#000099'}, + {status: 'ITC', trainColor: '#C0C0C0'}, + {status: 'IL', trainColor: '#C0C0C0'} + ], // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL alarmStatus: [ {status: '01', aShow: false}, {status: '02', aShow: true} From cc717f86e69818d4df09ecb9c3c17a67103ae0c5 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 19 Feb 2020 16:19:37 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=80=E9=97=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Psd/ESafeDoor.js | 12 +++++++++++- src/jmapNew/shape/Psd/index.js | 4 ++-- src/jmapNew/shape/StationStand/ESafeEmergent.js | 2 +- src/jmapNew/shape/StationStand/index.js | 6 +++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/shape/Psd/ESafeDoor.js b/src/jmapNew/shape/Psd/ESafeDoor.js index 2a30ebadf..76869d33f 100644 --- a/src/jmapNew/shape/Psd/ESafeDoor.js +++ b/src/jmapNew/shape/Psd/ESafeDoor.js @@ -101,7 +101,17 @@ class ESafeDoor extends Group { } hasDoor(show) { - show ? this.safeC.hide() : this.safeC.show(); + if (this.model.style.StationStand.common.special) { + if (show) { + this.stand1.hide(); + this.stand2.hide(); + } else { + this.stand1.show(); + this.stand2.show(); + } + } else { + show ? this.safeC.hide() : this.safeC.show(); + } } setColor(color) { diff --git a/src/jmapNew/shape/Psd/index.js b/src/jmapNew/shape/Psd/index.js index e4868d912..7ac086053 100644 --- a/src/jmapNew/shape/Psd/index.js +++ b/src/jmapNew/shape/Psd/index.js @@ -27,8 +27,8 @@ export default class Line2 extends Group { x: model.position.x, y: model.position.y - (model.height / 2), width: model.width || style.StationStand.safetyDoor.width, - height: model.height || style.StationStand.safetyDoor.height, - show: model.hasDoor + height: model.height || style.StationStand.safetyDoor.height + // show: model.hasDoor }); this.add(this.safeDoor); } diff --git a/src/jmapNew/shape/StationStand/ESafeEmergent.js b/src/jmapNew/shape/StationStand/ESafeEmergent.js index d708506ed..fd2db533f 100644 --- a/src/jmapNew/shape/StationStand/ESafeEmergent.js +++ b/src/jmapNew/shape/StationStand/ESafeEmergent.js @@ -35,7 +35,7 @@ class ESafeEmergent extends Group { [width - 3, height + 3], [width - 7, height + 3], [width - 7, height], - [width, height - 3], + [width, height - 3] ] }, style: { diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js index 238147e75..66d880da6 100644 --- a/src/jmapNew/shape/StationStand/index.js +++ b/src/jmapNew/shape/StationStand/index.js @@ -241,9 +241,9 @@ class StationStand extends Group { if (!this.style.StationStand.common.special) { this.safeStand && this.safeStand.setColor(this.style.StationStand.stand.stopColor); } else { - this.trainStop && this.trainStop.show(); - this.trainDepart && this.trainDepart.show(); - } + this.trainStop && this.trainStop.show(); + this.trainDepart && this.trainDepart.show(); + } } /** 站台紧急关闭*/ From 680d87e623b40b0358aae073a895f1f5b26c24df Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 19 Feb 2020 16:33:59 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/bejing_01.js | 7 +++---- src/jmapNew/config/skinCode/chengdu_01.js | 11 +++-------- src/jmapNew/config/skinCode/chengdu_03.js | 11 +++-------- src/jmapNew/config/skinCode/haerbin_01.js | 7 +++---- src/jmapNew/config/skinCode/ningbo_01.js | 11 +++-------- src/utils/baseUrl.js | 4 ++-- 6 files changed, 17 insertions(+), 34 deletions(-) diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index 28e2cd92c..a6c7376a0 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -546,10 +546,9 @@ class SkinCode extends defaultStyle { } ], // 列车运行方向状态类型对应车头显示状态 1从左往右 0从右往左 directionStopType: [ - { type: '01', lineLShow: false, lineRShow: false }, - { type: '02', lineLShow: false, lineRShow: true }, - { type: '03', lineLShow: true, lineRShow: false } - ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 + { type: 1, lineLShow: false, lineRShow: true }, + { type: 0, lineLShow: true, lineRShow: false } + ], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左 driveModeStatus: [ { status: 'AM', diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index 508700e16..3fd313e9a 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -506,21 +506,16 @@ class SkinCode extends defaultStyle { ], // 列车运行方向状态类型对应车头显示状态 1从左往右 0从右往左 directionStopType: [ { - type: '01', - lineLShow: false, - lineRShow: false - }, - { - type: '02', + type: 1, lineLShow: false, lineRShow: true }, { - type: '03', + type: 0, lineLShow: true, lineRShow: false } - ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 + ], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左 driveModeStatus: [ { status: 'AM', diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 212ba9646..701d25f8b 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -521,21 +521,16 @@ class SkinCode extends defaultStyle { ], // 列车运行方向状态类型对应车头显示状态 1从左往右 0从右往左 directionStopType: [ { - type: '01', - lineLShow: false, - lineRShow: false - }, - { - type: '02', + type: 1, lineLShow: false, lineRShow: true }, { - type: '03', + type: 0, lineLShow: true, lineRShow: false } - ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 + ], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左 driveModeStatus: [ { status: 'AM', diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 946de8c4e..8f8191ccc 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -530,10 +530,9 @@ class SkinCode extends defaultStyle { } ], // 运行方向状态类型对应车头显示状态 1从左往右 0从右往左 directionStopType: [ - { type: '01', lineLShow: false, lineRShow: false }, - { type: '02', lineLShow: false, lineRShow: true }, - { type: '03', lineLShow: true, lineRShow: false } - ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 + { type: 1, lineLShow: false, lineRShow: true }, + { type: 0, lineLShow: true, lineRShow: false } + ], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左 driveModeStatus: [ { status: 'AM', diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index 37c2c7d15..8be0fa609 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -507,21 +507,16 @@ class SkinCode extends defaultStyle { ], // 列车运行方向状态类型对应车头显示状态 1从左往右 0从右往左 directionStopType: [ { - type: '01', - lineLShow: false, - lineRShow: false - }, - { - type: '02', + type: 1, lineLShow: false, lineRShow: true }, { - type: '03', + type: 0, lineLShow: true, lineRShow: false } - ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行 + ], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左 driveModeStatus: [ { status: 'AM', diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 9946eeea7..64c218788 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,13 +3,13 @@ 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://b29z135112.zicp.vip'; - // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 + BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; } From 8118e151ba5c18f8afa4d84849c10c156f6b3be8 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 19 Feb 2020 16:46:34 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/constant/deviceState.js | 2 +- src/jmapNew/shape/Psd/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js index 85cc672a0..fd5406736 100644 --- a/src/jmapNew/constant/deviceState.js +++ b/src/jmapNew/constant/deviceState.js @@ -76,7 +76,7 @@ deviceState[deviceType.Station] = { }; deviceState[deviceType.Psd] = { - close: 0, // 屏蔽门是否关闭 + close: 1, // 屏蔽门是否关闭 lock: 0, // 屏蔽门是否锁闭 interlockRelease: 0, // 是否互锁解除 /** 屏蔽门状态*/ diff --git a/src/jmapNew/shape/Psd/index.js b/src/jmapNew/shape/Psd/index.js index 7ac086053..310f9a0b8 100644 --- a/src/jmapNew/shape/Psd/index.js +++ b/src/jmapNew/shape/Psd/index.js @@ -65,8 +65,8 @@ export default class Line2 extends Group { setState(model) { /** 设置屏蔽门开关*/ - model.screenDoorOpenStatus != 0 && this.openDoor(); /** 开门*/ - model.screenDoorOpenStatus == 0 && this.closeDoor(); /** 关门*/ + model.screenDoorOpenStatus == 0 && this.openDoor(); /** 开门*/ + model.screenDoorOpenStatus != 0 && this.closeDoor(); /** 关门*/ // /** 设置屏蔽门状态*/ // switch (model.screenDoorStatus) { From dbb24a1793895b06bd183430fa19a0a88ac0443d Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 19 Feb 2020 17:26:15 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E9=81=93=E5=B2=94=20=E5=B0=81=E9=94=81=20=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=8A=B6=E6=80=81=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/bejing_01.js | 1 + src/jmapNew/config/skinCode/chengdu_01.js | 1 + src/jmapNew/config/skinCode/chengdu_03.js | 1 + src/jmapNew/config/skinCode/fuzhou_01.js | 1 + src/jmapNew/config/skinCode/haerbin_01.js | 1 + src/jmapNew/config/skinCode/ningbo_01.js | 7 ++++--- src/jmapNew/shape/Switch/index.js | 4 +++- 7 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index a6c7376a0..d6ccced13 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -361,6 +361,7 @@ class SkinCode extends defaultStyle { rectShow: false // 道岔单锁 矩形框是否显示 }, block: { // 道岔封锁配置 + blockName: 'default', // 默认道岔封锁类型 nameBorderShow: true, // 道岔名称是否有包围框 显示 contentRectShow: false // 道岔封锁显示 }, diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index 3fd313e9a..3b2b5034e 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -355,6 +355,7 @@ class SkinCode extends defaultStyle { rectBorderColor: '#fff' // 矩形边框颜色 }, block: { // 道岔封锁配置 + blockName: 'default', // 默认道岔封锁类型 nameBorderShow: false, // 道岔名称是否有包围框 显示 contentRectShow: true, // 道岔封锁显示 contentRectColor: 'red' // 道岔封锁边框颜色 diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 701d25f8b..76c3b293f 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -360,6 +360,7 @@ class SkinCode extends defaultStyle { rectBorderColor: '#fff' // 矩形边框颜色 }, block: { // 道岔封锁配置 + blockName: 'default', // 默认道岔封锁类型 nameBorderShow: false, // 道岔名称是否有包围框 显示 contentRectShow: true, // 道岔封锁显示 contentRectColor: 'red' // 道岔封锁边框颜色 diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index 1520d55eb..849678f0e 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -339,6 +339,7 @@ class SkinCode extends defaultStyle { length: 6 // 道岔单边长度 }, block: { // 道岔封锁配置 + blockName: 'default', // 默认道岔封锁类型 nameBorderShow: true, // 道岔名称是否有包围框 显示 contentRectShow: false // 道岔封锁显示 }, diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 8f8191ccc..1a4dad1d0 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -346,6 +346,7 @@ class SkinCode extends defaultStyle { length: 6 // 道岔单边长度 }, block: { // 道岔封锁配置 + blockName: 'default', // 默认道岔封锁类型 nameBorderShow: true, // 道岔名称是否有包围框 显示 contentRectShow: false // 道岔封锁显示 }, diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index 8be0fa609..9fe945a58 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -349,13 +349,14 @@ class SkinCode extends defaultStyle { length: 10 // 道岔单边长度 }, monolock: { // 道岔单锁配置 - locationColor: '#FF0000', // 道岔单锁'定位'颜色 (绿色) - inversionColor: '#FF0000', // 道岔单锁'反位'颜色 (黄色) + locationColor: '#FF0000', // 道岔单锁'定位'颜色 (红色) + inversionColor: '#FF0000', // 道岔单锁'反位'颜色 (红色) rectShow: false, // 道岔单锁 矩形框是否显示 rectWidth: 18, // 矩形框 宽高 rectBorderColor: '#fff' // 矩形边框颜色 }, block: { // 道岔封锁配置 + blockName: 'ningbo_01', // 默认道岔封锁类型 nameBorderShow: true, // 道岔名称是否有包围框 显示 contentRectShow: false, // 道岔封锁显示 contentRectColor: 'red' // 道岔封锁边框颜色 @@ -365,7 +366,7 @@ class SkinCode extends defaultStyle { this[deviceType.LcControl] = { text: { fontSize: 11, // 字体大小 - fontWeight: 'normal', // 字体粗细 + fontWeight: 'normal', // 字体粗细 distance: 5 // 灯跟文字距离 }, lamp: { diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index 9e6a8afb1..68a4ee87d 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -302,7 +302,9 @@ export default class Switch extends Group { /** 挤叉*/ setForkAction() { this.setLossAction(true); - // this.sheltertriangle.show(); // 宁波线路挤叉特殊显示 + if (this.style.Switch.block.blockName == 'ningbo_01') { + this.sheltertriangle.show(); // 宁波线路挤叉特殊显示 + } this.swCore.animateStyle(item => { item.animateStyle(true) .when(0, { stroke: this.style.backgroundColor }) From 10d3bb3e490951682d4a605f9f40e4131eb4fb97 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Thu, 20 Feb 2020 10:19:49 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chengdu_03/menus/dialog/trainInitPlan.vue | 41 +++++++++++++------ src/utils/baseUrl.js | 4 +- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue index 26704ee1a..0cb0b22ab 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue @@ -34,9 +34,16 @@ /> - - - + + + + + @@ -68,17 +75,18 @@ export default { selected: null, sectionName: '', tripNumberList: [], - serviceNumber: '', + serviceNumberList: [], addModel: { trainCode:'', - tripNumber:'' + tripNumber:'', + serviceNumber: '' }, rules: { trainCode: [ { required: true, message: '请输入列车编码', trigger: 'blur'} ], - serverNumber: [ - { required: true, message: '请输入服务号', trigger: 'blur'} + serviceNumber: [ + { required: true, message: '请输入服务号', trigger: 'change'} ], tripNumber: [ { required: true, message: '请输入车次号', trigger: 'blur'} @@ -113,20 +121,26 @@ export default { }); }, methods: { - loadInitData(map) { - }, tripNumberChange(tripNumber) { getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => { - this.serviceNumber = resp.data; + this.serviceNumberList = []; + resp.data.forEach(item => { + if (!this.serviceNumberList.includes(item)) { + this.serviceNumberList.push(item); + } + }); }); + if (this.serviceNumberList.length === 1) { + this.addModel.serviceNumber = this.serviceNumberList[0]; + } }, doShow(operate, selected) { this.selected = selected; // 如果不是断点激活，则需要对初始值进行初始化 - this.serviceNumber = ''; this.addModel = { trainCode:'', - tripNumber:'' + tripNumber:'', + serviceNumber: '' }; getTripNumberList(this.$route.query.group).then(resp => { this.tripNumberList = []; @@ -160,7 +174,7 @@ export default { param: { sectionCode: this.trainWindowSectionCode, trainCode: this.addModel.trainCode, // 车组号 - serviceNumber: this.serviceNumber, // 服务号 + serviceNumber: this.addModel.serviceNumber, // 服务号 tripNumber: this.addModel.tripNumber // 车次号 } }; @@ -174,6 +188,7 @@ export default { this.loading = false; this.doClose(); // this.$refs.noticeInfo.doShow(operate); + this.$messageBox(error.message); }); } else { return false; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 64c218788..f639d80e8 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -8,8 +8,8 @@ export function getBaseUrl() { // 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://b29z135112.zicp.vip'; - BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 + BASE_API = 'http://b29z135112.zicp.vip'; + // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; } From a225253d253f24cfe739cf6022606526a65d6e42 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 20 Feb 2020 12:24:37 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningbo_01/menus/dialog/trainAddPlan.vue | 41 ++++++++++++++----- src/scripts/cmdPlugin/Handler.js | 4 +- src/utils/baseUrl.js | 4 +- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue index 7e9323109..a7d2377ec 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue @@ -26,16 +26,24 @@ - + - - + + + + + @@ -67,6 +75,7 @@ export default { trainNoList: [], selected: null, tripNumberList: [], + serviceNumberList: [], addModel: { trainCode: '', // 车组号 serviceNumber: '', // 服务号 @@ -115,7 +124,19 @@ export default { methods: { tripNumberChange(tripNumber) { getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => { - this.serviceNumber = resp.data; + this.serviceNumberList = []; + if (typeof resp.data == 'string') { + this.serviceNumberList.push(resp.data); + } else { + resp.data.forEach(item => { + if (!this.serviceNumberList.includes(item)) { + this.serviceNumberList.push(item); + } + }); + } + if (this.serviceNumberList.length === 1) { + this.addModel.serviceNumber = this.serviceNumberList[0]; + } }); }, doShow(operate, selected) { @@ -160,7 +181,7 @@ export default { cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, param: { trainCode: this.addModel.trainCode, // 车组号 - serverNumber: this.addModel.serverNumber, // 服务号 + serviceNumber: this.addModel.serviceNumber, // 服务号 tripNumber: this.addModel.tripNumber // 车次号 } }; diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js index c8b463cf2..3cc5fc08d 100644 --- a/src/scripts/cmdPlugin/Handler.js +++ b/src/scripts/cmdPlugin/Handler.js @@ -98,7 +98,7 @@ class Handler { const valid = ValidateHandler.vaildate(this.getTrainingMode(), operation); this.afterValid(operation, valid); rtn.valid = valid; - + if (operation.cmdType) { const command = this.getCommand(operation); if (command) { @@ -109,7 +109,7 @@ class Handler { reject(error); }); } else { - rtn.response = '获取指令失败，暂无指令，请检查指令字典'; + rtn.response = '获取指令失败，暂无指令或参数传值不正确，请检查指令字典'; reject(rtn); } } else { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index f639d80e8..9946eeea7 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,12 +3,12 @@ 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://b29z135112.zicp.vip'; + // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; From 70f95654b9d6e6076b241fc0292f438c6e5be152 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 20 Feb 2020 14:01:12 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E6=96=B0=E5=BB=BA=E5=88=97=E8=BD=A6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beijing_01/menus/dialog/trainAddPlan.vue | 85 +++++++++++-------- 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue index 5c354ee6b..3f0b46ab5 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue @@ -6,39 +6,39 @@ - - + + - - - + + + - - - 确定 - - - 取 消 - - - + + + 确定 + + + 取 消 + + +