From 1076eb221591d19465a4c7944c5e00ab1d5db2f8 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 8 Jul 2020 13:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=99=BB=E5=BD=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue                     | 10 +++----
 src/views/newMap/jointTrainingNew/index.vue   | 26 ++++++++++++++++---
 src/views/publish/examRule/draft/editRule.vue | 10 +++----
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1087ce7f1..72276b664 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -414,17 +414,17 @@ export default {
                         if (this.$route.query.type == 'LSW') {
                             console.log('进入', `/bigSplitScreen/${resp.data.map.id}`);
                             this.$router.push({ path: `/bigSplitScreen/${resp.data.map.id}`, query: query });
-                        } else if (this.$route.query.type === 'ISCS_LW') {
-                            this.$router.push({ path: `/displayIscs/system`, query: query });
+                        } else if (this.$route.query.type === 'ISCS_LW' || this.$route.query.type === 'ISCS_CW') {
+                            this.$router.push({ path: `/displayIscs/system`, query: {
+                                group: res.data.group,
+                                projectDevice: this.$route.query.projectDevice,
+                                type: this.$route.query.type} });
                         } else if (this.$route.query.type == 'CCTV') {
                             this.$router.push({ path: `/jlmap3d/passengerflow`, query:{
                                 mapid:resp.data.map.id,
                                 group:res.data.group,
                                 project: getSessionStorage('project')
                             } });
-                        } else if (this.$route.query.type == 'VR_PSD') {
-                            // 待添加
-                            // this.$router.push({ path: `/bigSplitScreen/${resp.data.map.id}`, query: query });
                         } else {
                             this.$router.push({ path: `/jointTrainingNew`, query: query });
                         }
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 5a93f0170..addcbdc09 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -47,6 +47,12 @@
       <js-question v-if="project==='jsxt'" :offset="offset" :question-list="questionList" />
       <members-manage ref="membersManage" :is-admin="isAdmin" @addSimulationMember="addSimulationMember" />
       <add-member ref="addMember" />
+      <Jl3d-Device
+        v-if="deviceShow"
+        ref="Jl3dDevice"
+        :panel-show="deviceShow"
+        @closedevice3dview="devicemodel"
+      />
     </div>
   </div>
 
@@ -69,8 +75,9 @@ import { checkLoginLine } from '@/api/login';
 import { loadNewMapDataByGroup } from '@/utils/loaddata';
 import { clearSimulation, getSimulationInfoNew, getSimulationUserInfo, getSimulationMemberList, getAllSimulationUser } from '@/api/simulation';
 import {getRaceUserById, getTestPaperDatail} from '@/api/competition';
-import { getSessionStorage, getToken } from '@/utils/auth';
+import { getSessionStorage } from '@/utils/auth';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
+import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice';
 import Jl3dMaintainer from '@/views/jlmap3d/maintainer/jl3dmaintainer';
 import { EventBus } from '@/scripts/event-bus';
 import { timeFormat } from '@/utils/date';
@@ -79,7 +86,6 @@ import Vue from 'vue';
 import localStore from 'storejs';
 import MembersManage from './memberManage/membersManage';
 import AddMember from './memberManage/addMember';
-import { getLoginInfo } from '@/api/login';
 
 export default {
     name: 'JointTrainingDraft',
@@ -97,7 +103,8 @@ export default {
         IbpPlate,
         JsQuestion,
         MembersManage,
-        AddMember
+        AddMember,
+        Jl3dDevice
     },
     data() {
         return {
@@ -131,7 +138,8 @@ export default {
             questionList: [],
             practicalExamTime: 0,
             isAdmin: false,
-            adminMode: true
+            adminMode: true,
+            deviceShow: false
         };
     },
     computed: {
@@ -195,6 +203,9 @@ export default {
             this.mapViewLoadedOver = true;
             this.showSelectStation && this.setShowStation(this.showStation);
             this.initMemberUserInfo();
+            if (this.$route.query.type === 'VR_PSD') {
+                this.deviceShow = true;
+            }
         },
         '$store.state.socket.memberChangeCount': function () {
             this.initMemberUserInfo();
@@ -365,6 +376,13 @@ export default {
                 this.$messageBox('获取所有仿真用户失败！');
             });
         },
+        devicemodel() {
+            if (this.deviceShow == false) {
+                this.deviceShow = true;
+            } else {
+                this.deviceShow = false;
+            }
+        },
         async loadSimulationInfo() {
             const resp = await getSimulationInfoNew(this.group);
             if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue
index bea712797..f1397ba50 100644
--- a/src/views/publish/examRule/draft/editRule.vue
+++ b/src/views/publish/examRule/draft/editRule.vue
@@ -230,13 +230,13 @@ export default {
             this.dialogShow = true;
         },
         checkIncludes(list, obj) {
-        	let flag = false;
-        	list.forEach(item => {
-        		if (item.code === obj.value) {
-        			flag = true;
+            let flag = false;
+            list.forEach(item => {
+                if (item.code === obj.value) {
+                    flag = true;
                 }
             });
-        	return flag;
+            return flag;
         },
         handleOk() {
             this.$refs['form'].validate((valid) => {