From 83a2cb21def90aefce502b83623fee5c0caf3777 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 31 Aug 2020 16:51:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=89=A7=E6=9C=AC?=
 =?UTF-8?q?=E4=BB=A3=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/views/scriptManage/tipScriptRecord.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 80e2b2239..9685fa625 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -93,6 +93,7 @@ export default {
             isSavingScript: false,
             mapLocation:null,
             memberId:'',
+            oldMemberId:'',
             allMemberList:[],
             memberList:[],
             quickChangeMember:[],
@@ -153,6 +154,7 @@ export default {
                 });
                 if (member) {
                     this.memberId = member.id;
+                    this.oldMemberId = member.id;
                 }
                 this.$store.dispatch('training/setPrdType', '02');
                 this.$store.dispatch('training/setRoles', 'DISPATCHER');
@@ -337,13 +339,20 @@ export default {
                     this.$parent.resetBeginTime();
                     this.$refs['getAction'].loadInitData();
                     this.changeRunPlanStatus();
-                    // 有问题
-                    // this.memberId = '';
                     this.$store.dispatch('training/setPrdType', '02');
                     this.$store.dispatch('map/resetActiveTrainList');
+                    this.$store.dispatch('training/updateMemberListInScript',
+                        {
+                            oldMemberId:this.memberId,
+                            newMemberId:this.oldMemberId,
+                            userId:this.$store.state.user.id,
+                            name:this.$store.state.user.nickname
+                        }
+                    );
                     // this.initAutoSaveScript();
-                    this.$store.dispatch('scriptRecord/updateRole', '');
+                    this.$store.dispatch('scriptRecord/updateRole', 'DISPATCHER:' + this.oldMemberId);
                     this.$store.dispatch('scriptRecord/updateBgSet', false);
+                    this.memberId = this.oldMemberId;
                     this.$message.success(this.$t('scriptRecord.resetDataSuccess'));
                 }).catch(() => {
                     this.$messageBox(this.$t('scriptRecord.resetDataFail'));

From 1164be59a49b0f188bc8ab127d935d794bb362ff Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 31 Aug 2020 18:32:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=A7=E6=9C=ACid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/dispatherContest/sceneList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index 2ed2b7882..4e92cd382 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -50,7 +50,7 @@ export default {
             selectMapLineCode:'',
             mainSceneData: [
                 {type: '车辆故障', scene: '列车救援'},
-                {type: '信号系统故障', scene: '道岔故障'},
+                {type: '信号系统故障', scene: '道岔故障', id: '9'},
                 {type: '信号系统故障', scene: '区域控制器故障'},
                 {type: '信号系统故障', scene: '联锁故障'},
                 {type: '供电系统故障', scene: '接触轨(网)断电'},