From 2c3c46c5bcf895c6a2423a201673a456bbb3d08f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 13 Oct 2020 17:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E7=BC=96=E8=BE=91=E4=BB=A3?= =?UTF-8?q?=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/utils/parser.js | 1 - .../displayNew/dispatherContest/sceneList.vue | 4 + .../component/covertOperation.js | 85 ++++++++++++------- 3 files changed, 58 insertions(+), 32 deletions(-) diff --git a/src/jmapNew/utils/parser.js b/src/jmapNew/utils/parser.js index 78ffce51f..c329a76fa 100644 --- a/src/jmapNew/utils/parser.js +++ b/src/jmapNew/utils/parser.js @@ -126,7 +126,6 @@ export function parser(data, skinCode, showConfig) { }, this); zrUtil.each(data.trainList || [], elem => { - console.log(elem, '11111111111111'); mapDevice[elem.code] = createDevice(deviceType.Train, elem, propConvert, showConfig); }, this); diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue index de8406ee1..cc6f7b305 100644 --- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue +++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue @@ -58,6 +58,7 @@ export default { {type: '供电系统故障', scene: '接触轨(网)断电'}, {type: '供电系统故障', scene: '车站照明熄灭影响乘降'}, {type: '车站机电设备故障', scene: '站台门故障'}, + {type: '限速', scene: '列车限速'}, {type: '轨道故障', scene: '线路故障影响列车运行'} ], deputySceneData: [ @@ -82,7 +83,10 @@ export default { this.mainSceneData[4].id = each.id; } else if (each.name == '场景9') { this.mainSceneData[6].id = each.id; + } else if (each.name == '场景10') { + this.mainSceneData[7].id = each.id; } + }); } }); diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js index 51e428109..144124ad9 100644 --- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js +++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js @@ -69,12 +69,6 @@ export const operateEnum = { Stand:{ code:'standCode', type:'站台', - Stand_Set_Hold_Train:{ - code:'standCode', - isDevice:false, - isList:false, - name:'站台' - }, Stand_Set_Park_Time:{ isList:true, params:[ @@ -152,8 +146,30 @@ export const operateEnum = { code:'groupNumber', type:'列车', Train_Set_Plan:{ - code:'serviceNumber', - name:'服务号' + isList:true, + params:[ + { + code:'serviceNumber', + name:'服务号' + }, + { + code:'tripNumber', + name:'车次号' + } + ] + }, + Train_Set_Head:{ + isList:true, + params:[ + { + code:'serviceNumber', + name:'服务号' + }, + { + code:'destinationCode', + name:'目的地号' + } + ] } } }; @@ -204,7 +220,6 @@ export function covertOperate(operationType, operationParamMap) { device = 'TrainWindow'; } const operateName = Object.values(CMD[device]).find(res=>{ return res.value == operationType; }); - debugger; const deviceInfo = covertOperation(device, operationParamMap, operationType); let tip = '请'; if (deviceInfo.deviceName) { @@ -222,9 +237,6 @@ function covertOperation(deviceType, operationParamMap, operationType) { let deviceName = ''; let paramName = ''; if (operateEnum[deviceType].code) { - if (deviceType == 'TrainWindow') { - - } const device = store.getters['map/getDeviceByCode'](operationParamMap[operateEnum[deviceType].code]); if (device._type == 'StationStand') { const station = store.getters['map/getDeviceByCode'](device.stationCode); @@ -236,7 +248,13 @@ function covertOperation(deviceType, operationParamMap, operationType) { deviceName += '【' + operateEnum[deviceType].type + ' ' + parentSection.name + '-' + device.name + '】'; } } else { - deviceName += '【' + operateEnum[deviceType].type + ' ' + device.name + '】'; + let deviceNameIn = ''; + if (device.name) { + deviceNameIn = device.name; + } else { + deviceNameIn = device.groupNumber; + } + deviceName += '【' + operateEnum[deviceType].type + ' ' + deviceNameIn + '】'; } } const paramInfo = operateEnum[deviceType][operationType]; @@ -264,27 +282,32 @@ function covertOperation(deviceType, operationParamMap, operationType) { params.forEach((param, index)=>{ paramName += ' ' + param.name; const data = operationParamMap[param.code]; - param.result.forEach(result=>{ - switch (result.judge) { - case '=': { - if (data == result.data) { - paramName += '为' + result.name; - if (result.showUnit) { - paramName += ',值为' + data + result.showUnit; + if (param.result) { + param.result.forEach(result=>{ + switch (result.judge) { + case '=': { + if (data == result.data) { + paramName += '为' + result.name; + if (result.showUnit) { + paramName += ',值为' + data + result.showUnit; + } } - } - break; - } case '>': { - if (data > result.data) { - paramName += '为' + result.name; - if (result.showUnit) { - paramName += ',值为' + data + result.showUnit; + break; + } case '>': { + if (data > result.data) { + paramName += '为' + result.name; + if (result.showUnit) { + paramName += ',值为' + data + result.showUnit; + } } + break; } - break; - } - } - }); + } + }); + } else { + paramName += ',值为' + data; + } + if (index != params.length - 1) { paramName += ','; }