From d03532ecea49a585d62290e731fdcc9cd8c96b39 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 10 Aug 2020 16:29:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E9=A2=84=E8=A7=88=E5=92=8C?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=89=A7=E6=9C=AC=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/demonChat.vue         | 15 ++++++++++++++-
 src/views/newMap/displayNew/scriptPreviewChat.vue | 15 ++++++++++++++-
 .../newMap/newMapdraft/mapoperate/controlLamp.vue |  1 -
 3 files changed, 28 insertions(+), 3 deletions(-)

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