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/2] =?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 5dc3eb83f89292bf05c4251c02424d11b4b75883 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 7 Jan 2020 13:05:06 +0800 Subject: [PATCH 2/2] =?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=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E6=9C=BA=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuzhou_01/menus/utils/menuItemStatus.js | 1 - .../theme/chengdu_01/menus/menuTrain.vue | 48 ++++++++++++++++++- .../chengdu_03/menus/dialog/standControl.vue | 1 - .../newMapdraft/mapoperate/section/index.vue | 1 - src/views/system/deviceManage/editConfig.vue | 26 ++++++---- 5 files changed, 65 insertions(+), 12 deletions(-) diff --git a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js index 966e20ea1..230fc7be0 100644 --- a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js @@ -525,7 +525,6 @@ export function menuFiltration(menuObj) { const status = StationControlType[control.status]; menu = [...menuObj[type]]; if (menu.constructor === Array) { - console.log('============1', menu); menu.forEach(elem => { if (elem.type === 'separator') { elem.show = true; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index 44ca2040c..8c463d32f 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -58,7 +58,53 @@ export default { { label: '追踪号', handler: '', - cmdType: '' + children: [ + { + label: '目的地ID', + handler: '', + cmdType: '' + }, + { + label: '删除ID', + handler: '', + cmdType: '' + }, + { + label: '更改追踪号', + handler: '', + cmdType: '' + }, + { + label: '交换追踪号', + handler: '', + cmdType: '' + }, + { + label: '运行等级', + handler: '', + cmdType: '' + }, + { + label: '列车模式', + handler: '', + cmdType: '' + }, + { + label: '惰性模式', + handler: '', + cmdType: '' + }, + { + label: '旁路模式', + handler: '', + cmdType: '' + }, + { + label: '开门禁止', + handler: '', + cmdType: '' + } + ] }, { label: '列车明细', diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue index 456b76358..50f94e430 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue @@ -421,7 +421,6 @@ export default { }, choose(upDown) { // 取消扣车 请求code码 - console.log(upDown, this.radio); const operate = { operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation }; diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue index e5f9f2c58..acafff24e 100644 --- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue @@ -525,7 +525,6 @@ export default { }); pointModel.forEach(item => { const slope2 = (item.points[item.points.length - 1].y - item.points[0].y) / (item.points[item.points.length - 1].x - item.points[0].x); - // console.log(slope1, slope2, pointModel, '-----斜率----'); if (this.checkPointsCoincide(this.oldPoint[0], item.points[item.points.length - 1])) { if ((slope1 >= 0 && slope2 >= 0) || (slope1 <= 0 && slope2 <= 0)) { item.points[item.points.length - 1].x = model.points[0].x; diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue index f3c7eced5..617af07ec 100644 --- a/src/views/system/deviceManage/editConfig.vue +++ b/src/views/system/deviceManage/editConfig.vue @@ -85,13 +85,15 @@ export default { {label: '输入-故障表示位', value: 'i_f'}, {label: '输入-绿灯表示位', value: 'i_g'}, {label: '输入-红灯表示位', value: 'i_r'}, - {label: '输入-黄灯表示位', value: 'i_y'} + {label: '输入-黄灯表示位', value: 'i_y'}, + {label: '输入-黄红灯表示位', value: 'i_yr'} ], signalRightValue: [ {label: '输出-故障控制位', value: 'o_f'}, {label: '输出-绿灯控制位', value: 'o_g'}, {label: '输出-红灯控制位', value: 'o_r'}, - {label: '输出-黄灯控制位', value: 'o_y'} + {label: '输出-黄灯控制位', value: 'o_y'}, + {label: '输出-黄红灯控制位', value: 'o_yr'} ] }; }, @@ -258,7 +260,8 @@ export default { { prop: 'i_f', label: '输入-故障表示位:', type: 'text', rightWidth: '100px', maxlength: 4}, { prop: 'i_g', label: '输入-绿灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4}, { prop: 'i_r', label: '输入-红灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4}, - { prop: 'i_y', label: '输入-黄灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4} + { prop: 'i_y', label: '输入-黄灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4}, + { prop: 'i_yr', label: '输入-黄红灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4} ] }; this.leftRules = { @@ -276,6 +279,9 @@ export default { ], i_y: [ { validator: validateDevice, messageEmpty: '请填写输入-黄灯表示位', list: this.signalLeftValue, trigger: 'blur' } + ], + i_yr: [ + { validator: validateDevice, messageEmpty: '请填写输入-黄红灯表示位', list: this.signalLeftValue, trigger: 'blur'} ] }; this.formRight = { @@ -286,7 +292,8 @@ export default { { prop: 'o_f', label: '输出-故障控制位:', type: 'text', rightWidth: '100px', maxlength: 4}, { prop: 'o_g', label: '输出-绿灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4}, { prop: 'o_r', label: '输出-红灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4}, - { prop: 'o_y', label: '输出-黄灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4} + { prop: 'o_y', label: '输出-黄灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4}, + { prop: 'o_yr', label: '输出-黄红灯控制位', type: 'text', rightWidth: '100px', maxlength: 4} ] }; this.rightRules = { @@ -294,16 +301,19 @@ export default { { validator: validateAddr, messageEmpty: '请填写输出网关字地址', trigger: 'blur' } ], o_f: [ - { validator: validateDevice, messageEmpty: '请填写输入-故障控制位', list: this.signalRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-故障控制位', list: this.signalRightValue, trigger: 'blur' } ], o_g: [ - { validator: validateDevice, messageEmpty: '请填写输入-绿灯控制位', list: this.signalRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-绿灯控制位', list: this.signalRightValue, trigger: 'blur' } ], o_r: [ - { validator: validateDevice, messageEmpty: '请填写输入-红灯控制位', list: this.signalRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-红灯控制位', list: this.signalRightValue, trigger: 'blur' } ], o_y: [ - { validator: validateDevice, messageEmpty: '请填写输入-黄灯控制位', list: this.signalRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-黄灯控制位', list: this.signalRightValue, trigger: 'blur' } + ], + o_yr: [ + { validator: validateDevice, messageEmpty: '请填写输出-黄红灯控制位', list: this.signalRightValue, trigger: 'blur'} ] }; break;