示教样式

src/config/mork.js

@@ -159,55 +159,9 @@ export const sysMenuBuild = () => {
           "menuId": "1654809097821884416",
           "pid": "1324783485328",
           "label": "示教",
-          "router": "",
+          "router": "/index/teach",
           "index": "5",
-          "children": [
+          "children": null,
-            {
-                "menuId": "1654809097821884417",
-                "pid": "1654809097821884416",
-                "label": "绘制地图",
-                "router": "/index/mapping",
-                "index": "1",
-                "children": null,
-                "title": "绘制地图",
-                "zhTitle": "绘制地图",
-                "enTitle": "Mapping",
-                "inTitle": null,
-                "zh_title": "绘制地图",
-                "en_title": "Mapping",
-                "in_title": null
-            },
-            {
-                "menuId": "1654809097821884418",
-                "pid": "1654809097821884416",
-                "label": "示教线路",
-                "router": "/index/sketch",
-                "index": "2",
-                "children": null,
-                "title": "示教线路",
-                "zhTitle": "示教线路",
-                "enTitle": "Sketch",
-                "inTitle": null,
-                "zh_title": "示教线路",
-                "en_title": "Sketch",
-                "in_title": null
-            },
-            {
-                "menuId": "1654809097821884419",
-                "pid": "1654809097821884416",
-                "label": "显示地图",
-                "router": "/index/map",
-                "index": "3",
-                "children": null,
-                "title": "显示地图",
-                "zhTitle": "显示地图",
-                "enTitle": "Map",
-                "inTitle": null,
-                "zh_title": "显示地图",
-                "en_title": "Map",
-                "in_title": null
-            }
-          ],
           "title": "示教",
           "zhTitle": "示教",
           "enTitle": "Teach",
@@ -311,7 +265,7 @@ export const sysMenuBuild = () => {
           "menuId": "1654809097821884416",
           "pid": "1324783485328",
           "label": "调试",
-          "router": "/index/teach",
+          "router": "/index/debug",
           "index": "7",
           "children": null,
           "title": "调试",

src/pages/modules/teach/debug.vue

@@ -0,0 +1,20 @@
+<template>
+  <div class="main-container main-container_l">
+    <div class="iframe_wrap">
+      <iframe class="iframe" src="./static/Magic4/HMI_JavaApp_FullScreen.html" frameborder="0"></iframe>
+    </div>
+  </div>
+</template>
+
+<style lang="stylus" scoped>
+@import '~@style/mixin'
+.main-container_l
+  width 100%
+  padding-left 53px
+.iframe_wrap
+  position relative
+  _wh(100%, 100%)
+  overflow hidden
+.iframe
+  _wh(100%, 100%)
+</style>

src/pages/modules/teach/teach.vue

@@ -1,18 +1,12 @@
 <template>
-  <div class="main-container main-container_l">
+  <div class="iframe_wrap">
-    <div class="iframe_wrap">
+    <iframe class="iframe" src="./static/Magic4/HMI_JavaApp_Map.html" frameborder="0"></iframe>
-      <iframe class="iframe" src="./static/Magic4/HMI_JavaApp_FullScreen.html" frameborder="0"></iframe>
-    </div>
   </div>
 </template>
 
 <style lang="stylus" scoped>
 @import '~@style/mixin'
-.main-container_l
-  width 100%
-  padding-left 53px
 .iframe_wrap
-  position relative
   _wh(100%, 100%)
   overflow hidden
 .iframe

src/pages/shells/index/index.vue

@@ -48,7 +48,7 @@
       <div class="hud_left"></div>
       <div class="hud_right"></div>
       <div class="bottom_bg"></div>
-      <div v-show="$route.path !== '/index/home' && $route.path !== '/index/errorinfo'" class="side-bar-container">
+      <div v-show="$route.path !== '/index/home' && $route.path !== '/index/errorinfo' && $route.path !== '/index/teach'" class="side-bar-container">
         <el-menu :default-active="$route.meta.guidePath" @select="handleSelectChild">
           <el-menu-item :index="menu.index" v-for="menu in childmenus" :key="menu.index" :class="{'el-menu-item-long': menu.title.length === 5 }">{{selectType === 'en-us' ? menu.en_title : menu.zh_title}}</el-menu-item>
         </el-menu>
@@ -96,8 +96,8 @@
 <script>
 import jxTime from '@components/time.vue'
 import jxDialog from '@components/dialog.vue'
-// import { sysMenuBuild } from '@/config/mork.js'
+import { sysMenuBuild } from '@/config/mork.js'
-import { sysMenuBuild, updatePass, authLogout } from '@config/getData2.js'
+import { updatePass, authLogout } from '@config/getData2.js'
 import { sendWebsocket, closeWebsocket } from '@/config/websocket.js'
 import {encrypt} from '../../../main.js'
 export default {
@@ -167,7 +167,7 @@ export default {
   },
   created () {
     this._sysMenuBuild()
-    this._queryHead()
+    // this._queryHead()
     // this.timer = setInterval(() => {
     //   this._queryHead()
     // }, this.itime)
@@ -198,7 +198,7 @@ export default {
         if (el.router === '' && el.index === key) {
           this.$router.push({ path: el.children[0].router })
         }
-        if (key === '7') {
+        if (key === '5' || key === '7') {
           this.$router.push({ path: el.router })
         }
       })

src/router/index.js

@@ -19,9 +19,7 @@ const VehicleControl = r => require.ensure([], () => r(require('@page/modules/ve
 const Slam = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/slam.vue')), 'modules')
 
 const Teach = r => require.ensure([], () => r(require('@page/modules/teach/teach.vue')), 'modules')
-const Mapping = r => require.ensure([], () => r(require('@page/modules/teach/mapping.vue')), 'modules')
+const Debug = r => require.ensure([], () => r(require('@page/modules/teach/debug.vue')), 'modules')
-const Sketch = r => require.ensure([], () => r(require('@page/modules/teach/sketch.vue')), 'modules')
-const Map = r => require.ensure([], () => r(require('@page/modules/teach/map.vue')), 'modules')
 
 const User = r => require.ensure([], () => r(require('@page/modules/SystemManage/user.vue')), 'modules')
 const Role = r => require.ensure([], () => r(require('@page/modules/SystemManage/role.vue')), 'modules')
@@ -85,17 +83,9 @@ const router = new VueRouter({
         component: Slam,
         meta: {jumpPath: '4', guidePath: '3'}
       }, {
-        path: 'mapping',
+        path: 'teach',
-        component: Mapping,
+        component: Teach,
         meta: {jumpPath: '5', guidePath: '1'}
-      }, {
-        path: 'sketch',
-        component: Sketch,
-        meta: {jumpPath: '5', guidePath: '2'}
-      }, {
-        path: 'map',
-        component: Map,
-        meta: {jumpPath: '5', guidePath: '3'}
       }, {
         path: 'user',
         component: User,
@@ -117,8 +107,8 @@ const router = new VueRouter({
         component: Remote,
         meta: {jumpPath: '6', guidePath: '5'}
       }, {
-        path: 'teach',
+        path: 'debug',
-        component: Teach,
+        component: Debug,
         meta: {jumpPath: '7', guidePath: '1'}
       }]
     }