From ef85b05176ab368c9f0390726a564316d2333e76 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期二, 29 九月 2026 10:53:27 +0800
Subject: [PATCH] docs(交接): 09-29 记录——用户手工改母版(格式+删草稿)、G20 措辞按用户手工改动登记忽略、母版扩列器立项；工具加 USER_EDITS 类别
---
docs/工具/汇总大表差异比对.py | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git "a/docs/\345\267\245\345\205\267/\346\261\207\346\200\273\345\244\247\350\241\250\345\267\256\345\274\202\346\257\224\345\257\271.py" "b/docs/\345\267\245\345\205\267/\346\261\207\346\200\273\345\244\247\350\241\250\345\267\256\345\274\202\346\257\224\345\257\271.py"
index 4bab9e6..800c397 100644
--- "a/docs/\345\267\245\345\205\267/\346\261\207\346\200\273\345\244\247\350\241\250\345\267\256\345\274\202\346\257\224\345\257\271.py"
+++ "b/docs/\345\267\245\345\205\267/\346\261\207\346\200\273\345\244\247\350\241\250\345\267\256\345\274\202\346\257\224\345\257\271.py"
@@ -71,6 +71,9 @@
if norm_indicator(indicator) == norm_indicator(pat): return True
return False
+# 鐢ㄦ埛鎵嬪伐鏀瑰姩涓哄噯锛堜笉鍐嶈鍏ュ樊寮傦級
+USER_EDITS = {("鍩庡競姹囨��", "G20")}
+
def num(v):
return isinstance(v, (int, float)) and not isinstance(v, bool)
@@ -111,7 +114,8 @@
def main(gen, dgf, prefix):
ACTION = ("瀹炶川鏁板�煎樊寮�", "閿欒鍊�(绋嬪簭)", "閿欒鍊�(鎵嬪伐)", "闇�澶勭悊(闈炴暟鍊兼枃鏈�)", "鏂囨湰涓嶅悓")
IGNORE = ("宸插拷鐣�(鍗曡竟鏈夊��)", "宸插拷鐣�(缁撴瀯/璁捐)", "鍙栨暣灏惧樊(鍙拷鐣�)", "鏂囨湰鍨嬫暟瀛�(鍙拷鐣�)",
- "宸茬煡璁捐(姣嶇増鏂板琛�)", "宸茬煡璁捐(鏃犺〃澶磋崏绋垮垪)", "宸茬煡璁捐(鎺掑悕琛ㄥ綋鏈�/绱鍧�)", "鍏跺畠")
+ "宸茬煡璁捐(姣嶇増鏂板琛�)", "宸茬煡璁捐(鏃犺〃澶磋崏绋垮垪)", "宸茬煡璁捐(鎺掑悕琛ㄥ綋鏈�/绱鍧�)",
+ "宸茬煡宸紓(鐢ㄦ埛鎵嬪伐鏀瑰姩)", "鍏跺畠")
cats = list(ACTION) + list(IGNORE)
REASON = {(" 璐ц繍", "EA"): "2022骞村悇甯傚窞绱鍚屾瘮锛氫笟鍔″凡纭杞欢鍙ｅ緞姝ｇ‘锛堟墜宸ラ偅鍒楅敊锛�",
("鐝嚎鍖呰溅", "EO"): "绋嬪簭鐢熸垚鏃堕噸绠楋紙鐤戞瘝鐗�2020骞村潡鍒嗘瘝涓�0锛夛細姣嶇増/鎵嬪伐涓� 0.1818锛屽緟鏍稿",
@@ -197,15 +201,18 @@
cat = "闇�澶勭悊(闈炴暟鍊兼枃鏈�)"; note = "绋嬪簭=%s 鎵嬪伐=%s" % (str(vg)[:14], str(vd)[:14])
else:
cat = "鍏跺畠"; note = "绋嬪簭=%s 鎵嬪伐=%s" % (str(vg)[:14], str(vd)[:14])
+ if cat and (sh, "%s%d" % (get_column_letter(i+1), p+1)) in USER_EDITS:
+ bump("宸茬煡宸紓(鐢ㄦ埛鎵嬪伐鏀瑰姩)"); continue
if cat:
bump(cat)
rows_out.append([sh, "%s%d" % (get_column_letter(i+1), p+1), rl_g[p][:38], cl_g[i][:18], cat,
- ("" if vg is None else str(vg)[:20]), ("" if vd is None else str(vd)[:20]), note])
+ ("" if vg is None else str(vg)[:20]), ("" if vd is None else str(vd)[:20]), note,
+ "%s%d" % (get_column_letter(j+1), q+1)])
per_sheet.append((sh, cnt))
# 杈撳嚭 CSV
csv = prefix + ".csv"
with io.open(csv, "w", encoding="utf-8-sig", newline="") as f:
- f.write("椤电,鐢熸垚浠跺崟鍏冩牸,琛屾爣绛�,鍒楄〃澶�,绫诲埆,鐢熸垚浠跺��,鎵嬪伐鍊�,澶囨敞\n")
+ f.write("椤电,鐢熸垚浠跺崟鍏冩牸,琛屾爣绛�,鍒楄〃澶�,绫诲埆,鐢熸垚浠跺��,鎵嬪伐鍊�,澶囨敞,鎵嬪伐鍗曞厓鏍糪n")
for x in rows_out:
if x[4] not in ACTION: continue
f.write(",".join('"%s"' % str(v).replace('"', "'") for v in x) + "\n")
--
Gitblit v1.9.1