From e3686634452289d43e750a44f30f72b0e7754866 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 00:26:56 +0800
Subject: [PATCH] 修复人员管理模块各标签页问题并完善设备、文件受控页面
---
src/components/UpPdfStamp/index.vue | 59 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/src/components/UpPdfStamp/index.vue b/src/components/UpPdfStamp/index.vue
index fd92a4e..b4277ee 100644
--- a/src/components/UpPdfStamp/index.vue
+++ b/src/components/UpPdfStamp/index.vue
@@ -20,6 +20,7 @@
<script>
import jsPDF from 'jspdf'
+import workerUrl from 'pdfjs-dist/build/pdf.worker.min.mjs?worker&url'
// 鍘熷疄鐜扮敤 require("@/assets/stamps/" + name + ".png")锛孷ite 閲屾病鏈� require锛�
// 鐢� import.meta.glob 鎶婂嵃绔犲浘鎵撴垚涓�寮� 鍚嶅瓧鈫扷RL 鐨勮〃锛屾晥鏋滅瓑浠枫��
@@ -97,10 +98,22 @@
this.$message.error('璇烽�夋嫨 PDF 鏂囦欢')
}
},
- loadPDF(typedArray) {
- pdfjsLib.getDocument(typedArray).promise.then(pdfDoc_ => {
- this.pdfDoc = pdfDoc_
- this.canvasNumPages = this.pdfDoc._pdfInfo.numPages
+ async loadPDF(typedArray) {
+ try {
+ // 鐢ㄦ湰鍦版墦鍖呯殑 pdf.js锛屼笉鍐嶄緷璧栧叕缃� CDN锛涘唴缃戝姞杞戒笉鍒颁細閫犳垚棰勮鍖哄彧鍓╃┖鐧界敾甯�
+ const pdfjsLib = await import('pdfjs-dist/build/pdf.mjs')
+ pdfjsLib.GlobalWorkerOptions.workerSrc = workerUrl
+ const loadingTask = pdfjsLib.getDocument({
+ data: typedArray,
+ useWasm: false,
+ useSystemFonts: true,
+ isEvalSupported: false
+ })
+ const pdfDoc_ = await loadingTask.promise
+ // pdf.js 5 鐨勭被鍐呴儴鐢ㄤ簡 # 绉佹湁瀛楁锛岃 Vue3 鍝嶅簲寮忓寘鎴� Proxy 鍚� getPage 浼氭姏
+ // "Cannot read private member ... from an object whose class did not declare it"锛屽繀椤� markRaw
+ this.pdfDoc = markRaw(pdfDoc_)
+ this.canvasNumPages = pdfDoc_.numPages
this.stamps = []
this.contextList = []
for (let i = 1; i <= this.canvasNumPages; i++) {
@@ -109,11 +122,20 @@
})
this.stamps.push([])
}
- })
+ } catch (e) {
+ console.error('[UpPdfStamp] PDF 鍔犺浇澶辫触', e)
+ this.pdfDoc = null
+ this.canvasNumPages = 0
+ this.stamps = []
+ this.contextList = []
+ this.$message.error('鏂囦欢棰勮澶辫触锛岃妫�鏌ユ枃浠舵槸鍚︽崯鍧忔垨绋嶅悗閲嶈瘯')
+ this.$emit('uploadPDFErr')
+ }
},
// 娓叉煋鎸囧畾椤甸潰
- renderPage(pageNum) {
- this.pdfDoc.getPage(pageNum).then(page => {
+ async renderPage(pageNum) {
+ try {
+ const page = await this.pdfDoc.getPage(pageNum)
const canvas = this.canvasEls[pageNum - 1]
if (!canvas) return
// 鍘熷疄鐜版槸 push锛屼綅缃彇鍐充簬鍚勯〉 getPage 鐨� Promise 瀹屾垚椤哄簭锛�
@@ -124,17 +146,18 @@
canvas.width = viewport.width
canvas.height = viewport.height
- page
- .render({
- canvasContext: this.contextList[pageNum - 1],
- viewport: viewport
- })
- .promise.then(() => {
- this.stamps[pageNum - 1].forEach(m => {
- this.drawStamps(m.x, m.y, pageNum - 1)
- })
- })
- })
+ await page.render({
+ canvasContext: this.contextList[pageNum - 1],
+ viewport: viewport
+ }).promise
+ this.stamps[pageNum - 1].forEach(m => {
+ this.drawStamps(m.x, m.y, pageNum - 1)
+ })
+ } catch (e) {
+ console.error('[UpPdfStamp] PDF 椤甸潰娓叉煋澶辫触', e)
+ this.$message.error('鏂囦欢棰勮娓叉煋澶辫触锛岃绋嶅悗閲嶈瘯')
+ this.$emit('uploadPDFErr')
+ }
},
// 鍗曞嚮--娣诲姞绔�
handleCanvasClick(event, i) {
--
Gitblit v1.9.3