Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

648540858

2022-04-22 1179a7ad0297f65ddd82b7324ac619f7800cf5af

 web_src/src/router/index.js

@@ -16,8 +16,9 @@
import sip from '../components/setting/Sip.vue'
import media from '../components/setting/Media.vue'
import live from '../components/live.vue'
import deviceTree from '../components/common/DeviceTree.vue'

import wasmPlayer from '../components/dialog/jessibuca.vue'
import wasmPlayer from '../components/common/jessibuca.vue'
import rtcPlayer from '../components/dialog/rtcPlayer.vue'

const originalPush = VueRouter.prototype.push
@@ -97,8 +98,6 @@
          name: 'media',
          component: media,
        },
        ]
    },
    {
      path: '/play/wasm/:url',
      name: 'wasmPlayer',
@@ -110,9 +109,21 @@
      component: rtcPlayer,
    },
    {
          path: '/map',
          name: 'devicePosition',
          component: devicePosition,
        },
        ]
    },
    {
      path: '/login',
      name: '登录',
      component: login,
    },
    {
      path: '/test',
      name: 'deviceTree',
      component: deviceTree,
    },
  ]
})