场景编辑代码调整

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);
 

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;
                     }
+
                 });
             }
         });

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:{
+            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,6 +282,7 @@ function covertOperation(deviceType, operationParamMap, operationType) {
                     params.forEach((param, index)=>{
                         paramName += ' ' + param.name;
                         const data = operationParamMap[param.code];
+                        if (param.result) {
                             param.result.forEach(result=>{
                                 switch (result.judge) {
                                 case '=': {
@@ -285,6 +304,10 @@ function covertOperation(deviceType, operationParamMap, operationType) {
                                 }
                                 }
                             });
+                        } else {
+                            paramName += ',值为' + data;
+                        }
+
                         if (index != params.length - 1) {
                             paramName += ',';
                         }