@@ -17657,7 +17684,6 @@ imports:
@@ -17670,15 +17696,15 @@ imported by:
SourceModule
@@ -17717,7 +17743,9 @@ imports:
•
os
•
re
•
tools
+ •
tools.Get_Json
•
tools.content_tools
+ •
tools.get_pictures
•
typing
•
utils.document_utils
•
utils.file_utils
@@ -17726,7 +17754,6 @@ imports:
@@ -17748,7 +17775,7 @@ imports:
@@ -18053,6 +18080,7 @@ imported by:
•
importlib.metadata._meta
•
importlib.resources
•
requests.adapters
+ •
tools.argtool
•
tools.content_tools
•
tools.document_tools
•
typing_extensions
diff --git a/dist/README.md b/dist/README.md
index ef588d4..30daade 100644
--- a/dist/README.md
+++ b/dist/README.md
@@ -4,10 +4,9 @@
本工具用于根据风机巡检数据自动生成 Word 报告。
支持 **配置文件** 与 **命令行参数** 两种输入方式，命令行可覆盖配置文件中的同名字段。
-## 2. 安装与准备
-1. 克隆或下载代码。
-2. 安装依赖（仅需标准库，无需额外包）。
-3. 准备模板目录（默认 `./muban`）与输出目录（默认 `./output`）。
+## 2. 准备
+1. 获取可执行程序
+2. 准备模板目录（默认 `./muban`）与输出目录（默认 `./output`）。
## 3. 配置文件（推荐）
在项目根目录新建 `config.json`（或任意文件名），格式如下：
diff --git a/dist/report_generator b/dist/report_generator
index d6ad102..052906c 100755
Binary files a/dist/report_generator and b/dist/report_generator differ
diff --git a/dist/report_generator.exe b/dist/report_generator.exe
new file mode 100755
index 0000000..c45998e
Binary files /dev/null and b/dist/report_generator.exe differ
diff --git a/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月24日版18.docx b/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月24日版18.docx
deleted file mode 100644
index 85a06fe..0000000
Binary files a/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月24日版18.docx and /dev/null differ
diff --git a/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版.docx b/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版.docx
new file mode 100644
index 0000000..a26a301
Binary files /dev/null and b/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版.docx differ
diff --git a/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版1.docx b/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版1.docx
new file mode 100644
index 0000000..7bc2304
Binary files /dev/null and b/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版1.docx differ
diff --git a/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版6.docx b/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版6.docx
new file mode 100644
index 0000000..421c0b3
Binary files /dev/null and b/output/三峡能源阿城万兴风电场防雷通道检测项目项目叶片外观、内部、防雷检查报告一期012号2025年07月25日版6.docx differ
diff --git a/report_generator b/report_generator
index d6ad102..8754f55 100755
Binary files a/report_generator and b/report_generator differ
diff --git a/tools/__pycache__/API.cpython-310.pyc b/tools/__pycache__/API.cpython-310.pyc
index acbf81a..baf6e7a 100644
Binary files a/tools/__pycache__/API.cpython-310.pyc and b/tools/__pycache__/API.cpython-310.pyc differ
diff --git a/tools/__pycache__/Get_Json.cpython-310.pyc b/tools/__pycache__/Get_Json.cpython-310.pyc
index 6dee677..4acc4fa 100644
Binary files a/tools/__pycache__/Get_Json.cpython-310.pyc and b/tools/__pycache__/Get_Json.cpython-310.pyc differ
diff --git a/tools/__pycache__/argtool.cpython-310.pyc b/tools/__pycache__/argtool.cpython-310.pyc
new file mode 100644
index 0000000..a9f06d1
Binary files /dev/null and b/tools/__pycache__/argtool.cpython-310.pyc differ
diff --git a/tools/__pycache__/dataproccess.cpython-310.pyc b/tools/__pycache__/dataproccess.cpython-310.pyc
index 42b1c71..76cfbdb 100644
Binary files a/tools/__pycache__/dataproccess.cpython-310.pyc and b/tools/__pycache__/dataproccess.cpython-310.pyc differ
diff --git a/tools/__pycache__/defines.cpython-310.pyc b/tools/__pycache__/defines.cpython-310.pyc
index 802b331..528ad42 100644
Binary files a/tools/__pycache__/defines.cpython-310.pyc and b/tools/__pycache__/defines.cpython-310.pyc differ
diff --git a/tools/__pycache__/document_tools.cpython-310.pyc b/tools/__pycache__/document_tools.cpython-310.pyc
index f577208..a87900a 100644
Binary files a/tools/__pycache__/document_tools.cpython-310.pyc and b/tools/__pycache__/document_tools.cpython-310.pyc differ
diff --git a/tools/argtool.py b/tools/argtool.py
index 0508d49..53440dd 100644
--- a/tools/argtool.py
+++ b/tools/argtool.py
@@ -19,8 +19,6 @@ def parse_arguments():
help='覆盖配置文件中的风机ID')
parser.add_argument('--output_dir', '--out', dest='output_dir',
help='覆盖配置文件中的输出目录')
- parser.add_argument('--template_dir', '--tpl', dest='template_dir',
- help='覆盖配置文件中的模板目录')
parser.add_argument('--if_waibu', type=lambda x: x.lower() in ('true', '1', 'yes'),
help='是否包含外部作业章节')
parser.add_argument('--if_neibu', type=lambda x: x.lower() in ('true', '1', 'yes'),
@@ -54,14 +52,12 @@ def merge_configs(default_cfg: Dict[str, Any],
'json1': {**default_cfg['json1'], **file_cfg.get('json1', {})},
'json2': {**default_cfg['json2'], **file_cfg.get('json2', {})}
}
-
+
# 高频覆盖项
if cli.turbine_id:
merged['json1']['turbine_id'] = cli.turbine_id
if cli.output_dir:
merged['json2']['shengcheng_dir'] = cli.output_dir
- if cli.template_dir:
- merged['json2']['muban_dir'] = cli.template_dir
for key in ('if_waibu', 'if_neibu', 'if_fanglei', 'userName',
'baogaoCheck', 'key_words', 'data_processor',
'jiancha_renyuan', 'check_date', 'coverurl', 'conclusion'):
@@ -78,7 +74,6 @@ def get_default_config() -> Dict[str, Dict[str, Any]]:
},
'json2': {
'shengcheng_dir': "",
- 'muban_dir': "",
"dianxing_enum": "TYPICAL",
"quexian_enum": "DEFECT",
"other_enum": "OTHER",
diff --git a/tools/dataproccess.py b/tools/dataproccess.py
index e9e2d14..a3342ec 100644
--- a/tools/dataproccess.py
+++ b/tools/dataproccess.py
@@ -1,6 +1,4 @@
-from tools.content_tools import add_picture_to_table
-from tools.document_tools import add_table_to_document,search_and_replace
-from tools.get_pictures import resize_and_reduce_quality
+import sys, os
def caculate_work_days(start_date : str, end_date : str) -> str:
"""根据起止日期计算工期
@@ -21,46 +19,7 @@ def caculate_work_days(start_date : str, end_date : str) -> str:
return (end_date - start_date).days
-async def add_dynamic_table(output_doc, output_dir, table_num, TABLES, JIANCHA_XIANGQING_DIR, PICTURES, row, col, i, FLAG, xuhao):
- """创建动态表
-
- Args:
- output_doc (Document): 文档对象
- output_dir (str): 输出目录
- table_num (int): 表格序号
- TABLES (list): 表格数据
- JIANCHA_XIANGQING_DIR (str): 检查详情表目录
- PICTURES (dict): 图片数据字典，键为表索引，值为图片路径列表
- row (int): 行数
- col (int): 列数
- i (int): 表格序号
- FLAG: 其他标志
-
- Returns:
- tuple: (i, table_num) 更新后的表格序号和表格数量
- """
- for table_idx, Table in enumerate(TABLES):
- print(Table)
- output_doc, message = await add_table_to_document(output_dir, JIANCHA_XIANGQING_DIR, row, col, i, Table, FLAG)
- print(message)
-
- # 获取当前表格对应的图片
- current_table_pictures = PICTURES.get(table_idx, [])
- print(f"开始处理图片列表: {current_table_pictures}")
-
- for picturedir in current_table_pictures:
- try:
- print(f"添加 {picturedir} {type(picturedir)}到表格{table_idx}")
- resize_and_reduce_quality(picturedir, picturedir)
- await add_picture_to_table(output_doc, output_dir, 4, 0, picturedir, i, 4.7232)
- except Exception as e:
- print(f"添加图片失败:{e}")
-
- print(await search_and_replace(output_dir, 'tupian_xuhao', f'{xuhao}'))
- table_num += 1
- i += 1
- xuhao += 1
- return i, table_num, xuhao
+
def get_year_month(date):
"""根据格式化date字符串获取年月 'date': '二〇二一年十二月十日 9:00'
@@ -169,4 +128,15 @@ def safe_get(data, *keys, default=None):
if isinstance(data, dict):
return safe_get(data.get(current_key), *keys[1:], default=default)
else:
- return default
\ No newline at end of file
+ return default
+
+def get_resource_path(relative_path):
+ """ 获取打包后资源的绝对路径 """
+ try:
+ # PyInstaller创建的临时文件夹
+ base_path = sys._MEIPASS
+ except AttributeError:
+ # 正常开发环境
+ base_path = os.path.abspath(".")
+
+ return os.path.join(base_path, relative_path)
\ No newline at end of file
diff --git a/tools/defines.py b/tools/defines.py
index a434592..92f5b1f 100644
--- a/tools/defines.py
+++ b/tools/defines.py
@@ -19,7 +19,6 @@ DEFAULT_BASE_INFO = { #项目基本信息
DEFAULT_BAOGAO_INFO = {
#目录
'shengcheng_dir': "", #报告生成的路径
- 'muban_dir': "", #文档模板存放路径
"dianxing_enum" : "TYPICAL",
"quexian_enum" : "DEFECT",
diff --git a/tools/document_tools.py b/tools/document_tools.py
index a5ec896..119835f 100644
--- a/tools/document_tools.py
+++ b/tools/document_tools.py
@@ -12,6 +12,8 @@ from core.styles import ensure_heading_style, ensure_table_style
from docx.oxml.shared import qn
from docx.oxml import OxmlElement
from tools.content_tools import search_and_replace,add_picture_to_table
+from tools.Get_Json import get_full_picture_url
+from tools.get_pictures import resize_and_reduce_quality
async def create_document(filename: str, title: Optional[str] = None, author: Optional[str] = None) -> str:
"""创建一个包含可选元数据的新Word文档。
@@ -557,6 +559,49 @@ async def right_align_last_three_para(target_filename: str) -> str:
except Exception as e:
return f"Failed to right align paragraphs: {str(e)}"
+async def add_dynamic_table(output_doc, output_dir, table_num, TABLES, JIANCHA_XIANGQING_DIR, PICTURES, row, col, i, FLAG, xuhao):
+ """创建动态表
+
+ Args:
+ output_doc (Document): 文档对象
+ output_dir (str): 输出目录
+ table_num (int): 表格序号
+ TABLES (list): 表格数据
+ JIANCHA_XIANGQING_DIR (str): 检查详情表目录
+ PICTURES (dict): 图片数据字典，键为表索引，值为图片路径列表
+ row (int): 行数
+ col (int): 列数
+ i (int): 表格序号
+ FLAG: 其他标志
+
+ Returns:
+ tuple: (i, table_num) 更新后的表格序号和表格数量
+ """
+ for table_idx, Table in enumerate(TABLES):
+ print(Table)
+ output_doc, message = await add_table_to_document(output_dir, JIANCHA_XIANGQING_DIR, row, col, i, Table, FLAG)
+ print(message)
+ # 获取当前表格对应的图片
+ current_table_pictures = PICTURES.get(table_idx, [])
+ print(f"开始处理图片列表: {current_table_pictures}")
+
+ for picturedir in current_table_pictures:
+ if picturedir is None:
+ print(f"图片路径为空，跳过")
+ continue
+ try:
+ print(f"添加 {picturedir} {type(picturedir)}到表格{table_idx}")
+ resize_and_reduce_quality(picturedir, picturedir)
+ await add_picture_to_table(output_doc, output_dir, 4, 0, picturedir, i, 4.7232)
+ except Exception as e:
+ print(f"添加图片失败:{e}")
+
+ print(await search_and_replace(output_dir, 'tupian_xuhao', f'{xuhao}'))
+ table_num += 1
+ i += 1
+ xuhao += 1
+ return i, table_num, xuhao
+
async def process_images_table(data_dict, output_dir, start_i, JIANCHA_NEIRONG_PICTURES_TABLE, key_words = None):
"""添加对应表格且填写图片名与插入图片
@@ -623,23 +668,28 @@ async def process_server_images_table(data_list, image_source_list, output_dir,
output_dir (str): 输出路径
start_i (int): 总表格数量
JIANCHA_NEIRONG_PICTURES_TABLE (str): 二维表模板路径
- key_words (list): 关键字列表，用于匹配图片名
+ key_words (re)
Returns:
int: 最后使用的表格序号
"""
- # 按来源对图片数据进行排序
+ # 按来源对图片数据进行分组和排序
sorted_data = {source: [] for source in image_source_list}
+
+ # 将图片数据按来源分组
for item in data_list:
- if item['imageSource'] in sorted_data:
- if key_words is None or any(keyword in item['imageName'] for keyword in key_words):
- sorted_data[item['imageSource']].append((item['imageName'], item['imagePath']))
-
- # 过滤掉空的来源列表
- sorted_data = {k: v for k, v in sorted_data.items() if v}
-
+ source = item['imageSource']
+ if source in sorted_data:
+ # 存储图片名和图片路径的元组，与非server版本保持一致
+ sorted_data[source].append((item['imageTypeLabel'], item['imagePath']))
+
i = start_i
- for source, items in sorted_data.items():
+ # 按照image_source_list的顺序处理每个来源的图片
+ for source in image_source_list:
+ items = sorted_data[source]
+ if not items:
+ continue # 如果该来源没有图片则跳过
+
print(f"处理来源: {source}")
picture_num = len(items)
line_index = 0
@@ -672,8 +722,8 @@ async def process_server_images_table(data_list, image_source_list, output_dir,
if picture_index < picture_num:
pic_path = items[picture_index][1] # 图片路径
print(f"当前为图片表格，在(0,{k})位置插入图片: {pic_path}")
- print(await add_picture_to_table(output_doc, output_dir, 0, k, pic_path, i, 1.8898))
+ print(await add_picture_to_table(output_doc, output_dir, 0, k, get_full_picture_url(pic_path), i, 1.8898))
picture_index += 1
i += 1
print(message)
- return i # 返回最后使用的表格序号
+ return i # 返回最后使用的表格序号
\ No newline at end of file
diff --git a/utils/__pycache__/__init__.cpython-39.pyc b/utils/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000..4299a45
Binary files /dev/null and b/utils/__pycache__/__init__.cpython-39.pyc differ
diff --git a/utils/__pycache__/document_utils.cpython-39.pyc b/utils/__pycache__/document_utils.cpython-39.pyc
new file mode 100644
index 0000000..45553aa
Binary files /dev/null and b/utils/__pycache__/document_utils.cpython-39.pyc differ
diff --git a/utils/__pycache__/file_utils.cpython-39.pyc b/utils/__pycache__/file_utils.cpython-39.pyc
new file mode 100644
index 0000000..b1d5849
Binary files /dev/null and b/utils/__pycache__/file_utils.cpython-39.pyc differ