mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge again

Browse Source
This commit is contained in:
lb 2023-10-26 11:32:29 +08:00
parent 06e8a72f80
commit 503e988f7b
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.dev
View File

@ -12,10 +12,6 @@ ENV = 'development'
VUE_APP_TITLE = MES系统 VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
<<<<<<< HEAD
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
=======
VUE_APP_BASE_API = 'http://192.168.0.33:48082' VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
@ -23,7 +19,6 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.8:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
# VUE_APP_BASE_API = 'http://192.168.1.56:48080' # VUE_APP_BASE_API = 'http://192.168.1.56:48080'
# VUE_APP_BASE_API = 'http://192.168.1.188:48080' # VUE_APP_BASE_API = 'http://192.168.1.188:48080'
>>>>>>> projects/mes-test
# 路由懒加载 # 路由懒加载

11
src/router/index.js
View File

@ -73,16 +73,6 @@ export const constantRoutes = [
path: '/', path: '/',
component: Layout, component: Layout,
// redirect: 'core/base/factory', // redirect: 'core/base/factory',
<<<<<<< HEAD
children: [{
path: 'index',
// redirect: 'core/base/factory',
component: (resolve) => require(['@/views/index'], resolve),
name: '首页',
meta: { title: '首页', icon: 'dashboard', affix: true }
}
]
=======
// children: [{ // children: [{
// path: 'index', // path: 'index',
// redirect: 'core/base/factory', // redirect: 'core/base/factory',
@ -91,7 +81,6 @@ export const constantRoutes = [
// meta: { title: '首页', icon: 'dashboard', affix: true } // meta: { title: '首页', icon: 'dashboard', affix: true }
// } // }
// ] // ]
>>>>>>> projects/mes-test
}, },
{ {
path: '/user', path: '/user',