diff --git a/config/dev.env.js b/config/dev.env.js
index 948bf812..3a34d56a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -2,6 +2,6 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',//环境版本号 如npm run build:${ENV_CONFIG},建议与spring.profiles.active=${ENV_CONFIG}一一对应
   VERSION: '"m1"',//产品版本号，nginx中通过此版本号导航到不同的静态资源目录，请求路径中用法如下：静态页面url=${DOMAIN}/${CONTEXT}/${VERSION}/#/{router.path}?${queryString}
-  CONTEXT:'"sys"',//对应spring中的server.context-path
+  CONTEXT:'"xm"',//对应spring中的server.context-path
   BASE_API: '"api"'//api访问的统一入口,最后形成的apiUrl=${BASE_API}/${VERSION}/${spring.application.name}/${CONTEXT}/${ctrlUrl}
 }
diff --git a/config/index.js b/config/index.js
index 3a6e2565..0a923fb3 100644
--- a/config/index.js
+++ b/config/index.js
@@ -18,7 +18,7 @@ module.exports = {
               '^/api/m1/xm': '/xm'
             }
       },
-      **/
+      
        '/api/m1/sys': {
          target: 'http://localhost:7015',
          changeOrigin: true,
@@ -26,7 +26,7 @@ module.exports = {
            '^/api/m1/sys': '/sys'
          }
        },
-      
+      **/
       // '/api/m1/pay': {
       //   target: 'http://localhost:7125',
       //   changeOrigin: true,
