From 2cab25e092892a1b3423c738cf790ad097b02394 Mon Sep 17 00:00:00 2001
From: "weiye.wang" <kj_wangweiye@126.com>
Date: Mon, 5 Feb 2024 22:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E5=88=97=E8=AE=B2=E4=B9=89=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=83=BD=E5=8A=A0=E5=85=A5=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=A4=87=E8=AF=BE=E7=BB=84=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 工具v2/工具面板.py          | 1 +
 工具v2/文本文件/config.json | 6 +++---
 工具v2/系列讲义生成.py      | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/工具v2/工具面板.py b/工具v2/工具面板.py
index 902ac533..958014c6 100644
--- a/工具v2/工具面板.py
+++ b/工具v2/工具面板.py
@@ -130,6 +130,7 @@ menubar.add_cascade(label = "备课", menu = BKMenu)
 BKMenu.add_command(label = "讲义结构编号录入", command = lambda: SetButton("讲义结构编号录入",["讲义结构编号录入.py"]))
 BKMenu.add_command(label = "录入答题纸对应信息", command = lambda: SetButton("录入答题纸对应信息",["录入答题纸对应信息.py"]))
 BKMenu.add_command(label = "讲义生成", command = lambda: SetButton("讲义生成",["讲义生成.py"]))
+BKMenu.add_command(label = "系列讲义生成", command = lambda: SetButton("系列讲义生成",["系列讲义生成.py"]))
 BKMenu.add_separator()
 BKMenu.add_command(label = "添加基础知识梳理", command = lambda: SetButton("添加基础知识梳理",["添加基础知识梳理.py"]))
 # BKMenu.add_command(label = "题号清单生成", command = lambda: SetButton("题号清单生成",1,["题号清单生成.py"]))
diff --git a/工具v2/文本文件/config.json b/工具v2/文本文件/config.json
index 4317d110..0d4101a6 100644
--- a/工具v2/文本文件/config.json
+++ b/工具v2/文本文件/config.json
@@ -34,8 +34,8 @@
         }
     },
     "系列讲义生成.py": {
-        "讲义标题格式": "[EWGVI]202601\\d{2}",
-        "输出路径": "临时文件",
+        "讲义标题格式": "E202601\\d{2}",
+        "输出路径": "26届材料",
         "教师版": true, 
         "字段显示设置": {
             "题后空间": true,
@@ -47,7 +47,7 @@
             "使用记录说明": "[a,b]表示显示最好的a个和最差b个, 有-2表示不显示, 无-2但有-1表示全部显示",
             "来源": true,
             "备注": true,
-            "届别": []
+            "届别": ["2026届高一10班","2026届高一12班"]
         }
     }
 }
\ No newline at end of file
diff --git a/工具v2/系列讲义生成.py b/工具v2/系列讲义生成.py
index 8c4325ad..90e5fa0d 100644
--- a/工具v2/系列讲义生成.py
+++ b/工具v2/系列讲义生成.py
@@ -18,9 +18,12 @@ for loc,dirs,files in os.walk(jsonpath):
         jsondicts.append(load_dict(os.path.join(loc,"校本材料.json")))
 
 
-pro_dict = load_dict("../题库0.3/problems.json")
+raw_pro_dict = load_dict("../题库0.3/problems.json")
 obj_dict = load_dict("../题库0.3/LessonObj.json")
 basicknowledge_dict = load_dict("../题库0.3/BasicKnowledge.json")
+grades = configjson["字段显示设置"]["届别"]
+pro_dict = select_grade_from_pro_dict(raw_pro_dict,grades)
+
 
 dictionaries = {} #合并字典
 for t in (obj_dict,basicknowledge_dict,pro_dict):