Merge branch 'pre' into zz-dev

.gitlab-ci.yml

@@ -24,7 +24,7 @@ build_pre:
     - du -sh "$CI_PROJECT_DIR/.npm" "$CI_PROJECT_DIR/.npm/_cacache" 2>/dev/null || true
     - echo "=== npm ci start ==="
     - date -Iseconds
-    - npm ci --cache "$CI_PROJECT_DIR/.npm" --no-audit --no-fund --loglevel=verbose --timing --foreground-scripts
+    - npm ci --cache "$CI_PROJECT_DIR/.npm" --no-audit --no-fund --include=optional --loglevel=verbose --timing --foreground-scripts
     - echo "=== npm ci end ==="
     - date -Iseconds
     - npm run build
@@ -91,7 +91,7 @@ build_check:
     - du -sh "$CI_PROJECT_DIR/.npm" "$CI_PROJECT_DIR/.npm/_cacache" 2>/dev/null || true
     - echo "=== npm ci start ==="
     - date -Iseconds
-    - npm ci --cache "$CI_PROJECT_DIR/.npm" --no-audit --no-fund --loglevel=verbose --timing --foreground-scripts
+    - npm ci --cache "$CI_PROJECT_DIR/.npm" --no-audit --no-fund --include=optional --loglevel=verbose --timing --foreground-scripts
     - echo "=== npm ci end ==="
     - date -Iseconds
     - npm run build
\ No newline at end of file

package.json

@@ -36,7 +36,7 @@
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "markdown-it": "^14.1.0",
-    "pdfjs-dist": "^3.11.174",
+    "pdfjs-dist": "^5.5.207",
     "pinia": "^3.0.4",
     "vue": "^3.4.0",
     "vue-router": "^4.2.5"

src/views/exportControl/analysis/content/deepDig.vue

@@ -196,10 +196,10 @@ const setActivePanelId = id => {
 			background-image: url("../../assets/images/activeDown.png");
 		}
 		.iconUp {
-			background-image: url("../../assets/images/UnActiveUp.png");
+			background-image: url("../../assets/images/unActiveUp.png");
 		}
 		.iconDown {
-			background-image: url("../../assets/images/UnActiveDown.png");
+			background-image: url("../../assets/images/unActiveDown.png");
 		}
 	}
 	.activeItem {

src/views/innovationSubject/index.vue

@@ -2033,13 +2033,13 @@ onMounted(async () => {
 					.up {
 						width: 32px;
 						height: 32px;
-						background-image: url("src/views/innovationSubject/assets/images/icon-up.png");
+						background-image: url("./assets/images/icon-up.png");
 					}
 
 					.down {
 						width: 32px;
 						height: 32px;
-						background-image: url("src/views/innovationSubject/assets/images/icon-down.png");
+						background-image: url("./assets/images/icon-down.png");
 					}
 				}
 

src/views/thinkTank/reportOriginal/pdf.vue

@@ -12,9 +12,8 @@
 
 <script>
 import { ref, shallowRef, nextTick, watch } from 'vue';
-// 使用 legacy 入口，避免线上对 .mjs 的 MIME 配置导致 worker 动态 import 失败
-import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf';
-import pdfWorkerUrl from 'pdfjs-dist/legacy/build/pdf.worker.min?url';
+import * as pdfjsLib from 'pdfjs-dist/build/pdf.mjs';
+import pdfWorkerUrl from 'pdfjs-dist/build/pdf.worker.min.mjs?url';
 
 // 通过 Vite 的 ?url 产出静态资源地址，确保线上/线下都能正确加载 worker
 pdfjsLib.GlobalWorkerOptions.workerSrc = pdfWorkerUrl;