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/jointTraining/menuDraft/realDevice.vue b/src/views/jointTraining/menuDraft/realDevice.vue index c83feae5c..15d13ed55 100644 --- a/src/views/jointTraining/menuDraft/realDevice.vue +++ b/src/views/jointTraining/menuDraft/realDevice.vue @@ -236,10 +236,10 @@ export default { } }); updateRealDevicesNew(this.$route.query.group, paramsList).then(res => { - this.$message.success(this.$t('tip.updateRealDeviceSuccess')); + this.$message.success(this.$t('tip.updateRealDeviceConnectionSuccess')); this.doClose(); }).catch(() => { - this.$message.error(this.$t('tip.updateRealDeviceFailed')); + this.$message.error(this.$t('tip.updateRealDeviceConnectionFailed')); }); }, doSave() { diff --git a/src/views/newMap/jointTrainingNew/menuDraft/realDevice.vue b/src/views/newMap/jointTrainingNew/menuDraft/realDevice.vue index c83feae5c..15d13ed55 100644 --- a/src/views/newMap/jointTrainingNew/menuDraft/realDevice.vue +++ b/src/views/newMap/jointTrainingNew/menuDraft/realDevice.vue @@ -236,10 +236,10 @@ export default { } }); updateRealDevicesNew(this.$route.query.group, paramsList).then(res => { - this.$message.success(this.$t('tip.updateRealDeviceSuccess')); + this.$message.success(this.$t('tip.updateRealDeviceConnectionSuccess')); this.doClose(); }).catch(() => { - this.$message.error(this.$t('tip.updateRealDeviceFailed')); + this.$message.error(this.$t('tip.updateRealDeviceConnectionFailed')); }); }, doSave() { 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 bd2909cc2..90904ade1 100644 --- a/src/views/system/deviceManage/editConfig.vue +++ b/src/views/system/deviceManage/editConfig.vue @@ -84,14 +84,15 @@ export default { signalLeftValue: [ {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'} ] }; }, @@ -127,10 +128,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) { @@ -220,28 +223,28 @@ export default { { validator: validateAddr, messageEmpty: '请填写输出网关字地址', trigger: 'blur' } ], o_c: [ - { validator: validateDevice, messageEmpty: '请填写输入-关门位', list: this.psdRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-关门位', list: this.psdRightValue, trigger: 'blur' } ], o_dc_s: [ - { validator: validateDevice, messageEmpty: '请填写输入-关门信号灯控制位', list: this.psdRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-关门信号灯控制位', list: this.psdRightValue, trigger: 'blur' } ], o_dcl_s: [ - { validator: validateDevice, messageEmpty: '请填写输入-关门且锁闭信号灯控制位', list: this.psdRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-关门且锁闭信号灯控制位', list: this.psdRightValue, trigger: 'blur' } ], o_do_s: [ - { validator: validateDevice, messageEmpty: '请填写输入-开门信号灯控制位', list: this.psdRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-开门信号灯控制位', list: this.psdRightValue, trigger: 'blur' } ], o_ir_s: [ - { validator: validateDevice, messageEmpty: '请填写输入-互锁解除信号灯控制位', list: this.psdRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-互锁解除信号灯控制位', list: this.psdRightValue, trigger: 'blur' } ], o_l: [ - { validator: validateDevice, messageEmpty: '请填写输入-锁闭位', list: this.psdRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-锁闭位', list: this.psdRightValue, trigger: 'blur' } ], o_o: [ - { validator: validateDevice, messageEmpty: '请填写输入-开门位', list: this.psdRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-开门位', list: this.psdRightValue, trigger: 'blur' } ], o_psl_s: [ - { validator: validateDevice, messageEmpty: '请填写输入-PSL信号灯控制位', list: this.psdRightValue, trigger: 'blur' } + { validator: validateDevice, messageEmpty: '请填写输出-PSL信号灯控制位', list: this.psdRightValue, trigger: 'blur' } ] }; break; @@ -255,8 +258,8 @@ export default { { prop:'i_addr', label:'输入网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0}, { 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 = { @@ -269,11 +272,11 @@ export default { i_g: [ { validator: validateDevice, messageEmpty: '请填写输入-绿灯表示位', list: this.signalLeftValue, trigger: 'blur' } ], - i_r: [ - { validator: validateDevice, messageEmpty: '请填写输入-红灯表示位', list: this.signalLeftValue, trigger: 'blur' } - ], i_y: [ { validator: validateDevice, messageEmpty: '请填写输入-黄灯表示位', list: this.signalLeftValue, trigger: 'blur' } + ], + i_yr: [ + { validator: validateDevice, messageEmpty: '请填写输入-黄红灯表示位', list: this.signalLeftValue, trigger: 'blur'} ] }; this.formRight = { @@ -284,7 +287,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 = { @@ -292,16 +296,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;