From cc0803630c179c0f34a8ca2f7c1785f8908b0f2b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 13 Aug 2020 11:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=B7=B3=E8=BD=AC=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E5=9B=BE=E7=AD=89=EF=BC=88=E6=9C=AA=E5=AE=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index_Common.js                    |  5 +++
 src/views/iscs/iscsSystem/nav.vue             |  2 -
 src/views/newMap/displayNew/menuDemon.vue     |  2 +-
 .../newMap/jointTrainingNew/menuDemon.vue     | 42 +++++++++++++++++++
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index 70c10b451..83e8d889b 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -353,6 +353,11 @@ export const publicAsyncRoute = [
                 hidden: true
             }
         ]
+    },
+    {
+        path: '/device/runPlan',
+        component: PlanMonitorDetail,
+        hidden: true
     }
 ];
 // 城市轨道项目
diff --git a/src/views/iscs/iscsSystem/nav.vue b/src/views/iscs/iscsSystem/nav.vue
index 84e28a1fc..55f621338 100644
--- a/src/views/iscs/iscsSystem/nav.vue
+++ b/src/views/iscs/iscsSystem/nav.vue
@@ -351,11 +351,9 @@ export default {
             this.$router.push({ path: `/design/home` });
         },
         changeCurrentSystem() {
-
             this.$router.push({
                 query:merge(this.$route.query, {'currentSystem':this.currentSystem})
             });
-
         }
     }
 };
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 2f8c82a2c..fecdee90b 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -460,7 +460,7 @@ export default {
 			float: left;
 			transition: all 0.5s;
 			overflow: hidden;
-            margin-left: -500px;
+            margin-left: -700px;
 			// transform: translateX(0px);
 		}
 	}
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 1db70b4db..b83dfb106 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -16,6 +16,9 @@
         <el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" size="small" @click="generateQrCode">生成二维码</el-button>
         <el-button v-if="isAdmin" size="small" @click="memberManage">成员管理</el-button>
         <el-button v-if="isAdmin && isProject" size="small" @click="handleEquipment">设备管理</el-button>
+        <el-button v-if="isDeviceLogin" size="small" @click="handleTeach">教学系统</el-button>
+        <el-button v-if="isDeviceLogin" size="small" @click="handleExam">考试系统</el-button>
+        <el-button v-if="isDeviceLogin" size="small" @click="handleRunPlan">运行图编制</el-button>
       </el-button-group>
     </div>
     <div class="display-draft" :class="{'display-type-hb': lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
@@ -150,6 +153,10 @@ export default {
                 num++;
             }
             return num > 0;
+        },
+        isDeviceLogin() {
+            const typeList = ['IM', 'LW', 'CW'];
+            return typeList.includes(this.$route.query.type);
         }
     },
     watch: {
@@ -426,6 +433,41 @@ export default {
             } else {
                 this.btnWidth = 0;
             }
+        },
+        handleTeach() {
+            const routeData = this.$router.resolve({
+                path:'/jlmap3d/passengerflow',
+                query:{
+                    mapid:this.mapId,
+                    group:this.group,
+                    project: this.project,
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
+        },
+        handleExam() {
+            const routeData = this.$router.resolve({
+                path:'/jlmap3d/passengerflow',
+                query:{
+                    mapid:this.mapId,
+                    group:this.group,
+                    project: this.project,
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
+        },
+        handleRunPlan() {
+            const routeData = this.$router.resolve({
+                path:'/device/runPlan',
+                query:{
+                    lineCode:this.$route.query.lineCode,
+                    madId: this.mapId,
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
         }
     }
 };