Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/router/index.js

@@ -116,41 +116,38 @@ export const constantRoutes = [
         props: true,
         component: () => import('@/views/equipment-management/equipment-management/equipment-management'),
         name: 'EquipmentManagement',
-        meta: { title: '设备管理', icon: 'date' },
-        children: [
-          {
-            path: 'equipment-detail/:id',
-            props: true,
-            component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
-            name: 'EquipmentDetail',
-            meta: { title: '设备详情' }
-          },
-          {
-            path: 'equipment-add',
-            props: true,
-            component: () => import('@/views/equipment-management/equipment-management/equipment-add'),
-            name: 'EquipmentAdd',
-            meta: { title: '设备新增' }
-          },
-          {
-            path: 'use-management',
-            props: true,
-            component: () => import('@/views/equipment-management/use-management/use-management'),
-            name: 'UseManagement',
-            meta: { title: '使用管理', icon: 'table' }
-          },
-          {
-            path: 'use-details/:id',
-            props: true,
-            component: () => import('@/views/equipment-management/use-management/use-details'),
-            name: 'UseDetails',
-            meta: { title: '使用详情', icon: 'table', activeMenu: '/use-details' }
-          }
+        meta: { title: '设备管理', icon: 'date' }
 
-
-        ]
+      },
+      {
+        path: 'equipment-detail/:id',
+        props: true,
+        component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
+        name: 'EquipmentDetail',
+        meta: { title: '设备详情' }
+      },
+      {
+        path: 'equipment-add',
+        props: true,
+        component: () => import('@/views/equipment-management/equipment-management/equipment-add'),
+        name: 'EquipmentAdd',
+        meta: { title: '设备新增' }
       },
 
+      {
+        path: 'use-management',
+        props: true,
+        component: () => import('@/views/equipment-management/use-management/use-management'),
+        name: 'UseManagement',
+        meta: { title: '使用管理', icon: 'table' }
+      },
+      {
+        path: 'use-details/:id',
+        props: true,
+        component: () => import('@/views/equipment-management/use-management/use-details'),
+        name: 'UseDetails',
+        meta: { title: '使用详情', icon: 'table', activeMenu: '/use-details' }
+      }
     ]
   },
   // 病历管理