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

panlinlin

2021-02-25 0f58218badea86a5209ae7f1ccd60b7cb4b26eee

 web_src/src/router/index.js

@@ -6,6 +6,7 @@
import channelList from '../components/channelList.vue'
import devicePosition from  '../components/devicePosition.vue'
import login from '../components/Login.vue'
import parentPlatformList from '../components/ParentPlatformList.vue'

const originalPush = VueRouter.prototype.push
VueRouter.prototype.push = function push(location) {
@@ -37,6 +38,11 @@
      component: channelList,
    },
    {
      path: '/parentPlatformList/:count/:page',
      name: 'parentPlatformList',
      component: parentPlatformList,
    },
    {
      path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
      name: 'devicePosition',
      component: devicePosition,