Merge remote-tracking branch 'origin/wvp-28181-2.0' into map

# Conflicts:
#	web_src/src/components/UiHeader.vue
#	web_src/src/components/devicePosition.vue
#	web_src/src/components/live.vue
#	web_src/src/router/index.js

web_src/src/router/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
+import Layout from "../layout/index.vue"
 
 import control from '../components/control.vue'
 import deviceList from '../components/DeviceList.vue'
@@ -33,89 +34,87 @@ export default new VueRouter({
   routes: [
     {
       path: '/',
-      component: control,
-    },
-    {
-      path: '/live',
-      component: live,
-    },
-    {
-      path: '/deviceList',
-      component: deviceList,
-    },
-    {
-      path: '/pushVideoList',
-      component: pushVideoList,
-    },
-    {
-      path: '/streamProxyList',
-      component: streamProxyList,
+      name: 'home',
+      component: Layout,
+      redirect: '/control',
+      children: [
+        {
+          path: '/control',
+          component: control,
+        },
+        {
+          path: '/live',
+          component: live,
+        },
+        {
+          path: '/deviceList',
+          component: deviceList,
+        },
+        {
+          path: '/pushVideoList',
+          component: pushVideoList,
+        },
+        {
+          path: '/streamProxyList',
+          component: streamProxyList,
+        },
+        {
+          path: '/channelList/:deviceId/:parentChannelId/:count/:page',
+          name: 'channelList',
+          component: channelList,
+        },
+        {
+          path: '/parentPlatformList/:count/:page',
+          name: 'parentPlatformList',
+          component: parentPlatformList,
+        },
+        {
+          path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
+          name: 'devicePosition',
+          component: devicePosition,
+        },
+        {
+          path: '/cloudRecord',
+          name: 'cloudRecord',
+          component: cloudRecord,
+        },
+        {
+          path: '/mediaServerManger',
+          name: 'mediaServerManger',
+          component: mediaServerManger,
+        },
+        {
+          path: '/setting/web',
+          name: 'web',
+          component: web,
+        },
+        {
+          path: '/setting/sip',
+          name: 'sip',
+          component: sip,
+        },
+        {
+          path: '/setting/media',
+          name: 'media',
+          component: media,
+        },
+        {
+          path: '/play/wasm/:url',
+          name: 'wasmPlayer',
+          component: wasmPlayer,
+        },
+        {
+          path: '/play/rtc/:url',
+          name: 'rtcPlayer',
+          component: rtcPlayer,
+        },
+        ]
     },
     {
       path: '/login',
       name: '登录',
       component: login,
     },
-    {
-      path: '/channelList/:deviceId/:parentChannelId/:count/:page',
-      name: 'channelList',
-      component: channelList,
-    },
-    {
-      path: '/parentPlatformList/:count/:page',
-      name: 'parentPlatformList',
-      component: parentPlatformList,
-    },
-    {
-      path: '/devicePosition',
-      name: 'devicePosition',
-      component: devicePosition,
-    },
-    {
-      path: '/devicePosition/:deviceId',
-      name: 'devicePosition',
-      component: devicePosition,
-    },
-    {
-      path: '/devicePosition/:deviceId/:parentChannelId',
-      name: 'devicePosition',
-      component: devicePosition,
-    },
-    {
-      path: '/cloudRecord',
-      name: 'cloudRecord',
-      component: cloudRecord,
-    },
-    {
-      path: '/mediaServerManger',
-      name: 'mediaServerManger',
-      component: mediaServerManger,
-    },
-    {
-      path: '/setting/web',
-      name: 'web',
-      component: web,
-    },
-    {
-      path: '/setting/sip',
-      name: 'sip',
-      component: sip,
-    },
-    {
-      path: '/setting/media',
-      name: 'media',
-      component: media,
-    },
-    {
-      path: '/play/wasm/:url',
-      name: 'wasmPlayer',
-      component: wasmPlayer,
-    },
-    {
-      path: '/play/rtc/:url',
-      name: 'rtcPlayer',
-      component: rtcPlayer,
-    },
     {
       path: '/test',
       name: 'deviceTree',