diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index 1d98d4b..af9827a 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -9,7 +9,7 @@ import defaultSettings from '@/settings' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register', '/ssoLogin','/scan'] +const whiteList = ['/login', '/register', '/ssoLogin'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index a257fd5..9962b8b 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -94,13 +94,7 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] - }, - //调用手机摄像扫码 - { - path: '/scan', - component: () => import('@/views/scan/scanPage'), - hidden: true - }, + } ] // 动态路由,基于用户权限动态去加载 diff --git a/ruoyi-ui/src/views/scan/scan.vue b/ruoyi-ui/src/views/scan/scan.vue deleted file mode 100644 index 642c45b..0000000 --- a/ruoyi-ui/src/views/scan/scan.vue +++ /dev/null @@ -1,204 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/scan/scanPage.vue b/ruoyi-ui/src/views/scan/scanPage.vue deleted file mode 100644 index 2d4a96e..0000000 --- a/ruoyi-ui/src/views/scan/scanPage.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/websocket/example/index.vue b/ruoyi-ui/src/views/websocket/example/index.vue index 83e1952..84e563f 100644 --- a/ruoyi-ui/src/views/websocket/example/index.vue +++ b/ruoyi-ui/src/views/websocket/example/index.vue @@ -1,17 +1,31 @@ @@ -20,7 +34,7 @@ export default { name: 'WebSocketExample', data() { return { - url: "ws://localhost:8080/websocket/message", + url: "ws://localhost:3334/websocket/message", message: "", text_content: "", ws: null,