与master分支同步

2020-12-16 20:29:19 +08:00
parent ecaf8750dd
commit 44d216100b
30 changed files with 829 additions and 450 deletions
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -35,7 +35,7 @@ export default new VueRouter({
      path: '/channelList/:deviceId/:parentChannelId/:count/:page',
      name: 'channelList',
      component: channelList,
-    },,
+    },
    {
      path: '/parentPlatformList/:count/:page',
      name: 'parentPlatformList',