diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index c9b17c3c1..e2313a954 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -750,10 +750,12 @@ const map = {
         setActiveTrainList:(state) => {
             state.activeTrainListUpdate++;
         },
-        resetActiveTrainList:(state) => {
+        resetActiveTrainList:(state, isBack) => {
             state.activeTrainList = [];
-            state.activeTrainListUpdate = 0;
-            state.activeTrainListChange = 0;
+            if (!isBack) {
+                state.activeTrainListUpdate = 0;
+                state.activeTrainListChange = 0;
+            }
         },
         setDeleteCount: (state) => {
             state.deleteCount++;
@@ -1047,8 +1049,8 @@ const map = {
         setActiveTrainList: ({ commit }) => {
             commit('setActiveTrainList');
         },
-        resetActiveTrainList: ({ commit }) => {
-            commit('resetActiveTrainList');
+        resetActiveTrainList: ({ commit }, isBack) => {
+            commit('resetActiveTrainList', isBack);
         },
         setUpdateCount: ({ commit }) => {
             commit('setUpdateCount');
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 4676cbcf3..85bd84fe7 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -26,8 +26,11 @@ function handle(state, data) {
     case 'Simulation_User': // 仿真-进出仿真消息
         handleSimulationUserinfo(state, msg); // 用户进出仿真消息
         break;
-    case 'Simulation_Script_Tip': // 仿真-聊天界面用户进出仿真消息
-        handleSimulationScriptTipInfo(state, msg); // 用户进出仿真消息
+    case 'Simulation_Script_Action_Tip': // 剧本提示消息
+        handleSimulationScriptTipInfo(state, msg); // 剧本提示消息
+        break;
+    case 'Simulation_Script_Action_Finish':
+        state.simulationScriptTipFinish++; // 剧本某一部操作完成提示
         break;
     case 'Simulation_PlayBack_Finish': // 竞赛裁判系统裁判员回放结束推送
         state.playBackFinish++; // 竞赛裁判系统裁判员回放结束推送
@@ -208,6 +211,7 @@ const socket = {
         roleList: [], // 设置角色信息
         simulationRoleList:[], // 设置仿真的聊天角色信息
         simulationScriptTip:{}, // 剧本推送提示信息
+        simulationScriptTipFinish:0, // 剧本某一步完成的消息
         scriptFinish:0, // 剧本执行完成提示信息
         autoFaultTrigger:0, // 自动故障触发操作推送消息
         scriptAction:{}, // 剧本编制添加指令的推送消息
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index 9b417ae8a..a4c5813ae 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -50,13 +50,11 @@
         <div v-if="isShow">
           <div class="userString">{{ userString }}</div>
           <el-button :loading="loading" size="mini" type="primary" class="chat-box-create-coversite" @click="doCreate">创建会话</el-button>
-          <div v-if="scriptTip" class="scriptTip">{{ scriptTip }}</div>
         </div>
         <div v-else>
           <div class="chat-box-footer-tool" />
           <el-button v-if="isQuitShow" size="mini" type="danger" class="chat-box-footer-quit" :loading="loading" @click="quitConversition()">结束会话</el-button>
           <el-button v-if="isStartRecord" class="chat-box-footer-send" size="mini" type="primary" :disabled="recordSending" @click="startRecording()">发送语音</el-button>
-          <div v-if="scriptTip" class="scriptTip">{{ scriptTip }}</div>
         </div>
       </div>
     </div>
@@ -105,10 +103,6 @@ export default {
             type:Array,
             required: true
         },
-        scriptTip:{
-            type:String,
-            required:true
-        },
         isStartRecord:{
             type:Boolean,
             required:true
@@ -185,7 +179,6 @@ export default {
         },
         // 语音录制开始
         startRecording() {
-            this.$emit('setScriptTip', '');
             const that = this;
             if (!this.recordSending && !this.recorders && !this.microphone) {
                 this.$refs.chatSetting.doClose();
@@ -454,30 +447,6 @@ export default {
     cursor: no-drop;
 }
 
-.scriptTip{
-    position: absolute;
-    width: 260px;
-    padding: 10px;
-    background: rgb(250, 246, 3);
-    right: 7px;
-    bottom:45px;
-    border-radius: 5px;
-    font-size: 14px;
-    color: #000000;
-    z-index: 2;
-}
-.scriptTip::after{
-    content: '';
-    position: absolute;
-    width: 0;
-    height: 0;
-    border-left: 10px solid transparent;
-    border-right: 10px solid transparent;
-    border-top: 8px solid #faf603;
-    right: 16px;
-    bottom: -7px;
-}
-
 .userString{
     height: 50px;
     width: 409px;
diff --git a/src/views/newMap/displayNew/demon/addQuest.vue b/src/views/newMap/displayNew/demon/addQuest.vue
index 73139caac..342f4430c 100644
--- a/src/views/newMap/displayNew/demon/addQuest.vue
+++ b/src/views/newMap/displayNew/demon/addQuest.vue
@@ -53,7 +53,7 @@
 <script>
 import Cookies from 'js-cookie';
 import ConstConfig from '@/scripts/ConstConfig';
-import {getScriptPageListOnlineNew, getDraftScriptByGroupNew, getScriptByIdNew } from '@/api/script';
+import {getScriptPageListOnlineNew, getScriptByIdNew } from '@/api/script';
 
 // 剧本弹窗
 export default {
@@ -175,7 +175,7 @@ export default {
         },
         async handleLoad(index, row) {
             this.row = row;
-            const res = this.$route.fullPath.includes('design/displayNew/demon') ? await getDraftScriptByGroupNew(row.group) : await getScriptByIdNew(row.id);
+            const res = await getScriptByIdNew(row.id);
             let newMemberList = [];
             if (res.code == 200) {
                 if (res.data.memberList && res.data.memberList.length > 0) {
diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue
index 8bb7b08a2..f069b8164 100644
--- a/src/views/newMap/displayNew/demonChat.vue
+++ b/src/views/newMap/displayNew/demonChat.vue
@@ -7,18 +7,15 @@
     :conversition-id="conversitionId"
     :current-member-list="currentMemberList"
     :chat-content-list="chatContentList"
-    :script-tip="scriptTip"
     :is-start-record="isStartRecord"
     :invite-user-name="inviteUserName"
     :is-quit-show="isQuitShow"
-    @setScriptTip="setScriptTip"
     @resetCoversition="resetCoversition"
   />
 </template>
 <script>
 import ChatBox from '../chatView/chatBox.vue';
 import ConstConfig from '@/scripts/ConstConfig';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import Cookies from 'js-cookie';
 import { getSimulationMemberList} from '@/api/simulation';
 import {getAllConversition} from '@/api/chat';
@@ -39,7 +36,6 @@ export default {
     },
     data() {
         return {
-            scriptTip:'',
             isHasCoversition:false,
             conversitionId:'',
             currentMemberList:[],
@@ -165,7 +161,6 @@ export default {
         },
         // 创建会话
         '$store.state.socket.createConversition':function(val) {
-            this.scriptTip = '';
             if (this.memberData.length > 0) {
                 const member = this.memberData.find(member=>{ return member.id == val.creatorId; });
                 if (member && member.userId == this.$store.state.user.id) {
@@ -231,46 +226,6 @@ export default {
                 this.currentMemberList = memberList;
             }
         },
-        // 剧本提示
-        '$store.state.socket.simulationScriptTip':function(val, old) {
-            if (val) {
-                if (val.type == 'Conversation') {
-                    this.scriptTip = '请说：' + val.content;
-                } else if (val.type == 'Operation') {
-                    const commandName = val.operationType;
-                    let device = val.operationType.split('_')[0];
-                    if (device == 'CM') {
-                        device = 'ControlConvertMenu';
-                    }
-                    const operateName = Object.values(CMD[device]).find(res=>{ return res.value == commandName; });
-                    this.$messageBox('请执行【' + operateName.label + '】操作');
-                } else if (val.type == 'Over_Conversation') {
-                    this.scriptTip = '请结束当前会话';
-                } else if (val.type == 'Start_Conversation' ) {
-                    const inviteMember = [];
-                    this.createCoversition = true;
-                    val.conversationMemberIds.forEach(id=>{
-                        if (val.memberId != id) {
-                            inviteMember.push((this.memberData.find(member=>{ return member.id == id; }) || {label:''}).label );
-                        }
-                    });
-                    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] + '】指令');
-                }
-            }
-        },
         // 会话聊天消息
         '$store.state.socket.conversationInfo':function (val, old) { //  仿真聊天
             const simulationText = this.$store.state.socket.conversationInfo;
@@ -306,7 +261,6 @@ export default {
         '$store.state.socket.overConversition': function (val) {
             if (val.id === this.conversitionId) {
                 this.conversitionId = '';
-                this.scriptTip = '';
                 this.currentMemberList = [];
                 this.chatContentList = [];
                 this.isHasCoversition = false;
@@ -330,9 +284,6 @@ export default {
     mounted() {
     },
     methods:{
-        setScriptTip(scriptTip) {
-            this.scriptTip = scriptTip;
-        },
         addContent(simulationText) {
             const text = {};
             const member = this.currentMemberList.find(member=>{
@@ -353,7 +304,6 @@ export default {
         },
         resetCoversition() {
             this.conversitionId = '';
-            this.scriptTip = '';
             this.isHasCoversition = false;
             this.currentMemberList = [];
             this.chatContentList = [];
diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue
index 93d93b1b2..3b58c7e15 100644
--- a/src/views/newMap/displayNew/designIndex.vue
+++ b/src/views/newMap/displayNew/designIndex.vue
@@ -5,48 +5,57 @@
         <map-system-draft ref="mapCanvas" @back="back" />
       </transition>
 
-      <script-preview-chat ref="chatbox" :group="group" :user-role="userRole" :member-data="memberData" :tree-data="treeData" />
+      <script-preview-chat ref="chatbox" :group="group" :user-role="userRole" :member-data="memberData" :tree-data="treeData" :offset="offset" />
       <div class="display-draft">
         <el-button v-if="isscriptRun&&!dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
         <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
       </div>
-      <menu-schema
-        v-if="isDemon"
-        ref="menuSchema"
-        :offset="offset"
-        :offset-bottom="offsetBottom"
-        :show-station="showStation"
-        :station-list="stationListMode"
-        :show-select-station="showSelectStation"
-        @switchMode="switchMode"
-        @selectQuest="selectQuest"
-        @switchStationMode="switchStationMode"
-      />
+
+      <div class="schema" :style="{top: offset+'px'}">
+        <template v-if="!dataError">
+          <el-button-group>
+            <el-button size="small" :disabled="viewDisabled || isscriptRun" type="success" @click="viewScriptRoles">{{ $t('display.schema.selectRoles') }}</el-button>
+            <!-- 运行图加载 -->
+            <el-button v-if="running" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
+            <el-button v-if="!running" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
+            <el-button v-if="faultMode" size="small" type="danger" @click="setFault">自动故障设置</el-button>
+          </el-button-group>
+          <el-button v-if="!isScheduling" size="small" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
+        </template>
+      </div>
       <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
     </div>
-
     <!-- <Jl3d-Simulation v-show="simulationShow" ref="Jl3dSimulation" :panel-show="simulationShow" @showpanel="showpanel" /> -->
     <!-- <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" /> -->
+    <select-role ref="selectRole" :member-list="memberList" @selectRole="selectRole" />
     <run-plan-Load ref="runPlanLoad" :group="group" />
     <run-plan-view ref="runPlanView" :group="group" />
+    <fault-choose ref="faultChoose" :group="group" :offset="offset" />
   </div>
 </template>
 
 <script>
 // 草稿预备预览
+import SelectRole from './selectRole';
+import { getToken } from '@/utils/auth';
 import RunPlanLoad from './demon/runPlanLoad';
 import RunPlanView from './demon/runPlanView';
 import ScriptPreviewChat from './scriptPreviewChat.vue';
 import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
 import { quitScriptNew, scriptRePreview } from '@/api/simulation';
-import MenuSchema from '@/views/newMap/displayNew/menuSchema';
+import FaultChoose from './demon/faultChoose';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import { mapGetters } from 'vuex';
 import { clearSimulation, getSimulationInfoNew } from '@/api/simulation';
-import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
+import { OperateMode } from '@/scripts/ConstDic';
 import { loadNewMapDataByGroup } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 import { Notification } from 'element-ui';
+import { getByGroupStationList } from '@/api/jmap/map';
+import { getEveryDayRunPlanNew } from '@/api/simulation';
+import {loadDraftScript, loadDraftScriptNew} from '@/api/designPlatform';
+import {getDraftScriptByGroupNew } from '@/api/script';
+import Vue from 'vue';
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
 
@@ -54,7 +63,6 @@ import Cookies from 'js-cookie';
 // import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
 // import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
 import { timeFormat } from '@/utils/date';
-
 export default {
     name: 'DisplayDraft',
     components: {
@@ -62,8 +70,9 @@ export default {
         RunPlanView,
         ScriptPreviewChat,
         MapSystemDraft,
-        MenuSchema,
-        MenuSystemTime
+        FaultChoose,
+        MenuSystemTime,
+        SelectRole
         // Jl3dDrive
     },
     data() {
@@ -76,6 +85,10 @@ export default {
             dataError: false,
             panelShow: true,
             memberData:[],
+            faultMode: false,
+            viewDisabled: true,
+            mapLocation:{},
+            firstLoad: true,
             // simulationShow: false,
             // drivingShow: false,
             isscriptRun:false, // 剧本是否正在加载
@@ -91,7 +104,8 @@ export default {
             },
             userRole:'',
             isDrive: this.prdType == '04',
-            treeData:[]
+            treeData:[],
+            memberList:[]
         };
     },
     computed: {
@@ -119,7 +133,6 @@ export default {
             return this.$route.query.mapId;
         },
         prdType() {
-            // return this.$route.query.prdType;
             return this.$store.state.training.prdType;
         },
         isDemon() {
@@ -128,6 +141,12 @@ export default {
         drawWay() {
             const drawWay = this.$route.query.drawWay;
             return drawWay && JSON.parse(drawWay);
+        },
+        running() {
+            return this.$store.state.training.started;
+        },
+        isScheduling() {
+            return this.$store.state.training.prdType === '05';
         }
         // isDrive() {
         // 	return this.prdType == '04';
@@ -149,12 +168,6 @@ export default {
             this.setPosition();
             this.setMode();
         },
-        // '$store.state.training.prdType': function(val) {
-        //     debugger;
-        //     // this.prdType=val;
-        //     this.isDrive = (val == '04');
-        //     this.isShowScheduling = (val == '05');
-        // },
         '$store.state.app.windowSizeCount': function() {
             this.setWindowSize();
         },
@@ -165,6 +178,16 @@ export default {
             // this.$nextTick(() => {
             this.initLoadData();
             // });
+        },
+        '$store.state.training.switchcount': async function () {
+            if (this.group) {
+                if (this.$store.state.training.started && !this.firstLoad) {
+                    await this.loadRunData();
+                } else if (this.firstLoad) {
+                    await this.loadRunData(this.$route.query);
+                }
+                this.firstLoad = false;
+            }
         }
     },
     created() {
@@ -181,6 +204,79 @@ export default {
         this.$store.dispatch('scriptRecord/updateSimulationPause', false);
     },
     methods: {
+        viewScriptRoles() {
+            this.$refs.selectRole.doShow();
+        },
+        async selectRole(role) {
+            try {
+                const res = this.drawWay ? await loadDraftScriptNew(role.id, this.group) : await loadDraftScript(this.$route.query.scriptId, role.id, this.group);
+                if (res && res.code == 200) {
+                    if (this.querymapLocation) {
+                        const newMapLocation = {'offsetX': this.mapLocation.x, 'offsetY': this.mapLocation.y, 'scaleRate': this.mapLocation.scale};
+                        Vue.prototype.$jlmap.setOptions(newMapLocation);
+                    }
+                }
+                this.$store.dispatch('scriptRecord/updateBgSet', true);
+
+                this.isscriptRun = true;
+                if (role.type) {
+                    const typeList = ConstConfig.ConstSelect.roleTypeNew;
+                    typeList.forEach(type=>{
+                        if (role.type == type.label) {
+                            this.userRole = type.value;
+                        }
+                    });
+                    let prdType;
+                    if (this.userRole == '行值') {
+                        prdType = '01';
+                        this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
+                        this.$store.dispatch('training/setRoleDeviceCode', role.deviceCode);
+                    } else if (this.userRole == '行调') {
+                        prdType = '02';
+                        this.$store.dispatch('training/setRoles', 'DISPATCHER');
+                    } else if (this.userRole == '司机') {
+                        prdType = '04';
+                    } else if (this.userRole == '通号') {
+                        prdType = '';
+                        const routeData = this.$router.resolve({
+                            path:'/jlmap3d/maintainer',
+                            query:{
+                                mapid:this.$route.query.mapId,
+                                group:this.group,
+                                token:getToken(),
+                                project: this.project,
+                                noPreLogout: true
+                            }
+                        });
+                        this.openWindow = window.open(routeData.href);
+                    } else {
+                        prdType = '';
+                    }
+                    this.switchMode(prdType);
+                    this.memberData.map(member=>{
+                        if (member.id == role.id) {
+                            member.userId = this.$store.state.user.id;
+                            member.name = this.$store.state.user.nickname;
+                            member.disabled = true;
+                        }
+                    });
+
+                } else {
+                    this.userRole = 'AUDIENCE';
+                    this.switchMode('');
+                }
+            } catch (error) {
+                this.$messageBox(error.message);
+            }
+        },
+        changeOperateMode() {
+            this.faultMode = !this.faultMode;
+            let mode = OperateMode.NORMAL;
+            if (this.faultMode) {
+                mode = OperateMode.FAULT;
+            }
+            this.$store.dispatch('training/changeOperateMode', { mode: mode });
+        },
         // 加载地图数据
         async initLoadData() {
             this.setWindowSize();
@@ -208,6 +304,11 @@ export default {
             const resp = await getSimulationInfoNew(this.group);
             if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
+                if (resp.data.planRunning) {
+                    this.$store.dispatch('training/start');// 仿真开始按计划行车
+                } else {
+                    this.$store.dispatch('training/over');// 仿真按计划行车结束
+                }
                 this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
             } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
                 this.dataError = true;
@@ -217,15 +318,151 @@ export default {
 
         // 仿真系统
         async initLoadDemonData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            // this.$store.dispatch('training/end', TrainingMode.NORMAL);
             this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
             if (this.group) {
                 await this.loadNewMapDataByGroup(this.group);
+                await this.getDraftScriptByGroupNew(this.group);
                 this.switchMode('02');
             } else {
                 this.endViewLoading();
             }
         },
+        async getDraftScriptByGroupNew(group) {
+            const resp = await getDraftScriptByGroupNew(group);
+            if (resp.code == 200) {
+                if (resp.data.memberList && resp.data.memberList.length > 0) {
+                    this.$store.dispatch('training/setMemberList', {memberList:resp.data.memberList, userId:this.$store.state.user.id});
+                    // 以下待优化
+                    const memberList = this.$store.state.training.memberData;
+                    // if (data.id) {
+                    //     memberList[data.id].userId = this.$store.state.user.id;
+                    //     memberList[data.id].name = this.$store.state.user.nickname;
+                    //     memberList[data.id].disabled = true;
+                    // }
+                    let lastData = JSON.stringify(memberList);
+                    const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+                    roleTypeList.forEach(function(element) {
+                        const rolename = element.value;
+                        if (Cookies.get('user_lang') == 'en') {
+                            lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                        } else {
+                            lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                        }
+                    });
+                    lastData = JSON.parse(lastData);
+                    lastData = Object.values(lastData);
+                    const lastMemberList = [];
+                    const dispatcherList = [];
+                    // const electricDispatcherList = [];
+                    // const depotDispatcherList = [];
+                    const stationSupervisorList = [];
+                    const driverList = [];
+                    const maintainerList = [];
+                    this.treeData = [];
+                    lastData.forEach((member, index)=>{
+                        if (member.type != '观众') {
+                            const name = member.name == undefined ? '' : '-' + member.name;
+                            if (member.deviceCode) {
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    if (device._type == 'Train') {
+                                        member.label = member.type + device.groupNumber + name;
+                                        lastMemberList.push(member);
+                                        driverList.push(member);
+                                    } else {
+                                        member.label = member.type + device.name + name;
+                                        lastMemberList.push(member);
+                                        if (device._type == 'Station') {
+                                            stationSupervisorList.push(member);
+                                        }
+                                    }
+                                } else {
+                                    member.label = member.type + member.deviceCode + name;
+                                    lastMemberList.push(member);
+                                }
+                            } else {
+                                member.label = member.type + name;
+                                if (member.type == '行调') {
+                                    dispatcherList.push(member);
+                                } else if (member.type == '通号') {
+                                    maintainerList.push(member);
+                                }
+                                lastMemberList.push(member);
+                            }
+                        }
+                    });
+                    this.treeData = [{
+                        label: '行调',
+                        id: 'dispatcher',
+                        type: 'role',
+                        children: dispatcherList
+                    }, {
+                        label: '车站值班员',
+                        id: 'stationSupervisor',
+                        type: 'role',
+                        children: stationSupervisorList
+                    }, {
+                        label: '司机',
+                        id: 'driver',
+                        type: 'role',
+                        children: driverList
+                    }, {
+                        label: '通号',
+                        id: 'maintainer',
+                        type: 'role',
+                        children: maintainerList
+                    }];
+                    this.memberData = lastMemberList;
+                }
+                let newMemberList = [];
+                const activeMemberList = [];
+                resp.data.actionList.forEach((activeMember)=>{
+                    if (!(activeMemberList.length > 0 && activeMemberList.includes(activeMember.memberId))) {
+                        activeMemberList.push(activeMember.memberId);
+                    }
+                });
+                const playerList = resp.data.memberList.filter(member=>{
+                    return activeMemberList.includes(member.id);
+                });
+                playerList.map(member=>{
+                    if (!member.deviceName && member.deviceCode) {
+                        const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                        if (device.name) {
+                            member.deviceName = device.name;
+                        } else {
+                            member.deviceName = member.deviceCode;
+                        }
+                    }
+                });
+                const lastData = JSON.stringify(playerList);
+                newMemberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
+                if (resp.data.mapLocation) {
+                    this.mapLocation = resp.data.mapLocation;
+                }
+                this.memberList = newMemberList || [];
+                this.memberList.unshift({ id: '', label: this.$t('display.script.none'), role: 'no', disabled:false });
+            }
+        },
+        covert(data, roleTypeList) {
+            let lastData = data;
+            roleTypeList.forEach(function(element) {
+                const rolename = element.value;
+                if (Cookies.get('user_lang') == 'en') {
+                    lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                } else {
+                    lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                }
+            });
+            lastData = JSON.parse(lastData);
+            lastData.forEach(each=>{
+                const name = each.name == undefined ? '' : '-' + each.name;
+                const deviceName = each.deviceName == undefined ? '' : '-' + each.deviceName;
+                each.label = each.type + deviceName + name;
+                each.disabled = false;
+            });
+            return lastData;
+        },
 
         // 通过id加载地图数据
         async loadNewMapDataByGroup(group) {
@@ -238,6 +475,33 @@ export default {
             }
         },
 
+        loadRunData() {
+            this.$store.dispatch('runPlan/clear').then(() => {
+                if (this.group) {
+                    this.viewDisabled = true;
+                    // 获取排序的车站列表
+                    getByGroupStationList(this.group).then(response => {
+                        this.$store.dispatch('runPlan/setStations', response.data).then(() => {
+                            getEveryDayRunPlanNew(this.group).then(resp => { // 获取仿真运行图
+                                this.$store.dispatch('runPlan/setPlanData', resp.data);
+                                this.$store.dispatch('runPlan/setInitialPlanData', resp.data);
+                                this.viewDisabled = false;
+                            }).catch(error => {
+                                this.$store.dispatch('runPlan/setPlanData', []);
+                                if (error.code == 30001) {
+                                    this.$messageBox(this.$t('display.schema.todayRunDiagramNoLoad'));
+                                } else {
+                                    !this.dataError && this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
+                                }
+                            });
+                        });
+                    }).catch(() => {
+                        this.$messageBox(this.$t('display.schema.getStationListFail'));
+                    });
+                }
+            });
+        },
+
         // 结束加载状态
         endViewLoading() {
             this.$store.dispatch('map/mapClear');
@@ -261,103 +525,6 @@ export default {
                 Notification.closeAll();
             });
         },
-        // 选择脚本
-        async selectQuest(data) {
-            this.isscriptRun = true;
-            if (data.roleName) {
-                const typeList = ConstConfig.ConstSelect.roleTypeNew;
-                typeList.forEach(type=>{
-                    if (data.roleName == type.label) {
-                        this.userRole = type.value;
-                    }
-                });
-            } else {
-                this.userRole = 'AUDIENCE';
-            }
-
-            // 以下待优化
-            const memberList = this.$store.state.training.memberData;
-            if (data.id) {
-                memberList[data.id].userId = this.$store.state.user.id;
-                memberList[data.id].name = this.$store.state.user.nickname;
-                memberList[data.id].disabled = true;
-            }
-            let lastData = JSON.stringify(memberList);
-            const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
-            roleTypeList.forEach(function(element) {
-                const rolename = element.value;
-                if (Cookies.get('user_lang') == 'en') {
-                    lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
-                } else {
-                    lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
-                }
-            });
-            lastData = JSON.parse(lastData);
-            lastData = Object.values(lastData);
-            const lastMemberList = [];
-            const dispatcherList = [];
-            // const electricDispatcherList = [];
-            // const depotDispatcherList = [];
-            const stationSupervisorList = [];
-            const driverList = [];
-            const maintainerList = [];
-            this.treeData = [];
-            lastData.forEach((member, index)=>{
-                if (member.type != '观众') {
-                    const name = member.name == undefined ? '' : '-' + member.name;
-                    if (member.deviceCode) {
-                        const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
-                        if (device) {
-                            if (device._type == 'Train') {
-                                member.label = member.type + device.groupNumber + name;
-                                lastMemberList.push(member);
-                                driverList.push(member);
-                            } else {
-                                member.label = member.type + device.name + name;
-                                lastMemberList.push(member);
-                                if (device._type == 'Station') {
-                                    stationSupervisorList.push(member);
-                                }
-                            }
-                        } else {
-                            member.label = member.type + member.deviceCode + name;
-                            lastMemberList.push(member);
-                        }
-                    } else {
-                        member.label = member.type + name;
-                        if (member.type == '行调') {
-                            dispatcherList.push(member);
-                        } else if (member.type == '通号') {
-                            maintainerList.push(member);
-                        }
-                        lastMemberList.push(member);
-                    }
-                }
-            });
-            this.treeData = [{
-                label: '行调',
-                id: 'dispatcher',
-                type: 'role',
-                children: dispatcherList
-            }, {
-                label: '车站值班员',
-                id: 'stationSupervisor',
-                type: 'role',
-                children: stationSupervisorList
-            }, {
-                label: '司机',
-                id: 'driver',
-                type: 'role',
-                children: driverList
-            }, {
-                label: '通号',
-                id: 'maintainer',
-                type: 'role',
-                children: maintainerList
-            }];
-            this.memberData = lastMemberList;
-            // 以上待优化
-        },
         // 退出剧本
         handleQuitQuest() {
             quitScriptNew(this.group).then(resp => {
@@ -368,6 +535,11 @@ export default {
                         this.$store.dispatch('scriptRecord/updateBgSet', false);
                         this.userRole = '';
                         this.$refs.chatbox.clearAllData();
+                        // if (resp.data.planRunning) {
+                        //     this.$store.dispatch('training/start');// 仿真开始按计划行车
+                        // } else {
+                        //     this.$store.dispatch('training/over');// 仿真按计划行车结束
+                        // }
                     }).catch(()=>{
                         this.$messageBox(this.$t('display.demon.exitTaskFail'));
                     });
@@ -408,12 +580,15 @@ export default {
         //     this.panelShow = true;
         //     this.drivingShow = false;
         // },
-        runPlanViewShow() {
+        viewRunPlan() {
             this.$refs.runPlanView.doShow();
         },
-        runPlanLoadShow() {
+        loadRunPlan() {
             this.$refs.runPlanLoad.doShow();
         },
+        setFault() {
+            this.$refs.faultChoose.doShow();
+        },
         switchStationMode(val) {
             if (val == null && this.stationListMode.length > 0) {
                 this.showStation = this.stationListMode[0].value;
@@ -453,9 +628,20 @@ export default {
         user-select: none;
     }
     .display-draft {
-    position: absolute;
-    float: right;
-    right: 20px;
-    bottom: 15px;
-}
+        position: absolute;
+        float: right;
+        right: 20px;
+        bottom: 15px;
+    }
+    .schema {
+        z-index: 36;
+        display: inline;
+        position: absolute;
+        right: 5px;
+    }
+</style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+/deep/ .el-button+.el-button {
+        margin-left: 0px;
+    }
 </style>
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 73c20899a..cdf01d878 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -180,6 +180,7 @@ export default {
             clearTimeout(this.time);
         }
         this.$store.dispatch('scriptRecord/updateSimulationPause', false);
+        this.$store.dispatch('map/resetActiveTrainList', true);
     },
     mounted() {
         this.$nextTick(() => {
@@ -277,7 +278,7 @@ export default {
             exitRunPlan(this.group).then(() => {
                 this.$store.dispatch('training/over').then(() => {
                     this.$store.dispatch('training/setMapDefaultState').then(() => {
-                        this.$store.dispatch('map/resetActiveTrainList');
+                        this.$store.dispatch('map/resetActiveTrainList', false);
                         this.$store.dispatch('map/clearJlmapTrainView');
                         this.$store.dispatch('map/setTrainWindowShow', false);
                     });
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 24274f9e0..de1e66beb 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -1,17 +1,13 @@
 <template>
   <div>
     <div class="schema" :style="{top: offset+'px'}">
-      <el-select v-if="isDesignPlatform" v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
-        <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
-      </el-select>
       <el-select v-if="showSelectStation && isLocalStation && !isScript" v-model="showStationContent" style="width: 100px;" size="small" @change="switchStationModeInfo">
         <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
       <template v-if="!dataError">
         <el-button-group>
-          <el-button v-if="isDemon && isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewScriptRoles">{{ $t('display.schema.selectRoles') }}</el-button>
           <!-- 加载剧本 -->
-          <el-button v-if="isDemon && !isDesignPlatform && !isScheduling" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
+          <el-button v-if="isDemon && !isScheduling" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
           <!-- 运行图加载 -->
           <el-button v-if="notScript && running" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
           <el-button v-if="notScript && !running" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
@@ -35,7 +31,6 @@ import FaultChoose from './demon/faultChoose';
 import AddQuest from './demon/addQuest';
 import { OperateMode } from '@/scripts/ConstDic';
 import { getByGroupStationList } from '@/api/jmap/map';
-import {loadDraftScript, loadDraftScriptNew} from '@/api/designPlatform';
 import { getEveryDayRunPlanNew, loadScriptNew } from '@/api/simulation';
 import Vue from 'vue';
 
@@ -87,10 +82,6 @@ export default {
             showStationContent:'',
             isScriptCommand:false,
             faultMode: false,
-            swchList: [
-                { value: '01', name: '现地' },
-                { value: '02', name: '行调' }
-            ],
             firstLoad: true
         };
     },
@@ -107,9 +98,6 @@ export default {
         isDemon() {
             return this.$route.params.mode === 'demon';
         },
-        isDesignPlatform() { // 是否剧本预览页面
-            return this.$route.fullPath.includes('design/displayNew/demon');
-        },
         isScheduling() {
             return this.$route.query.prdType === '05';
         },
@@ -206,18 +194,9 @@ export default {
         viewRunQuest() {
             this.$refs.addQuest.doShow();
         },
-        viewScriptRoles() {
-            const row = {id: this.$route.query.scriptId, group:this.$route.query.group, drawWay:this.$route.query.drawWay};
-            this.$refs.addQuest.handleLoad(1, row);
-        },
         async selectQuest(row, id, mapLocation, roleName) {
             try {
-                let res;
-                if (this.isDesignPlatform) {
-                    res = this.drawWay ? await loadDraftScriptNew(id, this.group) : await loadDraftScript(row.id, id, this.group);
-                } else {
-                    res = await loadScriptNew(row.id, id, this.group);
-                }
+                const res = await loadScriptNew(row.id, id, this.group);
                 if (res && res.code == 200) {
                     this.questId = parseInt(row.id);
                     if (mapLocation) {
@@ -231,10 +210,6 @@ export default {
                 this.$messageBox(error.message);
             }
         },
-        switchMode(swch) {
-            this.$emit('switchMode', swch);
-            this.switchModeInner(swch);
-        },
         switchModeInner(swch) {
             let showMode = '03';
             if (swch == '01') {
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index 2b48b8db2..0312e63cb 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <div class="display-draft">
-      <!-- :style="{bottom: offsetBottom + 'px'}" -->
       <el-button-group>
         <el-button v-if="!isScriptCommand" type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
         <el-button v-if="!isScriptCommand" type="danger" :disabled="dataError" @click="end">初始化</el-button>
@@ -41,7 +40,7 @@ import { ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { mapGetters } from 'vuex';
 
 export default {
-    name: 'MenuTask',
+    name: 'MenuScript',
     components: {
         SetTime,
         ScriptChat,
@@ -185,7 +184,7 @@ export default {
                 this.$store.dispatch('training/over').then(() => {
                     this.$store.dispatch('training/setMapDefaultState').then(() => {
                         this.$store.dispatch('map/clearJlmapTrainView');
-                        this.$store.dispatch('map/resetActiveTrainList');
+                        this.$store.dispatch('map/resetActiveTrainList', false);
                         this.$store.dispatch('map/setTrainWindowShow', false);
                     });
                 });
@@ -196,7 +195,6 @@ export default {
         },
         back() {
             this.$store.dispatch('training/over').then(() => {
-                this.$store.dispatch('map/resetActiveTrainList');
                 history.go(-1);
                 Notification.closeAll();
             });
diff --git a/src/views/newMap/displayNew/scriptChat.vue b/src/views/newMap/displayNew/scriptChat.vue
index fc159f84b..394948313 100644
--- a/src/views/newMap/displayNew/scriptChat.vue
+++ b/src/views/newMap/displayNew/scriptChat.vue
@@ -7,11 +7,9 @@
     :conversition-id="conversitionId"
     :current-member-list="currentMemberList"
     :chat-content-list="chatContentList"
-    :script-tip="scriptTip"
     :is-start-record="isStartRecord"
     :invite-user-name="inviteUserName"
     :is-quit-show="isQuitShow"
-    @setScriptTip="setScriptTip"
     @resetCoversition="resetCoversition"
   />
 </template>
@@ -38,7 +36,6 @@ export default {
     },
     data() {
         return {
-            scriptTip:'',
             isHasCoversition:false,
             conversitionId:'',
             currentMemberList:[],
@@ -249,9 +246,6 @@ export default {
         }
     },
     methods:{
-        setScriptTip(scriptTip) {
-            this.scriptTip = scriptTip;
-        },
         addContent(simulationText) {
             const text = {};
             const member = this.currentMemberList.find(member=>{
@@ -268,7 +262,6 @@ export default {
         },
         resetCoversition() {
             this.conversitionId = '';
-            this.scriptTip = '';
             this.isHasCoversition = false;
             this.currentMemberList = [];
             this.chatContentList = [];
diff --git a/src/views/newMap/displayNew/scriptPreviewChat.vue b/src/views/newMap/displayNew/scriptPreviewChat.vue
index f9faed076..33e53c5cc 100644
--- a/src/views/newMap/displayNew/scriptPreviewChat.vue
+++ b/src/views/newMap/displayNew/scriptPreviewChat.vue
@@ -1,27 +1,29 @@
 <template>
-  <chat-box
-    ref="chatbox"
-    :group="group"
-    :is-show="isShow"
-    :tree-data="treeData"
-    :conversition-id="conversitionId"
-    :current-member-list="currentMemberList"
-    :chat-content-list="chatContentList"
-    :script-tip="scriptTip"
-    :is-start-record="isStartRecord"
-    :invite-user-name="inviteUserName"
-    :is-quit-show="isQuitShow"
-    @setScriptTip="setScriptTip"
-    @resetCoversition="resetCoversition"
-  />
+  <div>
+    <chat-box
+      ref="chatbox"
+      :group="group"
+      :is-show="isShow"
+      :tree-data="treeData"
+      :conversition-id="conversitionId"
+      :current-member-list="currentMemberList"
+      :chat-content-list="chatContentList"
+      :is-start-record="isStartRecord"
+      :invite-user-name="inviteUserName"
+      :is-quit-show="isQuitShow"
+      @resetCoversition="resetCoversition"
+    />
+    <script-tip ref="scriptTip" :offset="offset" :member-data="memberData" @allowCreatCoversition="allowCreatCoversition" />
+  </div>
 </template>
 <script>
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import ChatBox from '../chatView/chatBox.vue';
+import ScriptTip from './scriptTip';
 export default {
     name:'ScriptPreviewChat',
     components:{
-        ChatBox
+        ChatBox,
+        ScriptTip
     },
     props: {
         group: {
@@ -39,11 +41,14 @@ export default {
         treeData:{
             type: Array,
             required: true
+        },
+        offset: {
+            type: Number,
+            required: true
         }
     },
     data() {
         return {
-            scriptTip:'',
             isHasCoversition:false,
             conversitionId:'',
             currentMemberList:[],
@@ -65,7 +70,7 @@ export default {
     watch:{
         // 创建会话
         '$store.state.socket.createConversition':function(val) {
-            this.scriptTip = '';
+            debugger;
             if (this.memberData.length > 0) {
                 const member = this.memberData.find(member=>{ return member.id == val.creatorId; });
                 if (member && member.userId == this.$store.state.user.id) {
@@ -125,46 +130,6 @@ export default {
                 this.currentMemberList = memberList;
             }
         },
-        // 剧本提示
-        '$store.state.socket.simulationScriptTip':function(val, old) {
-            if (val) {
-                if (val.type == 'Conversation') {
-                    this.scriptTip = '请说：' + val.content;
-                } else if (val.type == 'Operation') {
-                    const commandName = val.operationType;
-                    let device = val.operationType.split('_')[0];
-                    if (device == 'CM') {
-                        device = 'ControlConvertMenu';
-                    }
-                    const operateName = Object.values(CMD[device]).find(res=>{ return res.value == commandName; });
-                    this.$messageBox('请执行【' + operateName.label + '】操作');
-                } else if (val.type == 'Over_Conversation') {
-                    this.scriptTip = '请结束当前会话';
-                } else if (val.type == 'Start_Conversation' ) {
-                    const inviteMember = [];
-                    this.createCoversition = true;
-                    val.conversationMemberIds.forEach(id=>{
-                        if (val.memberId != id) {
-                            inviteMember.push((this.memberData.find(member=>{ return member.id == id; }) || {label:''}).label );
-                        }
-                    });
-                    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] + '】指令');
-                }
-            }
-        },
         // 会话聊天消息
         '$store.state.socket.conversationInfo':function (val, old) { //  仿真聊天
             const simulationText = this.$store.state.socket.conversationInfo;
@@ -175,12 +140,12 @@ export default {
         // 剧本执行完成消息
         '$store.state.socket.scriptFinish':function(val, old) {
             this.$message('剧本执行完成');
+            this.$refs.scriptTip.resetScriptTip();
         },
         // 退出会话消息
         '$store.state.socket.overConversition': function (val) {
             if (val.id === this.conversitionId) {
                 this.conversitionId = '';
-                this.scriptTip = '';
                 this.currentMemberList = [];
                 this.chatContentList = [];
                 this.isHasCoversition = false;
@@ -201,9 +166,6 @@ export default {
         }
     },
     methods:{
-        setScriptTip(scriptTip) {
-            this.scriptTip = scriptTip;
-        },
         addContent(simulationText) {
             const text = {};
             const member = this.currentMemberList.find(member=>{
@@ -224,7 +186,6 @@ export default {
         },
         resetCoversition() {
             this.conversitionId = '';
-            this.scriptTip = '';
             this.isHasCoversition = false;
             this.currentMemberList = [];
             this.chatContentList = [];
@@ -232,6 +193,9 @@ export default {
             this.inviteUserName = '';
             this.inviteUser = {};
             this.isQuitShow = false;
+        },
+        allowCreatCoversition() {
+            this.createCoversition = true;
         }
     }
 
diff --git a/src/views/newMap/displayNew/scriptTip.vue b/src/views/newMap/displayNew/scriptTip.vue
new file mode 100644
index 000000000..a51f57aca
--- /dev/null
+++ b/src/views/newMap/displayNew/scriptTip.vue
@@ -0,0 +1,92 @@
+<template>
+  <div v-if="scriptTipMessage!=''" class="scriptTipMessage" :style="{top:offset+'px'}">{{ scriptTipMessage }}</div>
+</template>
+<script>
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+export default {
+    name:'ScriptTip',
+    props: {
+        offset: {
+            type: Number,
+            required: true
+        },
+        memberData:{
+            type: Array,
+            required: true
+        }
+    },
+    data() {
+        return {
+            scriptTipMessage:''
+        };
+    },
+    watch:{
+        // 剧本提示
+        '$store.state.socket.simulationScriptTip':function(val, old) {
+            if (val) {
+                if (val.type == 'Conversation') {
+                    this.scriptTipMessage = '请说：' + val.content;
+                } else if (val.type == 'Operation') {
+                    const commandName = val.operationType;
+                    let device = val.operationType.split('_')[0];
+                    if (device == 'CM') {
+                        device = 'ControlConvertMenu';
+                    }
+                    const operateName = Object.values(CMD[device]).find(res=>{ return res.value == commandName; });
+                    this.scriptTipMessage = '请执行【' + operateName.label + '】操作';
+                } else if (val.type == 'Over_Conversation') {
+                    this.scriptTipMessage = '请结束当前会话';
+                } else if (val.type == 'Start_Conversation' ) {
+                    const inviteMember = [];
+                    this.$emit('allowCreatCoversition');
+                    val.conversationMemberIds.forEach(id=>{
+                        if (val.memberId != id) {
+                            inviteMember.push((this.memberData.find(member=>{ return member.id == id; }) || {label:''}).label );
+                        }
+                    });
+                    this.scriptTipMessage = '请创建会话,选择' + 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.scriptTipMessage = '请对【' + targetName.label + '】下达【' + CommandList[val.commandInitiateVO.commandType] + '】指令';
+                }
+            }
+        },
+        '$store.state.socket.simulationScriptTipFinish':function(val, old) {
+            // 剧本某一步骤完成消息推送
+            this.scriptTipMessage = '';
+        }
+    },
+    methods:{
+        resetScriptTip() {
+            this.scriptTipMessage = '';
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.scriptTipMessage{
+    position: absolute;
+    width: 400px;
+    padding: 15px 15px 20px 15px;
+    background: rgba(255,255,255,0.97);
+    top: 100px;
+    left: 50%;
+    border-radius: 8px;
+    -webkit-transform: translateX(-50%);
+    transform: translateX(-50%);
+    color: #000;
+    line-height: 180%;
+    z-index: 10;
+    font-size: 14px;
+}
+</style>
diff --git a/src/views/newMap/displayNew/selectRole.vue b/src/views/newMap/displayNew/selectRole.vue
new file mode 100644
index 000000000..faedc8a31
--- /dev/null
+++ b/src/views/newMap/displayNew/selectRole.vue
@@ -0,0 +1,68 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :title="$t('display.script.roleSelect')"
+    :visible.sync="roleShow"
+    top="50px"
+    width="350px"
+    :before-do-close="roleDoClose"
+    :close-on-click-modal="false"
+    :z-index="5000"
+  >
+    <div>
+      <el-form ref="ruleForm" :model="form" label-width="50px">
+        <el-form-item :label="$t('display.script.role')" prop="role">
+          <el-select v-model="form.type" :placeholder="$t('display.script.pleaseSelect')">
+            <el-option
+              v-for="item in memberList"
+              :key="item.id"
+              :label="item.label"
+              :value="item.id"
+              :disabled="item.disabled"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="roleDoClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" @click="confirm">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+    name:'SelectRole',
+    props:{
+        memberList:{
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            roleShow:false,
+            form: {
+                type: ''
+            }
+        };
+    },
+    methods:{
+        roleDoClose() {
+            this.$refs['ruleForm'].resetFields();
+            this.roleShow = false;
+        },
+        doShow() {
+            this.roleShow = true;
+        },
+        confirm() {
+            const role = this.memberList.find(elem=>{ return elem.id == this.form.type; });
+            this.$emit('selectRole', role);
+            this.roleDoClose();
+        }
+
+    }
+};
+</script>
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 31ac301bc..ba3d9d1ba 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -215,7 +215,7 @@ export default {
         this.$store.dispatch('training/setSimulationUserList', []);
         this.$store.dispatch('training/over').then(() => {
             this.backLoading = true;
-            this.$store.dispatch('map/resetActiveTrainList');
+            this.$store.dispatch('map/resetActiveTrainList', true);
             if (this.$route.query.projectDevice) {
                 this.$store.dispatch('LogOut').then(() => {
                     location.reload();
@@ -323,11 +323,11 @@ export default {
             this.isDisable = false;
             exitRunPlan(this.group).then(()=>{
                 this.$store.dispatch('map/setTrainWindowShow', false);
-                this.$store.dispatch('map/resetActiveTrainList');
+                this.$store.dispatch('map/resetActiveTrainList', false);
             }).catch(() => {
                 this.$store.dispatch('training/over').then(() => {
                     this.isDisable = true;
-                    this.$store.dispatch('map/resetActiveTrainList');
+                    this.$store.dispatch('map/resetActiveTrainList', false);
                     this.$messageBox(this.$t('error.endSimulationFailed'));
                 });
             });
@@ -344,7 +344,7 @@ export default {
             this.$store.dispatch('training/setSimulationUserList', []);
             this.$store.dispatch('training/over').then(() => {
                 this.backLoading = true;
-                this.$store.dispatch('map/resetActiveTrainList');
+                this.$store.dispatch('map/resetActiveTrainList', true);
                 if (this.$route.query.projectDevice) {
                     this.$store.dispatch('LogOut').then(() => {
                         location.reload();
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 16db3365f..e10c3c736 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -107,7 +107,7 @@ export default {
     beforeDestroy() {
         // this.clearAutoSave();
         this.$store.dispatch('training/setMemberList', {memberList:[], userId:this.$store.state.user.id});
-        this.$store.dispatch('map/resetActiveTrainList');
+        this.$store.dispatch('map/resetActiveTrainList', true);
         this.$store.dispatch('scriptRecord/updateBgSet', false);
         this.$store.dispatch('scriptRecord/updateRole', null);
     },