From c09021067a799d06a2461d37448237db9d8dcd0b Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 7 Jan 2020 09:36:19 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BC=96=E8=BE=91=20=20=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=9C=B0=E5=9D=80=E3=80=81=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=A4=96=EF=BC=8C=E5=85=B6=E4=BB=96=E7=9A=84?= =?UTF-8?q?=E5=8F=98=E4=B8=BA=E8=BE=93=E5=85=A5=E6=A1=86=EF=BC=8C=E9=99=90?= =?UTF-8?q?=E5=88=B6=E8=BE=93=E5=85=A5=E6=9C=80=E5=A4=A7=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=95=B0=E4=B8=BA4=EF=BC=8C=E4=B8=94=E6=AF=8F=E4=BD=8D?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E6=98=AF16=E8=BF=9B=E5=88=B6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/deviceManage/editConfig.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue index bd2909cc2..f3c7eced5 100644 --- a/src/views/system/deviceManage/editConfig.vue +++ b/src/views/system/deviceManage/editConfig.vue @@ -127,10 +127,12 @@ export default { } }); let flag = false; - for (var i = 0; i < value.length; i++) { - const ascallCode = value.charCodeAt(i); - if (ascallCode > 70 || ascallCode < 48 || (ascallCode > 57 && ascallCode < 65)) { - flag = true; + if (value && value.length) { + for (var i = 0; i < value.length; i++) { + const ascallCode = value.charCodeAt(i); + if (ascallCode > 70 || ascallCode < 48 || (ascallCode > 57 && ascallCode < 65)) { + flag = true; + } } } if (!value) { From 5eb56d0a9639c4744110b19d8c9c2ae59ad59907 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 7 Jan 2020 10:52:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A7=E7=89=88?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuzhou_01/menus/utils/menuItemStatus.js | 3 +-- src/jmapNew/constant/deviceState.js | 23 ++++++++++++++++++- src/jmapNew/utils/parser.js | 6 ++--- src/utils/baseUrl.js | 4 ++-- src/views/jlmap/index.vue | 14 +++++++++++ src/views/newMap/jlmapNew/index.vue | 14 +++++++++++ 6 files changed, 56 insertions(+), 8 deletions(-) diff --git a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js index ea24c33c9..966e20ea1 100644 --- a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js @@ -518,7 +518,7 @@ export function menuFiltration(menuObj) { } else { control = store.getters['map/getStationControlByStationCode'](selected.stationCode); } - console.log('============', control); + if (control) { if (store.state.training.prdType != '') { const type = SystemType[store.state.training.prdType]; @@ -537,7 +537,6 @@ export function menuFiltration(menuObj) { if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 elem.show = false; } - console.log('222222222', elem); elem.defaultDisabled = !elem.auth[status]; } }); diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js index aac33d0bf..e56250a49 100644 --- a/src/jmapNew/constant/deviceState.js +++ b/src/jmapNew/constant/deviceState.js @@ -159,8 +159,14 @@ deviceState[deviceType.Station] = { fault: { Default: false /** 非故障*/ }, + status: { + Default: '01', /** 中控（缺省值）*/ + State01: '01', /** 中控 */ + State02: '02', /** 站控 */ + State03: '03' /** 紧急站控 */ + }, controlMode: { - Default: 'Center' /** 中控（默认值）*/ + Default: 'Center' // Center 中控 // Local 站控 // Emergency 紧急站控 @@ -210,6 +216,21 @@ deviceState[deviceType.StationStand] = { State01: '01', /** 关门 */ State02: '02' /** 开门 */ }, + /** 扣车状态*/ + holdStatus: { + Default: '01', /** 未设置扣车（缺省值）*/ + State01: '01', /** 未设置扣车*/ + State02: '02', /** 车站扣车*/ + State03: '03', /** 中心扣车*/ + State04: '04' /** 中心+车站扣车*/ + }, + /** 跳停*/ + jumpStopStatus: { + Default: '01', /** 未设置跳停（缺省值）*/ + State01: '01', /** 未设置跳停 */ + State02: '02', /** 指定列车跳停 */ + State03: '03' /** 全部跳停 */ + }, stationHoldTrain: false, // 车站是否扣车 centerHoldTrain: false, // 中心是否扣车 allSkip: false, // 是否全部跳停 diff --git a/src/jmapNew/utils/parser.js b/src/jmapNew/utils/parser.js index 66c0a4c5e..b3be0c230 100644 --- a/src/jmapNew/utils/parser.js +++ b/src/jmapNew/utils/parser.js @@ -59,9 +59,9 @@ export function parser(data, skinCode) { mapDevice[elem.code] = createDevice(deviceType.StationStand, elem, propConvert); }, this); - // zrUtil.each(data.stationControlList || [], elem => { - // mapDevice[elem.code] = createDevice(deviceType.StationControl, elem, propConvert); - // }, this); + zrUtil.each(data.stationControlList || [], elem => { + mapDevice[elem.code] = createDevice(deviceType.StationControl, elem, propConvert); + }, this); zrUtil.each(data.counterList || [], elem => { mapDevice[elem.code] = createDevice(deviceType.StationCounter, elem, propConvert); diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 79d1c6346..1e9afea51 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,11 +3,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'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; } diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue index 14d11f9fb..1742eb91f 100644 --- a/src/views/jlmap/index.vue +++ b/src/views/jlmap/index.vue @@ -1,5 +1,6 @@