From 31c8e8828fb5fb32e6036a6385907b3c7a8b5883 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 10 Jul 2020 14:39:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E5=8F=B7=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=B8=89=E7=BB=B4=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/jointTrainingNew/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 97a7368d4..ac609453d 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -475,7 +475,7 @@ export default {
             case 'STATION_SUPERVISOR': this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR'); this.hideIbp(); this.drivingShow = false; break;
             case 'AUDIENCE': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'AUDIENCE'); this.hideIbp(); break;
             case 'DRIVER': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'DRIVER'); break;
-            case 'MAINTAINER': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'MAINTAINER'); this.hideIbp(); break;
+            case 'MAINTAINER': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'MAINTAINER'); this.hideIbp(); this.jl3dmaintainershow = true; break;
             }
             if (this.isAdmin && this.adminMode) {
                 this.$store.dispatch('training/setPrdType', swch || '02');

From 54a5a29f26edf10af3f0dfc8ddb882f30c67ea8c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 10 Jul 2020 14:46:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E9=A2=84=E8=A7=88?=
 =?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

---
 .../newMap/displayNew/demon/addQuest.vue      | 34 +++++--
 src/views/newMap/displayNew/designIndex.vue   | 98 +++++++++----------
 src/views/newMap/displayNew/menuDemon.vue     | 38 ++-----
 src/views/newMap/displayNew/menuSchema.vue    |  1 +
 4 files changed, 85 insertions(+), 86 deletions(-)

diff --git a/src/views/newMap/displayNew/demon/addQuest.vue b/src/views/newMap/displayNew/demon/addQuest.vue
index acc221118..a5c7e2e2a 100644
--- a/src/views/newMap/displayNew/demon/addQuest.vue
+++ b/src/views/newMap/displayNew/demon/addQuest.vue
@@ -179,16 +179,34 @@ export default {
             let newMemberList = [];
             if (res.code == 200) {
                 if (res.data.memberList && res.data.memberList.length > 0) {
-                    // res.data.memberList
                     // newMemberList
-                    const playerList = res.data.memberList.filter(item => item.hasPlay === true);
-                    playerList.map(each=>{
-                        if (!each.deviceName && each.deviceCode) {
-                            const device = this.$store.getters['map/getDeviceByCode'](each.deviceCode);
+                    // const playerList = res.data.memberList.filter(item => item.hasPlay === true);
+                    // playerList.map(each=>{
+                    //     if (!each.deviceName && each.deviceCode) {
+                    //         const device = this.$store.getters['map/getDeviceByCode'](each.deviceCode);
+                    //         if (device.name) {
+                    //             each.deviceName = device.name;
+                    //         } else {
+                    //             each.deviceName = each.deviceCode;
+                    //         }
+                    //     }
+                    // });
+                    const activeMemberList = [];
+                    res.data.actionList.forEach((activeMember)=>{
+                        if (!(activeMemberList.length > 0 && activeMemberList.includes(activeMember.memberId))) {
+                            activeMemberList.push(activeMember.memberId);
+                        }
+                    });
+                    const playerList = res.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) {
-                                each.deviceName = device.name;
+                                member.deviceName = device.name;
                             } else {
-                                each.deviceName = each.deviceCode;
+                                member.deviceName = member.deviceCode;
                             }
                         }
                     });
@@ -199,6 +217,7 @@ export default {
                     this.mapLocation = res.data.mapLocation;
                 }
                 this.memberList = newMemberList || [];
+                debugger;
                 this.memberList.unshift({ id: '', name: this.$t('display.script.none'), role: 'no' });
             }
             this.roleShow = true;
@@ -215,7 +234,6 @@ export default {
             this.$emit('selectQuest', this.row, this.form.role, this.mapLocation, roleName.role);
             this.doClose();
             this.roleDoClose();
-
         },
 
         roleDoClose() {
diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue
index 37d62b294..0ec35803c 100644
--- a/src/views/newMap/displayNew/designIndex.vue
+++ b/src/views/newMap/displayNew/designIndex.vue
@@ -5,7 +5,7 @@
         <map-system-draft ref="mapCanvas" @back="back" />
       </transition>
 
-      <menu-demon
+      <!-- <menu-demon
         v-if="isDemon"
         ref="menuDemon"
         :offset="offset"
@@ -14,7 +14,15 @@
         @quitQuest="quitQuest"
         @hidepanel="hidepanel"
         @showScheduling="showScheduling"
-      />
+      /> -->
+
+      <chat-box ref="chatbox" :group="group" :user-role="userRole" />
+      <div class="display-draft">
+        <template v-if="isscriptRun">
+          <el-button v-if="!dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
+        </template>
+        <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
+      </div>
 
       <menu-schema
         v-if="isDemon"
@@ -34,23 +42,19 @@
 
     <!-- <Jl3d-Simulation v-show="simulationShow" ref="Jl3dSimulation" :panel-show="simulationShow" @showpanel="showpanel" /> -->
     <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
-
-    <fault-choose ref="faultChoose" :group="group" :offset="offset" />
     <run-plan-Load ref="runPlanLoad" :group="group" />
     <run-plan-view ref="runPlanView" :group="group" />
-    <!-- <add-quest ref="addQuest" @selectQuest="selectQuestNew" /> -->
   </div>
 </template>
 
 <script>
 import RunPlanLoad from './demon/runPlanLoad';
 import RunPlanView from './demon/runPlanView';
-import FaultChoose from './demon/faultChoose';
+import ChatBox from '../jointTrainingNew/newChatView/chatBox';
 import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
-import MenuDemon from '@/views/newMap/displayNew/menuDemon';
+import { quitScriptNew, scriptRePreview } from '@/api/simulation';
 import MenuSchema from '@/views/newMap/displayNew/menuSchema';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
-// import AddQuest from './demon/addQuest';
 import { mapGetters } from 'vuex';
 import { setGoodsTryUse } from '@/api/management/goods';
 import { clearSimulation, getSimulationInfoNew } from '@/api/simulation';
@@ -58,6 +62,7 @@ import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import { checkLoginLine } from '@/api/login';
 import { loadNewMapDataByGroup } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
+import { Notification } from 'element-ui';
 
 // 三维
 // import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
@@ -69,14 +74,11 @@ export default {
     components: {
         RunPlanLoad,
         RunPlanView,
-        FaultChoose,
-        // AddQuest,
+        ChatBox,
         MapSystemDraft,
-        MenuDemon,
         MenuSchema,
         MenuSystemTime,
         Jl3dDrive
-        // Scheduling
     },
     props: {
         size: {
@@ -99,10 +101,12 @@ export default {
             mouseNumTime: 0,
             mapBox: null,
             mapBoxP: null,
+            dataError: false,
             panelShow: true,
             simulationShow: false,
             drivingShow: false,
             scriptId:0, 		// 加载任务的Id
+            isscriptRun:false, // 剧本是否正在加载
             showStation: '',
             stationList: [],
             showSelectStation: false, // 是否展示现地选择设备集中站select
@@ -113,6 +117,7 @@ export default {
                 '04': '02', 	// 司机 => 行调
                 '05': ''		// 派班 => null
             },
+            userRole:'ADMIN',
             isDrive: this.prdType == '04'
         };
     },
@@ -146,17 +151,6 @@ export default {
             // return this.$route.query.prdType;
             return this.$store.state.training.prdType;
         },
-        userRole() {
-            if (this.prdType == '02') {
-                return 'DISPATCHER';
-            } else if (this.prdType == '01') {
-                return 'STATION_SUPERVISOR';
-            } else if (this.prdType == '04') {
-                return 'DRIVER';
-            } else {
-                return 'AUDIENCE';
-            }
-        },
         isDemon() {
             return this.mode === 'demon';
         },
@@ -264,10 +258,6 @@ export default {
         mousemove(e) {
             this.mouseNum = 1;
         },
-        // 退出脚本
-        async quitQuest() {
-            this.scriptId = 0;
-        },
         setPosition() {
             this.$nextTick(() => {
                 let offset = 15;
@@ -306,10 +296,13 @@ export default {
         // 加载仿真信息
         async loadSimulationInfo() {
             const resp = await getSimulationInfoNew(this.group);
-            if (resp && resp.code == 200) {
+            if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
-                this.questId = Number(resp.data.questId) || 0;
+                this.scriptId = Number(resp.data.scriptId) || 0;
                 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;
+                this.$messageBox('此地图数据正在维护中,无法运行！');
             }
         },
         // 加载地图数据
@@ -339,21 +332,20 @@ export default {
                 this.endViewLoading();
             }
         },
-        // 加载剧本
-        async runQuestLoadShow() {
-            this.$refs.addQuest.doShow();
-        },
         async runAddRolesLoadShow() {
-            // this.$refs.addQuest.doShow();
-            // const row={id: this.$route.query.scriptId};
             const row = {group: this.$route.query.group, id: this.$route.query.scriptId};
             this.$refs.addQuest.handleLoad(1, row);
         },
-        // selectQuestNew(row, id, mapLocation, roleName) {
-        //     this.$refs.
-        // },
+        async back() {
+            await clearSimulation(this.group);
+            this.$store.dispatch('training/over').then(() => {
+                history.go(-1);
+                Notification.closeAll();
+            });
+        },
         // 选择脚本
         async selectQuest(row) {
+            debugger;
             this.scriptId = parseInt(row.id);
             if (this.isDemon) {
                 this.$refs.menuDemon.initLoadPage();
@@ -362,6 +354,24 @@ export default {
                 this.$refs.menuScript.initLoadPage();
             }
         },
+        // 退出剧本
+        handleQuitQuest() {
+            quitScriptNew(this.group).then(resp => {
+                scriptRePreview(this.group).then(resp=>{
+                    getSimulationInfoNew(this.group).then(()=>{
+                        this.scriptId = 0;
+                        this.$store.dispatch('scriptRecord/updateSimulationPause', false);
+                        this.$refs.chatbox.clearAllData();
+                    }).catch(()=>{
+                        this.$messageBox(this.$t('display.demon.exitTaskFail'));
+                    });
+                }).catch(()=>{
+                    this.$messageBox(this.$t('display.demon.exitTaskFail'));
+                });
+            }).catch(() => {
+                this.$messageBox(this.$t('display.demon.exitTaskFail'));
+            });
+        },
 
         // 通过id加载地图数据
         async loadNewMapDataByGroup(group) {
@@ -379,12 +389,6 @@ export default {
             await clearSimulation(this.group);
             await this.$store.dispatch('training/over');
         },
-        // 仿真错误时，被动退出时调用
-        async back() {
-            if (this.isDemon) {
-                await this.$refs.menuDemon.back();
-            }
-        },
         // 设置使用时间
         async tryTime(param) {
             const data = {
@@ -409,9 +413,6 @@ export default {
                 this.$refs.Jl3dSimulation.show(this.mapId, this.group);
             }
         },
-        showScheduling() {
-            this.$refs.scheduling.doShow();
-        },
         showpanel() {
             this.panelShow = true;
             this.simulationShow = false;
@@ -426,9 +427,6 @@ export default {
         runPlanLoadShow() {
             this.$refs.runPlanLoad.doShow();
         },
-        // faultChooseShow() {
-        //     this.$refs.faultChoose.doShow();
-        // },
         setWindowSize() {
             this.$nextTick(() => {
                 const width = this.size ? this.size.width : this.width;
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index ce6b3963e..0e6ab0220 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -41,7 +41,7 @@ import { getGoodsTryUse } from '@/api/management/goods';
 import { ranAsPlan, exitRunPlan, clearSimulation, getSimulationInfoNew } from '@/api/simulation';
 import { PermissionType } from '@/scripts/ConstDic';
 import { getCountTime } from '@/utils/index';
-import { quitScriptNew, scriptRePreview } from '@/api/simulation';
+import { quitScriptNew } from '@/api/simulation';
 import { setGoodsTryUse } from '@/api/management/goods';
 
 export default {
@@ -248,35 +248,17 @@ export default {
             });
         },
         handleQuitQuest() {
-            if (this.$route.fullPath.includes('design/displayNew/demon') ) {
-                quitScriptNew(this.group).then(resp => {
-                    scriptRePreview(this.group).then(resp=>{
-                        getSimulationInfoNew(this.group).then(()=>{
-                            this.quitQuest();
-                            this.initLoadPage();
-                            this.clearAllData();
-                        }).catch(()=>{
-                            this.$messageBox(this.$t('display.demon.exitTaskFail'));
-                        });
-                    }).catch(()=>{
-                        this.$messageBox(this.$t('display.demon.exitTaskFail'));
-                    });
-                }).catch(() => {
+            quitScriptNew(this.group).then(resp => {
+                getSimulationInfoNew(this.group).then(()=>{
+                    this.quitQuest();
+                    this.initLoadPage();
+                    this.clearAllData();
+                }).catch(()=>{
                     this.$messageBox(this.$t('display.demon.exitTaskFail'));
                 });
-            } else {
-                quitScriptNew(this.group).then(resp => {
-                    getSimulationInfoNew(this.group).then(()=>{
-                        this.quitQuest();
-                        this.initLoadPage();
-                        this.clearAllData();
-                    }).catch(()=>{
-                        this.$messageBox(this.$t('display.demon.exitTaskFail'));
-                    });
-                }).catch(() => {
-                    this.$messageBox(this.$t('display.demon.exitTaskFail'));
-                });
-            }
+            }).catch(() => {
+                this.$messageBox(this.$t('display.demon.exitTaskFail'));
+            });
         },
         quitQuest() {
             this.$emit('quitQuest');
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index cc73b6680..998bc53fe 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -209,6 +209,7 @@ export default {
             try {
                 let res;
                 if (this.isDesignPlatform) {
+                    debugger;
                     res = this.drawWay ? await loadDraftScriptNew(id, this.group) : await loadDraftScript(row.id, id, this.group);
                 } else {
                     res = await loadScriptNew(row.id, id, this.group);