feat: 解决冲突

master
JINGYJ 2 weeks ago
parent 5deba54719
commit 8afcbc1fbf

@ -46,7 +46,7 @@ export const navControlsConf: ControlsItemType[] = [
}, },
{ {
icon: ControlIcon, icon: ControlIcon,
text: '控制管理' text: '控制管理'
}, },
{ {
icon: GlobalIcon, icon: GlobalIcon,
@ -78,6 +78,6 @@ export const navControlsConf: ControlsItemType[] = [
}, },
{ {
icon: RunModelIcon, icon: RunModelIcon,
text: '编辑运行界面' text: '运行模型'
} }
] ]

@ -9,11 +9,14 @@
import { createRouter, createWebHashHistory } from 'vue-router' import { createRouter, createWebHashHistory } from 'vue-router'
import Home from '@views/Home/index.vue' import Home from '@views/Home/index.vue'
import Design from '@views/Design/index.vue' import Design from '@views/Design/index.vue'
import TestLF from '@views/Test/logicFlow.vue' // import TestLF from '@views/Test/logicFlow.vue'
export default createRouter({ export default createRouter({
history: createWebHashHistory(), //hash模式 history: createWebHashHistory(), //hash模式
routes: [{ path: '/', component: Design }, { path: '/testLF', component: TestLF }] //路由配置规则数组 routes: [
{ path: '/', component: Design }
// { path: '/testLF', component: TestLF }
] //路由配置规则数组
}) })
/** 重置路由 */ /** 重置路由 */

Loading…
Cancel
Save