合并develop最新代码

src/router/ems.js

@@ -80,6 +80,20 @@ export const dzjk=[
                 name: 'DzjkSbjkYl',
                 hidden: true,
                 meta: { title: '液冷',breadcrumb: false,activeMenu: '/dzjk/sbjk',activeSecondMenuName:'DzjkSbjk',deviceCategory:'COOLING'},
+              },
+              {
+                path: 'dh',
+                component: () => import('@/views/ems/dzjk/sbjk/dh/index.vue'),
+                name: 'DzjkSbjkDh',
+                hidden: true,
+                meta: { title: '动环',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk',deviceCategory:'DH'},
+              },
+              {
+                path: 'xf',
+                component: () => import('@/views/ems/dzjk/sbjk/xf/index.vue'),
+                name: 'DzjkSbjkXf',
+                hidden: true,
+                meta: { title: '消防',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk',deviceCategory:'XF'},
               }
             ]
           },