diff --git a/package.json b/package.json index 4dca0f6..cef346e 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", + "qrcodejs2": "^0.0.2", "tinymce": "^5.10.7", "view-design": "^4.7.0", "vue": "2.6.10", diff --git a/src/permission.js b/src/permission.js index c530be6..b91d764 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/login','/h5/login'] // no redirect whitelist +const whiteList = ['/login','/h5/login','/print'] // no redirect whitelist router.beforeEach(async(to, from, next) => { // start progress bar @@ -20,6 +20,12 @@ router.beforeEach(async(to, from, next) => { // determine whether the user has logged in const hasToken = getToken() + if (whiteList.indexOf(to.path) !== -1) { + // in the free login whitelist, go directly + next() + return + } + if (hasToken) { if (to.path === '/login' || to.path === '/h5/login') { // if is logged in, redirect to the home page diff --git a/src/router/index.js b/src/router/index.js index 4c9602d..e83d5de 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -47,6 +47,11 @@ export const constantRoutes = [ component: () => import("@/views/component/test.vue"), hidden: true, }, + { + path: '/print', + component:() => import("@/views/print/index.vue"), + hidden: true + }, { path: "/info", component: Layout, diff --git a/src/views/print/index.vue b/src/views/print/index.vue new file mode 100644 index 0000000..22d75e3 --- /dev/null +++ b/src/views/print/index.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/src/views/record/index.vue b/src/views/record/index.vue index 4415f6f..254cd07 100644 --- a/src/views/record/index.vue +++ b/src/views/record/index.vue @@ -261,7 +261,7 @@ " > @@ -335,6 +335,18 @@ export default { }; }, methods: { + toPrint (row) { + console.log(row); + const url = this.$router.resolve({ + path: '/print', + query: { + d: window.btoa(`id=${row.id}`) + } + }) + window.open(url.href) + }, + + index, destroy, download,