@@ -122,13 +122,8 @@ export default {
routerList: [
{
id: 1,
-<<<<<<< HEAD
path: "cockpitManage",
name: "首页",
-=======
- path: "/home/cockpitManage",
- name: "驾驶舱",
->>>>>>> 426f0b43f3a3fc4d5f4762ce74d3944c183a9d52
iconName: "gps",
meta: {
hidden: false,
