diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue index 98243f23d..af3ff607a 100644 --- a/src/views/newMap/displayNew/demonChat.vue +++ b/src/views/newMap/displayNew/demonChat.vue @@ -236,7 +236,7 @@ export default { if (val) { if (val.type == 'Conversation') { this.scriptTip = '请说:' + val.content; - } else if (val.type == 'Command') { + } else if (val.type == 'Operation') { const commandName = val.operationType; let device = val.operationType.split('_')[0]; if (device == 'CM') { @@ -255,6 +255,19 @@ export default { } }); this.scriptTip = '请创建会话,选择' + inviteMember.toString(); + } else if (val.type == 'Command') { + const targetName = this.memberData.find(member=>{ return member.id == val.commandInitiateVO.targetMemberId; }); + const CommandList = { + Drive_Ahead:'确认运行至前方站', + Route_Block_Drive:'进路闭塞法行车', + Drive_Through_The_Guide_Signal:'越引导信号行驶', + Drive_Through_The_Red_Light:'越红灯行驶', + Drive_In_Urm_Mode:'URM模式驾驶', + Set_Speed_Limit:'设置限速', + Open_Or_Close_Door:'开关门', + Switch_Hook_Lock: '道岔钩锁' + }; + this.$messageBox('请对【' + targetName.label + '】下达【' + CommandList[val.commandInitiateVO.commandType] + '】指令'); } } }, diff --git a/src/views/newMap/displayNew/scriptPreviewChat.vue b/src/views/newMap/displayNew/scriptPreviewChat.vue index 32e953220..f8cd69481 100644 --- a/src/views/newMap/displayNew/scriptPreviewChat.vue +++ b/src/views/newMap/displayNew/scriptPreviewChat.vue @@ -130,7 +130,7 @@ export default { if (val) { if (val.type == 'Conversation') { this.scriptTip = '请说:' + val.content; - } else if (val.type == 'Command') { + } else if (val.type == 'Operation') { const commandName = val.operationType; let device = val.operationType.split('_')[0]; if (device == 'CM') { @@ -149,6 +149,19 @@ export default { } }); this.scriptTip = '请创建会话,选择' + inviteMember.toString(); + } else if (val.type == 'Command') { + const targetName = this.memberData.find(member=>{ return member.id == val.commandInitiateVO.targetMemberId; }); + const CommandList = { + Drive_Ahead:'确认运行至前方站', + Route_Block_Drive:'进路闭塞法行车', + Drive_Through_The_Guide_Signal:'越引导信号行驶', + Drive_Through_The_Red_Light:'越红灯行驶', + Drive_In_Urm_Mode:'URM模式驾驶', + Set_Speed_Limit:'设置限速', + Open_Or_Close_Door:'开关门', + Switch_Hook_Lock: '道岔钩锁' + }; + this.$messageBox('请对【' + targetName.label + '】下达【' + CommandList[val.commandInitiateVO.commandType] + '】指令'); } } }, diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue index d2e92dfaa..bc246f793 100644 --- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue +++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue @@ -460,7 +460,6 @@ export default { this.$refs.make.validate((valid) => { if (valid) { const model = deepAssign(this.addModel, {code:getUID(this.getIdPrefix(this.addModel.type), this.selectLists)}); - debugger; this.$emit('updateMapModel', model); this.$refs.make.resetForm(); this.$refs.dataform.resetFields();