@@ -34,7 +34,7 @@ module.exports = {
       //     '^/api/m1/pay': '/pay'
       //   }
       // },
-
+      
       /**
     	'/api/m1/workflow': {
             target: 'http://localhost:7080',
@@ -55,7 +55,7 @@ module.exports = {
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8015, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 8067, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,
diff --git a/src/router/index.js b/src/router/index.js
index 1f9e4b06..3ee07bcf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,16 @@ Vue.use(Router)
 
 /* Layout */
 import Layout from '../views/layout/Layout'
-import routesSys from './routes_sys' 
+import routesWorkflow from './routes_workflow'
+import routesForm from './routes_form' 
+import routesXm from './routes_xm' 
+import routesDatavXm from './routes_datav_xm' 
+import routesArc from './routes_arc'
+import routesIm from './routes_im' 
 import routesMyWork from './routes_my_work'
 import routesOrder from './routes_order'
-export {Layout}
+
+export { Layout }
 
 /** note: submenu only apppear when children.length>=1
 *   detail see  https://panjiachen.github.io/vue-element-admin-site/#/router-and-nav?id=sidebar
@@ -35,21 +41,31 @@ export const constantRouterMap = [
   { path: '/login', component: _import('login/index'), hidden: true },
   { path: '/404', component: _import('errorPage/404'), hidden: true },
   { path: '/401', component: _import('errorPage/401'), hidden: true },
-  { path: '/changeEmailStepOne', component: _import('mdp/sys/user/ChangeEmailStepOne'), hidden: true },
-  { path: '/changeEmailStepTwo', component: _import('mdp/sys/user/ChangeEmailStepTwo'), hidden: true },
   {
     path: '',
     component: Layout,
     redirect: 'dashboard',
-    name:"首页", 
     meta:{title:'首页',icon: 'home-page'},
-    children: [{
-      path: 'dashboard',
-      component: _import('myWork/my/index'),
-      name: '首页',
-      meta: { title: '首页', icon: 'dashboard', noCache: true }
-    }]
-  }
+    children: [
+      {
+        path: 'dashboard',
+        component: _import('xm/XmOverview'),
+        name: '首页',
+        meta: { title: '首页', icon: 'home-page', noCache: true }
+      },
+      // {
+      //   path: 'updateUserInfo',
+      //   component: _import('mdp/sys/user/UpdateUserInfo'),
+      //   name: '账户设置',
+      //   meta: {
+      //     title: '修改个人信息',
+      //     icon: 'component'
+      //   }
+      // }
+    ],
+    hidden: false
+  }, 
+  
 ]
 
 export default new Router({
@@ -58,10 +74,13 @@ export default new Router({
   routes: constantRouterMap
 })
 
-
-let allRoutes=[] 
-
+let allRoutes = [] 
 allRoutes=allRoutes.concat(routesMyWork.routes);
-allRoutes=allRoutes.concat(routesSys.routes);
+allRoutes=allRoutes.concat(routesXm.routes); 
+allRoutes=allRoutes.concat(routesDatavXm.routes);
+allRoutes=allRoutes.concat(routesWorkflow.routes).concat(routesForm.routes)
+allRoutes=allRoutes.concat(routesArc.routes);
+allRoutes=allRoutes.concat(routesIm.routes);
 allRoutes=allRoutes.concat(routesOrder.routes);
-export const asyncRouterMap = allRoutes 
+
+export const asyncRouterMap = allRoutes
diff --git a/src/views/myWork/my/index.vue b/src/views/myWork/my/index.vue
index ac2c9ffd..3f964ec6 100644
--- a/src/views/myWork/my/index.vue
+++ b/src/views/myWork/my/index.vue
@@ -22,27 +22,27 @@
           </div>
         </div>
         <div class="m_right">
-          <div class="m_right_menu" @click="gotolink('xm','xm/core/xmProduct/XmProductMng')">
+          <div class="m_right_menu" @click="gotolink('xm','/xm/core/xmProduct/XmProductMng')">
             <img src="../img/cp.png" alt="">
             <span>产品管理</span>
           </div>
-           <div class="m_right_menu" @click="gotolink('xm','xm/core/xmMenu/XmMenuMng')">
+           <div class="m_right_menu" @click="gotolink('xm','/xm/core/xmMenu/XmMenuMng')">
             <img src="../img/xqgl.png" alt="">
             <span>需求管理</span>
           </div>
-           <div class="m_right_menu" @click="gotolink('xm','xm/core/xmProject/XmProjectAllMng')">
+           <div class="m_right_menu" @click="gotolink('xm','/xm/core/xmProject/XmProjectAllMng')">
             <img src="../img/xmgl.png" alt="">
             <span>项目管理</span>
           </div>
-           <div class="m_right_menu" @click="gotolink('xm','xm/core/xmGroup/XmGroupAllMng')">
+           <div class="m_right_menu" @click="gotolink('xm','/xm/core/xmGroup/XmGroupAllMng')">
             <img src="../img/tdgl.png" alt="">
             <span>团队管理</span>
           </div>
-           <div class="m_right_menu" @click="gotolink('xm','xm/core/xmTask/XmTaskCenter')">
+           <div class="m_right_menu" @click="gotolink('xm','/xm/core/xmTask/XmTaskCenter')">
             <img src="../img/kfrw.png" alt="">
             <span>开发任务</span>
           </div>
-           <div class="m_right_menu" @click="gotolink('xm','xm/core/xmQuestion/XmQuestionMng')">
+           <div class="m_right_menu" @click="gotolink('xm','/xm/core/xmQuestion/XmQuestionMng')">
             <img src="../img/qx.png" alt="">
             <span>缺陷管理</span>
           </div>
@@ -93,10 +93,11 @@ export default {
   methods: {
 
     gotolink(context,path) {
+      debugger;
       if(context==process.env.CONTEXT){
-        this.$router.replace(path);
+        this.$router.push({path:path});
       }else{
-        var prefixUrl=window.location.protocol+"//"+window.location.host+"/"+context+"/"+process.env.VERSION+"/#/"; //   返回https://mp.csdn.net
+        var prefixUrl=window.location.protocol+"//"+window.location.host+"/"+context+"/"+process.env.VERSION+"/#"; //   返回https://mp.csdn.net
         window.open(prefixUrl+path)
         NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
       }