diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffa026..147680d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,7 @@ nprogress: ^0.2.0 path-browserify: ^1.0.1 path-to-regexp: ^6.2.1 + pdfjs-dist: 2.0.943 pinia: ^2.0.23 plop: ^3.1.1 postcss-html: ^1.5.0 @@ -69,7 +70,7 @@ vite-plugin-vue-layouts: ^0.6.0 vite-plugin-vue-setup-extend: ^0.4.0 vue: ^3.2.44 - vue-pdf-embed: ^1.1.5 + vue-pdf-embed: 1.1.5 vue-router: ^4.1.6 vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 @@ -97,6 +98,7 @@ nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.1 + pdfjs-dist: 2.0.943 pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm print-js: registry.npmmirror.com/print-js/1.6.0 qrcode: registry.npmmirror.com/qrcode/1.5.1 @@ -1652,6 +1654,14 @@ indent-string: 4.0.0 dev: true + /ajv-keywords/3.5.2_ajv@6.12.6: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + dev: false + /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1659,7 +1669,6 @@ fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true /ajv/8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} @@ -1907,7 +1916,6 @@ /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: true /bin-pack/1.0.2: resolution: {integrity: sha512-aOk0SxEon5LF9cMxQFViSKb4qccG6rs7XKyMXIb1J8f8LA2acTIWnHdT0IOTe4gYBbqgjdbuTZ5f+UP+vlh4Mw==} @@ -2877,7 +2885,6 @@ /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -3732,7 +3739,6 @@ /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-glob/3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -3747,7 +3753,6 @@ /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true /fast-levenshtein/2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} @@ -4996,7 +5001,6 @@ /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true /json-schema-traverse/1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} @@ -5019,7 +5023,6 @@ hasBin: true dependencies: minimist: 1.2.7 - dev: true /json5/2.2.1: resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} @@ -5194,7 +5197,6 @@ big.js: 5.2.2 emojis-list: 3.0.0 json5: 1.0.1 - dev: true /local-pkg/0.4.2: resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==} @@ -5515,7 +5517,6 @@ /minimist/1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} - dev: true /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -5657,6 +5658,10 @@ engines: {node: '>=v0.6.5'} dev: true + /node-ensure/0.0.0: + resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==} + dev: false + /node-html-parser/5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -6121,6 +6126,15 @@ resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} dev: true + /pdfjs-dist/2.0.943: + resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + node-ensure: 0.0.0 + worker-loader: 2.0.0 + dev: false + /performance-now/2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} dev: true @@ -6379,7 +6393,6 @@ /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - dev: true /qs/6.11.0: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} @@ -6744,6 +6757,14 @@ through: 2.3.8 dev: true + /schema-utils/0.4.7: + resolution: {integrity: sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==} + engines: {node: '>= 4'} + dependencies: + ajv: 6.12.6 + ajv-keywords: 3.5.2_ajv@6.12.6 + dev: false + /scroll-into-view-if-needed/2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: @@ -7860,7 +7881,6 @@ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 - dev: true /urix/0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} @@ -8294,6 +8314,16 @@ resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} dev: true + /worker-loader/2.0.0: + resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} + engines: {node: '>= 6.9.0 || >= 8.9.0'} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + loader-utils: 1.4.0 + schema-utils: 0.4.7 + dev: false + /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffa026..147680d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,7 @@ nprogress: ^0.2.0 path-browserify: ^1.0.1 path-to-regexp: ^6.2.1 + pdfjs-dist: 2.0.943 pinia: ^2.0.23 plop: ^3.1.1 postcss-html: ^1.5.0 @@ -69,7 +70,7 @@ vite-plugin-vue-layouts: ^0.6.0 vite-plugin-vue-setup-extend: ^0.4.0 vue: ^3.2.44 - vue-pdf-embed: ^1.1.5 + vue-pdf-embed: 1.1.5 vue-router: ^4.1.6 vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 @@ -97,6 +98,7 @@ nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.1 + pdfjs-dist: 2.0.943 pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm print-js: registry.npmmirror.com/print-js/1.6.0 qrcode: registry.npmmirror.com/qrcode/1.5.1 @@ -1652,6 +1654,14 @@ indent-string: 4.0.0 dev: true + /ajv-keywords/3.5.2_ajv@6.12.6: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + dev: false + /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1659,7 +1669,6 @@ fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true /ajv/8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} @@ -1907,7 +1916,6 @@ /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: true /bin-pack/1.0.2: resolution: {integrity: sha512-aOk0SxEon5LF9cMxQFViSKb4qccG6rs7XKyMXIb1J8f8LA2acTIWnHdT0IOTe4gYBbqgjdbuTZ5f+UP+vlh4Mw==} @@ -2877,7 +2885,6 @@ /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -3732,7 +3739,6 @@ /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-glob/3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -3747,7 +3753,6 @@ /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true /fast-levenshtein/2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} @@ -4996,7 +5001,6 @@ /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true /json-schema-traverse/1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} @@ -5019,7 +5023,6 @@ hasBin: true dependencies: minimist: 1.2.7 - dev: true /json5/2.2.1: resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} @@ -5194,7 +5197,6 @@ big.js: 5.2.2 emojis-list: 3.0.0 json5: 1.0.1 - dev: true /local-pkg/0.4.2: resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==} @@ -5515,7 +5517,6 @@ /minimist/1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} - dev: true /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -5657,6 +5658,10 @@ engines: {node: '>=v0.6.5'} dev: true + /node-ensure/0.0.0: + resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==} + dev: false + /node-html-parser/5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -6121,6 +6126,15 @@ resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} dev: true + /pdfjs-dist/2.0.943: + resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + node-ensure: 0.0.0 + worker-loader: 2.0.0 + dev: false + /performance-now/2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} dev: true @@ -6379,7 +6393,6 @@ /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - dev: true /qs/6.11.0: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} @@ -6744,6 +6757,14 @@ through: 2.3.8 dev: true + /schema-utils/0.4.7: + resolution: {integrity: sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==} + engines: {node: '>= 4'} + dependencies: + ajv: 6.12.6 + ajv-keywords: 3.5.2_ajv@6.12.6 + dev: false + /scroll-into-view-if-needed/2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: @@ -7860,7 +7881,6 @@ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 - dev: true /urix/0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} @@ -8294,6 +8314,16 @@ resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} dev: true + /worker-loader/2.0.0: + resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} + engines: {node: '>= 6.9.0 || >= 8.9.0'} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + loader-utils: 1.4.0 + schema-utils: 0.4.7 + dev: false + /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} diff --git a/src/api/eqpt/MeasurementBusiness/detection.ts b/src/api/eqpt/MeasurementBusiness/detection.ts index bb9beca..d0bcf43 100644 --- a/src/api/eqpt/MeasurementBusiness/detection.ts +++ b/src/api/eqpt/MeasurementBusiness/detection.ts @@ -11,3 +11,12 @@ data, }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/reviewNotice/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffa026..147680d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,7 @@ nprogress: ^0.2.0 path-browserify: ^1.0.1 path-to-regexp: ^6.2.1 + pdfjs-dist: 2.0.943 pinia: ^2.0.23 plop: ^3.1.1 postcss-html: ^1.5.0 @@ -69,7 +70,7 @@ vite-plugin-vue-layouts: ^0.6.0 vite-plugin-vue-setup-extend: ^0.4.0 vue: ^3.2.44 - vue-pdf-embed: ^1.1.5 + vue-pdf-embed: 1.1.5 vue-router: ^4.1.6 vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 @@ -97,6 +98,7 @@ nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.1 + pdfjs-dist: 2.0.943 pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm print-js: registry.npmmirror.com/print-js/1.6.0 qrcode: registry.npmmirror.com/qrcode/1.5.1 @@ -1652,6 +1654,14 @@ indent-string: 4.0.0 dev: true + /ajv-keywords/3.5.2_ajv@6.12.6: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + dev: false + /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1659,7 +1669,6 @@ fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true /ajv/8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} @@ -1907,7 +1916,6 @@ /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: true /bin-pack/1.0.2: resolution: {integrity: sha512-aOk0SxEon5LF9cMxQFViSKb4qccG6rs7XKyMXIb1J8f8LA2acTIWnHdT0IOTe4gYBbqgjdbuTZ5f+UP+vlh4Mw==} @@ -2877,7 +2885,6 @@ /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -3732,7 +3739,6 @@ /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-glob/3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -3747,7 +3753,6 @@ /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true /fast-levenshtein/2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} @@ -4996,7 +5001,6 @@ /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true /json-schema-traverse/1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} @@ -5019,7 +5023,6 @@ hasBin: true dependencies: minimist: 1.2.7 - dev: true /json5/2.2.1: resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} @@ -5194,7 +5197,6 @@ big.js: 5.2.2 emojis-list: 3.0.0 json5: 1.0.1 - dev: true /local-pkg/0.4.2: resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==} @@ -5515,7 +5517,6 @@ /minimist/1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} - dev: true /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -5657,6 +5658,10 @@ engines: {node: '>=v0.6.5'} dev: true + /node-ensure/0.0.0: + resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==} + dev: false + /node-html-parser/5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -6121,6 +6126,15 @@ resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} dev: true + /pdfjs-dist/2.0.943: + resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + node-ensure: 0.0.0 + worker-loader: 2.0.0 + dev: false + /performance-now/2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} dev: true @@ -6379,7 +6393,6 @@ /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - dev: true /qs/6.11.0: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} @@ -6744,6 +6757,14 @@ through: 2.3.8 dev: true + /schema-utils/0.4.7: + resolution: {integrity: sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==} + engines: {node: '>= 4'} + dependencies: + ajv: 6.12.6 + ajv-keywords: 3.5.2_ajv@6.12.6 + dev: false + /scroll-into-view-if-needed/2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: @@ -7860,7 +7881,6 @@ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 - dev: true /urix/0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} @@ -8294,6 +8314,16 @@ resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} dev: true + /worker-loader/2.0.0: + resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} + engines: {node: '>= 6.9.0 || >= 8.9.0'} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + loader-utils: 1.4.0 + schema-utils: 0.4.7 + dev: false + /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} diff --git a/src/api/eqpt/MeasurementBusiness/detection.ts b/src/api/eqpt/MeasurementBusiness/detection.ts index bb9beca..d0bcf43 100644 --- a/src/api/eqpt/MeasurementBusiness/detection.ts +++ b/src/api/eqpt/MeasurementBusiness/detection.ts @@ -11,3 +11,12 @@ data, }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/reviewNotice/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/eqpt/MeasurementBusiness/review.ts b/src/api/eqpt/MeasurementBusiness/review.ts index 3f84f47..0b94af8 100644 --- a/src/api/eqpt/MeasurementBusiness/review.ts +++ b/src/api/eqpt/MeasurementBusiness/review.ts @@ -18,3 +18,12 @@ method: 'post', }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/examine/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffa026..147680d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,7 @@ nprogress: ^0.2.0 path-browserify: ^1.0.1 path-to-regexp: ^6.2.1 + pdfjs-dist: 2.0.943 pinia: ^2.0.23 plop: ^3.1.1 postcss-html: ^1.5.0 @@ -69,7 +70,7 @@ vite-plugin-vue-layouts: ^0.6.0 vite-plugin-vue-setup-extend: ^0.4.0 vue: ^3.2.44 - vue-pdf-embed: ^1.1.5 + vue-pdf-embed: 1.1.5 vue-router: ^4.1.6 vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 @@ -97,6 +98,7 @@ nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.1 + pdfjs-dist: 2.0.943 pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm print-js: registry.npmmirror.com/print-js/1.6.0 qrcode: registry.npmmirror.com/qrcode/1.5.1 @@ -1652,6 +1654,14 @@ indent-string: 4.0.0 dev: true + /ajv-keywords/3.5.2_ajv@6.12.6: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + dev: false + /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1659,7 +1669,6 @@ fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true /ajv/8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} @@ -1907,7 +1916,6 @@ /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: true /bin-pack/1.0.2: resolution: {integrity: sha512-aOk0SxEon5LF9cMxQFViSKb4qccG6rs7XKyMXIb1J8f8LA2acTIWnHdT0IOTe4gYBbqgjdbuTZ5f+UP+vlh4Mw==} @@ -2877,7 +2885,6 @@ /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -3732,7 +3739,6 @@ /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-glob/3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -3747,7 +3753,6 @@ /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true /fast-levenshtein/2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} @@ -4996,7 +5001,6 @@ /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true /json-schema-traverse/1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} @@ -5019,7 +5023,6 @@ hasBin: true dependencies: minimist: 1.2.7 - dev: true /json5/2.2.1: resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} @@ -5194,7 +5197,6 @@ big.js: 5.2.2 emojis-list: 3.0.0 json5: 1.0.1 - dev: true /local-pkg/0.4.2: resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==} @@ -5515,7 +5517,6 @@ /minimist/1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} - dev: true /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -5657,6 +5658,10 @@ engines: {node: '>=v0.6.5'} dev: true + /node-ensure/0.0.0: + resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==} + dev: false + /node-html-parser/5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -6121,6 +6126,15 @@ resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} dev: true + /pdfjs-dist/2.0.943: + resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + node-ensure: 0.0.0 + worker-loader: 2.0.0 + dev: false + /performance-now/2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} dev: true @@ -6379,7 +6393,6 @@ /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - dev: true /qs/6.11.0: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} @@ -6744,6 +6757,14 @@ through: 2.3.8 dev: true + /schema-utils/0.4.7: + resolution: {integrity: sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==} + engines: {node: '>= 4'} + dependencies: + ajv: 6.12.6 + ajv-keywords: 3.5.2_ajv@6.12.6 + dev: false + /scroll-into-view-if-needed/2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: @@ -7860,7 +7881,6 @@ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 - dev: true /urix/0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} @@ -8294,6 +8314,16 @@ resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} dev: true + /worker-loader/2.0.0: + resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} + engines: {node: '>= 6.9.0 || >= 8.9.0'} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + loader-utils: 1.4.0 + schema-utils: 0.4.7 + dev: false + /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} diff --git a/src/api/eqpt/MeasurementBusiness/detection.ts b/src/api/eqpt/MeasurementBusiness/detection.ts index bb9beca..d0bcf43 100644 --- a/src/api/eqpt/MeasurementBusiness/detection.ts +++ b/src/api/eqpt/MeasurementBusiness/detection.ts @@ -11,3 +11,12 @@ data, }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/reviewNotice/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/eqpt/MeasurementBusiness/review.ts b/src/api/eqpt/MeasurementBusiness/review.ts index 3f84f47..0b94af8 100644 --- a/src/api/eqpt/MeasurementBusiness/review.ts +++ b/src/api/eqpt/MeasurementBusiness/review.ts @@ -18,3 +18,12 @@ method: 'post', }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/examine/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index e127482..f5939f4 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -1,8 +1,19 @@ import request from '../index' +import request1 from '../request' const prefix = 'sys/' // 登录 +// export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { +// return request({ +// url: `${prefix}user/login`, +// method: 'post', +// headers: { +// sid: data.sid, +// }, +// data, +// }) +// } export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { - return request({ + return request1({ url: `${prefix}user/login`, method: 'post', headers: { diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffa026..147680d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,7 @@ nprogress: ^0.2.0 path-browserify: ^1.0.1 path-to-regexp: ^6.2.1 + pdfjs-dist: 2.0.943 pinia: ^2.0.23 plop: ^3.1.1 postcss-html: ^1.5.0 @@ -69,7 +70,7 @@ vite-plugin-vue-layouts: ^0.6.0 vite-plugin-vue-setup-extend: ^0.4.0 vue: ^3.2.44 - vue-pdf-embed: ^1.1.5 + vue-pdf-embed: 1.1.5 vue-router: ^4.1.6 vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 @@ -97,6 +98,7 @@ nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.1 + pdfjs-dist: 2.0.943 pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm print-js: registry.npmmirror.com/print-js/1.6.0 qrcode: registry.npmmirror.com/qrcode/1.5.1 @@ -1652,6 +1654,14 @@ indent-string: 4.0.0 dev: true + /ajv-keywords/3.5.2_ajv@6.12.6: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + dev: false + /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1659,7 +1669,6 @@ fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true /ajv/8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} @@ -1907,7 +1916,6 @@ /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: true /bin-pack/1.0.2: resolution: {integrity: sha512-aOk0SxEon5LF9cMxQFViSKb4qccG6rs7XKyMXIb1J8f8LA2acTIWnHdT0IOTe4gYBbqgjdbuTZ5f+UP+vlh4Mw==} @@ -2877,7 +2885,6 @@ /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -3732,7 +3739,6 @@ /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-glob/3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -3747,7 +3753,6 @@ /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true /fast-levenshtein/2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} @@ -4996,7 +5001,6 @@ /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true /json-schema-traverse/1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} @@ -5019,7 +5023,6 @@ hasBin: true dependencies: minimist: 1.2.7 - dev: true /json5/2.2.1: resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} @@ -5194,7 +5197,6 @@ big.js: 5.2.2 emojis-list: 3.0.0 json5: 1.0.1 - dev: true /local-pkg/0.4.2: resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==} @@ -5515,7 +5517,6 @@ /minimist/1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} - dev: true /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -5657,6 +5658,10 @@ engines: {node: '>=v0.6.5'} dev: true + /node-ensure/0.0.0: + resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==} + dev: false + /node-html-parser/5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -6121,6 +6126,15 @@ resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} dev: true + /pdfjs-dist/2.0.943: + resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + node-ensure: 0.0.0 + worker-loader: 2.0.0 + dev: false + /performance-now/2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} dev: true @@ -6379,7 +6393,6 @@ /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - dev: true /qs/6.11.0: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} @@ -6744,6 +6757,14 @@ through: 2.3.8 dev: true + /schema-utils/0.4.7: + resolution: {integrity: sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==} + engines: {node: '>= 4'} + dependencies: + ajv: 6.12.6 + ajv-keywords: 3.5.2_ajv@6.12.6 + dev: false + /scroll-into-view-if-needed/2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: @@ -7860,7 +7881,6 @@ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 - dev: true /urix/0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} @@ -8294,6 +8314,16 @@ resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} dev: true + /worker-loader/2.0.0: + resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} + engines: {node: '>= 6.9.0 || >= 8.9.0'} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + loader-utils: 1.4.0 + schema-utils: 0.4.7 + dev: false + /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} diff --git a/src/api/eqpt/MeasurementBusiness/detection.ts b/src/api/eqpt/MeasurementBusiness/detection.ts index bb9beca..d0bcf43 100644 --- a/src/api/eqpt/MeasurementBusiness/detection.ts +++ b/src/api/eqpt/MeasurementBusiness/detection.ts @@ -11,3 +11,12 @@ data, }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/reviewNotice/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/eqpt/MeasurementBusiness/review.ts b/src/api/eqpt/MeasurementBusiness/review.ts index 3f84f47..0b94af8 100644 --- a/src/api/eqpt/MeasurementBusiness/review.ts +++ b/src/api/eqpt/MeasurementBusiness/review.ts @@ -18,3 +18,12 @@ method: 'post', }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/examine/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index e127482..f5939f4 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -1,8 +1,19 @@ import request from '../index' +import request1 from '../request' const prefix = 'sys/' // 登录 +// export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { +// return request({ +// url: `${prefix}user/login`, +// method: 'post', +// headers: { +// sid: data.sid, +// }, +// data, +// }) +// } export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { - return request({ + return request1({ url: `${prefix}user/login`, method: 'post', headers: { diff --git a/src/api/system/user.ts b/src/api/system/user.ts index f0d36f8..4268a07 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -23,8 +23,8 @@ export function addUser(data: object) { return request1({ // baseURL, - // url: `${prefix}mgr/add`, - url: 'sysytem/mgr/add', + url: `${prefix}mgr/add`, + // url: 'sysytem/mgr/add', method: 'post', data, }) @@ -34,8 +34,8 @@ export function updateUser(data: object) { return request1({ // baseURL, - // url: `${prefix}mgr/update`, - url: 'system/mgr/update', + url: `${prefix}mgr/update`, + // url: 'system/mgr/update', method: 'post', data, }) diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffa026..147680d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,7 @@ nprogress: ^0.2.0 path-browserify: ^1.0.1 path-to-regexp: ^6.2.1 + pdfjs-dist: 2.0.943 pinia: ^2.0.23 plop: ^3.1.1 postcss-html: ^1.5.0 @@ -69,7 +70,7 @@ vite-plugin-vue-layouts: ^0.6.0 vite-plugin-vue-setup-extend: ^0.4.0 vue: ^3.2.44 - vue-pdf-embed: ^1.1.5 + vue-pdf-embed: 1.1.5 vue-router: ^4.1.6 vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 @@ -97,6 +98,7 @@ nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.1 + pdfjs-dist: 2.0.943 pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm print-js: registry.npmmirror.com/print-js/1.6.0 qrcode: registry.npmmirror.com/qrcode/1.5.1 @@ -1652,6 +1654,14 @@ indent-string: 4.0.0 dev: true + /ajv-keywords/3.5.2_ajv@6.12.6: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + dev: false + /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1659,7 +1669,6 @@ fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true /ajv/8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} @@ -1907,7 +1916,6 @@ /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: true /bin-pack/1.0.2: resolution: {integrity: sha512-aOk0SxEon5LF9cMxQFViSKb4qccG6rs7XKyMXIb1J8f8LA2acTIWnHdT0IOTe4gYBbqgjdbuTZ5f+UP+vlh4Mw==} @@ -2877,7 +2885,6 @@ /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -3732,7 +3739,6 @@ /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-glob/3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -3747,7 +3753,6 @@ /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true /fast-levenshtein/2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} @@ -4996,7 +5001,6 @@ /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true /json-schema-traverse/1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} @@ -5019,7 +5023,6 @@ hasBin: true dependencies: minimist: 1.2.7 - dev: true /json5/2.2.1: resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} @@ -5194,7 +5197,6 @@ big.js: 5.2.2 emojis-list: 3.0.0 json5: 1.0.1 - dev: true /local-pkg/0.4.2: resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==} @@ -5515,7 +5517,6 @@ /minimist/1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} - dev: true /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -5657,6 +5658,10 @@ engines: {node: '>=v0.6.5'} dev: true + /node-ensure/0.0.0: + resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==} + dev: false + /node-html-parser/5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -6121,6 +6126,15 @@ resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} dev: true + /pdfjs-dist/2.0.943: + resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + node-ensure: 0.0.0 + worker-loader: 2.0.0 + dev: false + /performance-now/2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} dev: true @@ -6379,7 +6393,6 @@ /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - dev: true /qs/6.11.0: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} @@ -6744,6 +6757,14 @@ through: 2.3.8 dev: true + /schema-utils/0.4.7: + resolution: {integrity: sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==} + engines: {node: '>= 4'} + dependencies: + ajv: 6.12.6 + ajv-keywords: 3.5.2_ajv@6.12.6 + dev: false + /scroll-into-view-if-needed/2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: @@ -7860,7 +7881,6 @@ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 - dev: true /urix/0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} @@ -8294,6 +8314,16 @@ resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} dev: true + /worker-loader/2.0.0: + resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} + engines: {node: '>= 6.9.0 || >= 8.9.0'} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + loader-utils: 1.4.0 + schema-utils: 0.4.7 + dev: false + /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} diff --git a/src/api/eqpt/MeasurementBusiness/detection.ts b/src/api/eqpt/MeasurementBusiness/detection.ts index bb9beca..d0bcf43 100644 --- a/src/api/eqpt/MeasurementBusiness/detection.ts +++ b/src/api/eqpt/MeasurementBusiness/detection.ts @@ -11,3 +11,12 @@ data, }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/reviewNotice/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/eqpt/MeasurementBusiness/review.ts b/src/api/eqpt/MeasurementBusiness/review.ts index 3f84f47..0b94af8 100644 --- a/src/api/eqpt/MeasurementBusiness/review.ts +++ b/src/api/eqpt/MeasurementBusiness/review.ts @@ -18,3 +18,12 @@ method: 'post', }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/examine/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index e127482..f5939f4 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -1,8 +1,19 @@ import request from '../index' +import request1 from '../request' const prefix = 'sys/' // 登录 +// export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { +// return request({ +// url: `${prefix}user/login`, +// method: 'post', +// headers: { +// sid: data.sid, +// }, +// data, +// }) +// } export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { - return request({ + return request1({ url: `${prefix}user/login`, method: 'post', headers: { diff --git a/src/api/system/user.ts b/src/api/system/user.ts index f0d36f8..4268a07 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -23,8 +23,8 @@ export function addUser(data: object) { return request1({ // baseURL, - // url: `${prefix}mgr/add`, - url: 'sysytem/mgr/add', + url: `${prefix}mgr/add`, + // url: 'sysytem/mgr/add', method: 'post', data, }) @@ -34,8 +34,8 @@ export function updateUser(data: object) { return request1({ // baseURL, - // url: `${prefix}mgr/update`, - url: 'system/mgr/update', + url: `${prefix}mgr/update`, + // url: 'system/mgr/update', method: 'post', data, }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index afdfb1c..2d58abe 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -109,6 +109,7 @@ this.token = '' this.roleList = [] this.roleNames = [] + localStorage.removeItem('currentSys') routeStore.removeRoutes() menuStore.setActived(0) resolve() diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffa026..147680d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,7 @@ nprogress: ^0.2.0 path-browserify: ^1.0.1 path-to-regexp: ^6.2.1 + pdfjs-dist: 2.0.943 pinia: ^2.0.23 plop: ^3.1.1 postcss-html: ^1.5.0 @@ -69,7 +70,7 @@ vite-plugin-vue-layouts: ^0.6.0 vite-plugin-vue-setup-extend: ^0.4.0 vue: ^3.2.44 - vue-pdf-embed: ^1.1.5 + vue-pdf-embed: 1.1.5 vue-router: ^4.1.6 vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 @@ -97,6 +98,7 @@ nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.1 + pdfjs-dist: 2.0.943 pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm print-js: registry.npmmirror.com/print-js/1.6.0 qrcode: registry.npmmirror.com/qrcode/1.5.1 @@ -1652,6 +1654,14 @@ indent-string: 4.0.0 dev: true + /ajv-keywords/3.5.2_ajv@6.12.6: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + dev: false + /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1659,7 +1669,6 @@ fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true /ajv/8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} @@ -1907,7 +1916,6 @@ /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: true /bin-pack/1.0.2: resolution: {integrity: sha512-aOk0SxEon5LF9cMxQFViSKb4qccG6rs7XKyMXIb1J8f8LA2acTIWnHdT0IOTe4gYBbqgjdbuTZ5f+UP+vlh4Mw==} @@ -2877,7 +2885,6 @@ /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -3732,7 +3739,6 @@ /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-glob/3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -3747,7 +3753,6 @@ /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true /fast-levenshtein/2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} @@ -4996,7 +5001,6 @@ /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true /json-schema-traverse/1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} @@ -5019,7 +5023,6 @@ hasBin: true dependencies: minimist: 1.2.7 - dev: true /json5/2.2.1: resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} @@ -5194,7 +5197,6 @@ big.js: 5.2.2 emojis-list: 3.0.0 json5: 1.0.1 - dev: true /local-pkg/0.4.2: resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==} @@ -5515,7 +5517,6 @@ /minimist/1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} - dev: true /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -5657,6 +5658,10 @@ engines: {node: '>=v0.6.5'} dev: true + /node-ensure/0.0.0: + resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==} + dev: false + /node-html-parser/5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -6121,6 +6126,15 @@ resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} dev: true + /pdfjs-dist/2.0.943: + resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + node-ensure: 0.0.0 + worker-loader: 2.0.0 + dev: false + /performance-now/2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} dev: true @@ -6379,7 +6393,6 @@ /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - dev: true /qs/6.11.0: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} @@ -6744,6 +6757,14 @@ through: 2.3.8 dev: true + /schema-utils/0.4.7: + resolution: {integrity: sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==} + engines: {node: '>= 4'} + dependencies: + ajv: 6.12.6 + ajv-keywords: 3.5.2_ajv@6.12.6 + dev: false + /scroll-into-view-if-needed/2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: @@ -7860,7 +7881,6 @@ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 - dev: true /urix/0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} @@ -8294,6 +8314,16 @@ resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} dev: true + /worker-loader/2.0.0: + resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} + engines: {node: '>= 6.9.0 || >= 8.9.0'} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + loader-utils: 1.4.0 + schema-utils: 0.4.7 + dev: false + /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} diff --git a/src/api/eqpt/MeasurementBusiness/detection.ts b/src/api/eqpt/MeasurementBusiness/detection.ts index bb9beca..d0bcf43 100644 --- a/src/api/eqpt/MeasurementBusiness/detection.ts +++ b/src/api/eqpt/MeasurementBusiness/detection.ts @@ -11,3 +11,12 @@ data, }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/reviewNotice/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/eqpt/MeasurementBusiness/review.ts b/src/api/eqpt/MeasurementBusiness/review.ts index 3f84f47..0b94af8 100644 --- a/src/api/eqpt/MeasurementBusiness/review.ts +++ b/src/api/eqpt/MeasurementBusiness/review.ts @@ -18,3 +18,12 @@ method: 'post', }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/examine/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index e127482..f5939f4 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -1,8 +1,19 @@ import request from '../index' +import request1 from '../request' const prefix = 'sys/' // 登录 +// export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { +// return request({ +// url: `${prefix}user/login`, +// method: 'post', +// headers: { +// sid: data.sid, +// }, +// data, +// }) +// } export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { - return request({ + return request1({ url: `${prefix}user/login`, method: 'post', headers: { diff --git a/src/api/system/user.ts b/src/api/system/user.ts index f0d36f8..4268a07 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -23,8 +23,8 @@ export function addUser(data: object) { return request1({ // baseURL, - // url: `${prefix}mgr/add`, - url: 'sysytem/mgr/add', + url: `${prefix}mgr/add`, + // url: 'sysytem/mgr/add', method: 'post', data, }) @@ -34,8 +34,8 @@ export function updateUser(data: object) { return request1({ // baseURL, - // url: `${prefix}mgr/update`, - url: 'system/mgr/update', + url: `${prefix}mgr/update`, + // url: 'system/mgr/update', method: 'post', data, }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index afdfb1c..2d58abe 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -109,6 +109,7 @@ this.token = '' this.roleList = [] this.roleNames = [] + localStorage.removeItem('currentSys') routeStore.removeRoutes() menuStore.setActived(0) resolve() diff --git a/src/utils/exportUtils.ts b/src/utils/exportUtils.ts index 3fe9a62..1ed2d23 100644 --- a/src/utils/exportUtils.ts +++ b/src/utils/exportUtils.ts @@ -18,3 +18,22 @@ window.URL.revokeObjectURL(href) // 释放blob对象 } } + +// 打印文件流 +export function printContent(content) { + var tagElements = document.getElementsByTagName('iframe') + for (var m = 0; m < tagElements.length; m++) { + if (tagElements[m].className === 'tmp-pdf') { + tagElements[m].parentNode.removeChild(tagElements[m])// 去除元素 + } + } + const iframe = document.createElement('iframe') + iframe.className = 'tmp-pdf' + iframe.style.display = 'none' + iframe.src = URL.createObjectURL(content) + document.body.appendChild(iframe) + setTimeout(() => { + iframe.contentWindow.print() + URL.revokeObjectURL(content) + }, 100) +} diff --git a/package.json b/package.json index e7ce0c1..7bf9f6a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", + "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", + "vue-pdf-embed": "1.1.5", "vue-router": "^4.1.6", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffa026..147680d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,7 @@ nprogress: ^0.2.0 path-browserify: ^1.0.1 path-to-regexp: ^6.2.1 + pdfjs-dist: 2.0.943 pinia: ^2.0.23 plop: ^3.1.1 postcss-html: ^1.5.0 @@ -69,7 +70,7 @@ vite-plugin-vue-layouts: ^0.6.0 vite-plugin-vue-setup-extend: ^0.4.0 vue: ^3.2.44 - vue-pdf-embed: ^1.1.5 + vue-pdf-embed: 1.1.5 vue-router: ^4.1.6 vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 @@ -97,6 +98,7 @@ nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.1 + pdfjs-dist: 2.0.943 pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm print-js: registry.npmmirror.com/print-js/1.6.0 qrcode: registry.npmmirror.com/qrcode/1.5.1 @@ -1652,6 +1654,14 @@ indent-string: 4.0.0 dev: true + /ajv-keywords/3.5.2_ajv@6.12.6: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + dev: false + /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1659,7 +1669,6 @@ fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true /ajv/8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} @@ -1907,7 +1916,6 @@ /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: true /bin-pack/1.0.2: resolution: {integrity: sha512-aOk0SxEon5LF9cMxQFViSKb4qccG6rs7XKyMXIb1J8f8LA2acTIWnHdT0IOTe4gYBbqgjdbuTZ5f+UP+vlh4Mw==} @@ -2877,7 +2885,6 @@ /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -3732,7 +3739,6 @@ /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true /fast-glob/3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -3747,7 +3753,6 @@ /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true /fast-levenshtein/2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} @@ -4996,7 +5001,6 @@ /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true /json-schema-traverse/1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} @@ -5019,7 +5023,6 @@ hasBin: true dependencies: minimist: 1.2.7 - dev: true /json5/2.2.1: resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} @@ -5194,7 +5197,6 @@ big.js: 5.2.2 emojis-list: 3.0.0 json5: 1.0.1 - dev: true /local-pkg/0.4.2: resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==} @@ -5515,7 +5517,6 @@ /minimist/1.2.7: resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} - dev: true /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -5657,6 +5658,10 @@ engines: {node: '>=v0.6.5'} dev: true + /node-ensure/0.0.0: + resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==} + dev: false + /node-html-parser/5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -6121,6 +6126,15 @@ resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} dev: true + /pdfjs-dist/2.0.943: + resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + node-ensure: 0.0.0 + worker-loader: 2.0.0 + dev: false + /performance-now/2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} dev: true @@ -6379,7 +6393,6 @@ /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - dev: true /qs/6.11.0: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} @@ -6744,6 +6757,14 @@ through: 2.3.8 dev: true + /schema-utils/0.4.7: + resolution: {integrity: sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==} + engines: {node: '>= 4'} + dependencies: + ajv: 6.12.6 + ajv-keywords: 3.5.2_ajv@6.12.6 + dev: false + /scroll-into-view-if-needed/2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: @@ -7860,7 +7881,6 @@ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 - dev: true /urix/0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} @@ -8294,6 +8314,16 @@ resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} dev: true + /worker-loader/2.0.0: + resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} + engines: {node: '>= 6.9.0 || >= 8.9.0'} + peerDependencies: + webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 + dependencies: + loader-utils: 1.4.0 + schema-utils: 0.4.7 + dev: false + /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} diff --git a/src/api/eqpt/MeasurementBusiness/detection.ts b/src/api/eqpt/MeasurementBusiness/detection.ts index bb9beca..d0bcf43 100644 --- a/src/api/eqpt/MeasurementBusiness/detection.ts +++ b/src/api/eqpt/MeasurementBusiness/detection.ts @@ -11,3 +11,12 @@ data, }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/reviewNotice/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/eqpt/MeasurementBusiness/review.ts b/src/api/eqpt/MeasurementBusiness/review.ts index 3f84f47..0b94af8 100644 --- a/src/api/eqpt/MeasurementBusiness/review.ts +++ b/src/api/eqpt/MeasurementBusiness/review.ts @@ -18,3 +18,12 @@ method: 'post', }) } +// 导出打印 +export function printPage(data: object) { + return request({ + url: '/resource/customer/examine/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/system/login.ts b/src/api/system/login.ts index e127482..f5939f4 100644 --- a/src/api/system/login.ts +++ b/src/api/system/login.ts @@ -1,8 +1,19 @@ import request from '../index' +import request1 from '../request' const prefix = 'sys/' // 登录 +// export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { +// return request({ +// url: `${prefix}user/login`, +// method: 'post', +// headers: { +// sid: data.sid, +// }, +// data, +// }) +// } export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) { - return request({ + return request1({ url: `${prefix}user/login`, method: 'post', headers: { diff --git a/src/api/system/user.ts b/src/api/system/user.ts index f0d36f8..4268a07 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -23,8 +23,8 @@ export function addUser(data: object) { return request1({ // baseURL, - // url: `${prefix}mgr/add`, - url: 'sysytem/mgr/add', + url: `${prefix}mgr/add`, + // url: 'sysytem/mgr/add', method: 'post', data, }) @@ -34,8 +34,8 @@ export function updateUser(data: object) { return request1({ // baseURL, - // url: `${prefix}mgr/update`, - url: 'system/mgr/update', + url: `${prefix}mgr/update`, + // url: 'system/mgr/update', method: 'post', data, }) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index afdfb1c..2d58abe 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -109,6 +109,7 @@ this.token = '' this.roleList = [] this.roleNames = [] + localStorage.removeItem('currentSys') routeStore.removeRoutes() menuStore.setActived(0) resolve() diff --git a/src/utils/exportUtils.ts b/src/utils/exportUtils.ts index 3fe9a62..1ed2d23 100644 --- a/src/utils/exportUtils.ts +++ b/src/utils/exportUtils.ts @@ -18,3 +18,22 @@ window.URL.revokeObjectURL(href) // 释放blob对象 } } + +// 打印文件流 +export function printContent(content) { + var tagElements = document.getElementsByTagName('iframe') + for (var m = 0; m < tagElements.length; m++) { + if (tagElements[m].className === 'tmp-pdf') { + tagElements[m].parentNode.removeChild(tagElements[m])// 去除元素 + } + } + const iframe = document.createElement('iframe') + iframe.className = 'tmp-pdf' + iframe.style.display = 'none' + iframe.src = URL.createObjectURL(content) + document.body.appendChild(iframe) + setTimeout(() => { + iframe.contentWindow.print() + URL.revokeObjectURL(content) + }, 100) +} diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue index 75f5a3c..75dc72e 100644 --- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue +++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue @@ -4,6 +4,8 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' import detection from './detection.vue' +import { printPage } from '@/api/eqpt/MeasurementBusiness/detection' +import { printContent } from '@/utils/exportUtils' const $route = useRoute() const $router = useRouter() const ruleFormRef = ref() // from组件 @@ -58,13 +60,20 @@ formEl?.resetFields() close() } +// 打印 +const print = () => { + printPage({ id: $route.query.id, pdf: true }).then((res) => { + // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' + printContent(res.data) + }) +}