From fb39ae8906eff43b29dc388465caecdbbea9dc62 Mon Sep 17 00:00:00 2001
From: lichong <18518571399@163.com>
Date: Mon, 16 Dec 2024 19:08:28 +0800
Subject: [PATCH] 12.16

---
 package.json                      | 2 +-
 src/renderer/src/views/dangan.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 07ca6e7..6da6421 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "lichong",
diff --git a/src/renderer/src/views/dangan.vue b/src/renderer/src/views/dangan.vue
index 5ea1097..34b8008 100644
--- a/src/renderer/src/views/dangan.vue
+++ b/src/renderer/src/views/dangan.vue
@@ -237,7 +237,7 @@ export default {
       level1: [],
       level2: ["主卷", "副卷", "备考卷"],
       level3: {
-        "主卷": ["文字卷", "图纸卷", "照片卷", "拓片及慕本卷", "保护规划及保护工程方案卷", "文物调查及考古发掘卷", "文物保护工程及防治监测卷", "文物展示卷", "电子文件卷"],
+        "主卷": ["文字卷", "图纸卷", "照片卷", "拓片及摹本卷", "保护规划及保护工程方案卷", "文物调查及考古发掘卷", "文物保护工程及防治监测卷", "文物展示卷", "电子文件卷"],
         "副卷": ["行政管理文件", "法律文书卷", "大事记卷"],
         "备考卷": ["参考资料卷", "论文卷", "图书卷"],
       },
@@ -397,11 +397,11 @@ export default {
           let chineseCharsOnly = pdfText.match(/[\u4e00-\u9fa5]+/g);
           let juanName = chineseCharsOnly ? chineseCharsOnly.join('') : '';
           let treeItem = _.find(treeList, o => o.path === `${fileItem["项目名"]}\\${fileItem["卷名"]}\\${juanName}`)
-          let treeItem1 = _.find(treeList, o => _.startsWith(o.path, `${fileItem["项目名"]}\\${fileItem["卷名"]}`) && juanName.includes(o.label))
+          let treeItem1 = _.find(treeList, o => _.startsWith(o.path, `${fileItem["项目名"]}\\${fileItem["卷名"]}`) && juanName.includes(o.label.replaceAll("卷", "")))
           if (!treeItem1) {
             treeItem1 = _.find(treeList, o => _.startsWith(o.path, `${fileItem["项目名"]}\\${fileItem["卷名"]}`))
           }
-          let treeItem2 = _.find(treeList, o => _.startsWith(o.path, `${fileItem["项目名"]}}`) && juanName.includes(o.label))
+          let treeItem2 = _.find(treeList, o => _.startsWith(o.path, `${fileItem["项目名"]}}`) && juanName.includes(o.label.replaceAll("卷", "")))
           if (!treeItem2) {
             treeItem2 = _.find(treeList, o => _.startsWith(o.path, `${fileItem["项目名"]}}`))
           }