.gitignore

@@ -1,202 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[codz]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py.cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# UV
-#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#uv.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-#poetry.toml
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#   pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
-#   https://pdm-project.org/en/latest/usage/project/#working-with-version-control
-#pdm.lock
-#pdm.toml
-.pdm-python
-.pdm-build/
-
-# pixi
-#   Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
-#pixi.lock
-#   Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
-#   in the .venv directory. It is recommended not to include this directory in version control.
-.pixi
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.envrc
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-# Abstra
-# Abstra is an AI-powered process automation framework.
-# Ignore directories containing user credentials, local state, and settings.
-# Learn more at https://abstra.io/docs
-.abstra/
-
-# Visual Studio Code
-#  Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
-#  that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
-#  and can be added to the global gitignore or merged into this file. However, if you prefer, 
-#  you could uncomment the following to ignore the entire vscode folder
-# .vscode/
-
-# Ruff stuff:
-.ruff_cache/
-
-# PyPI configuration file
-.pypirc
-
-# Marimo
-marimo/_static/
-marimo/_lsp/
-__marimo__/
-
-# Streamlit
-.streamlit/secrets.toml

Dt_report.py

@@ -2,13 +2,13 @@
 from tools.document_tools import (
     create_document, add_documents,add_table_and_replace,
     add_table_to_document,add_dynamic_table,
-    process_server_images_table,add_header,change_heading
+    process_server_images_table,add_header
 )
 
 # 内容处理工具
 from tools.content_tools import (
     add_picture,split_table_by_row_content,
-    search_and_replace,add_heading
+    search_and_replace
 )
 
 from tools.get_pictures import (
@@ -221,7 +221,6 @@ async def generate_dt_report(base_info, baogao_info):
     mianzhe_shengming = f"本报告仅涵盖{'、'.join(baogao_label)}检测内容"
 
     print(await create_document(output_dir))
-    change_heading(output_dir, "Heading 1", DT_EADING_1_CONFIG)
     if baogao_info["if_docx_fengmian"] : 
         #创建文档、添加封面
         print(add_documents(output_dir, cover_dirs[0]))
@@ -275,8 +274,7 @@ async def generate_dt_report(base_info, baogao_info):
         print("建立表结构完毕，开始插入模板")
         #添加项目概况表
         print(f"输出路径:{output_dir}，模板路径:{XIANG_MU_GAI_KUANG},插入数据：{XIANGMU_GAIKUO}")
-        print(add_heading(output_dir, f"一、项目概括", 1))
+        output_doc, message = add_table_to_document(output_dir, XIANG_MU_GAI_KUANG,5,5,total_table_num,XIANGMU_GAIKUO)
-        output_doc, message = add_table_to_document(output_dir, XIANG_MU_GAI_KUANG,5,5,total_table_num,XIANGMU_GAIKUO, if_para=False)
         print(message)
         print("模板插入完毕，开始替换内容")
         total_table_num  += 1
@@ -296,8 +294,7 @@ async def generate_dt_report(base_info, baogao_info):
             'beizhu' : beizhu,
             'num' : num_to_chinese[head_num],
         }
-        print(add_heading(output_dir, f"二、检查方案", 1))
+        print(add_table_and_replace(output_dir, FANGAN_JIANCHA_DIR, 0, list_to_replace))
-        print(add_table_and_replace(output_dir, FANGAN_JIANCHA_DIR, 0, list_to_replace, no_para=True))
         print(split_table_by_row_content(output_dir, output_dir, total_table_num))
         total_table_num  += 1
         head_num += 1
@@ -321,8 +318,7 @@ async def generate_dt_report(base_info, baogao_info):
         JIANCHA_XINGXI[7][1] = Y_Code[2] if len(Y_Code) > 2 else "无"
         JIANCHA_XINGXI[8][0] = "本次" + "、".join(_ for _ in jiancha) + f"检查，采集叶片图片{total_picture_num}张，内容覆盖" + ";".join(_ for _ in neirong)
         #新建检查信息表
-        print(add_heading(output_dir, f"三、检查信息", 1))
+        output_doc, message = add_table_to_document(output_dir, JIANCHA_XINGXI_DIR,9,4,total_table_num ,JIANCHA_XINGXI,False)
-        output_doc, message = add_table_to_document(output_dir, JIANCHA_XINGXI_DIR,9,4,total_table_num ,JIANCHA_XINGXI,False,if_para=False)
         print(message)
         print(search_and_replace(output_dir, jiegou_xuhao, num_to_chinese[head_num]))
         head_num += 1
@@ -349,8 +345,7 @@ async def generate_dt_report(base_info, baogao_info):
         CHENGGUO_DIJIAO[4][3] = baogao_date.split(' ')[0]
         CHENGGUO_DIJIAO[5][3] = "未审核"
 
-        print(add_heading(output_dir, f"四、成果递交", 1))
+        output_doc, message = add_table_to_document(output_dir, CHENGGUO_DIJIAO_DIR,5,5,total_table_num,CHENGGUO_DIJIAO,True,0.04)
-        output_doc, message = add_table_to_document(output_dir, CHENGGUO_DIJIAO_DIR,5,5,total_table_num,CHENGGUO_DIJIAO,True,0.04,if_para=False)
         print(message)
         print(search_and_replace(output_dir, jiegou_xuhao, num_to_chinese[head_num]))
         head_num += 1
@@ -401,8 +396,7 @@ async def generate_dt_report(base_info, baogao_info):
         JIANCHA_HUIZONG[1][2] = "\n".join([f"{i+1}.{s}" for i, s in enumerate(get_defect_str(Y1_quexian_list))]) if Y1_quexian_num else '未发现明显影响风力发电机组正常运行的缺陷'
         JIANCHA_HUIZONG[2][2] = "\n".join([f"{i+1}.{s}" for i, s in enumerate(get_defect_str(Y2_quexian_list))]) if Y2_quexian_num else '未发现明显影响风力发电机组正常运行的缺陷'
         JIANCHA_HUIZONG[3][2] = "\n".join([f"{i+1}.{s}" for i, s in enumerate(get_defect_str(Y3_quexian_list))]) if Y3_quexian_num else '未发现明显影响风力发电机组正常运行的缺陷'
-        print(add_heading(output_dir, f"五、检查情况汇总 ", 1))
+        output_doc, message = add_table_to_document(output_dir, JIANCHA_HUIZONG_DIR,4,3,total_table_num,JIANCHA_HUIZONG,False,ALIGMENT='LEFT')
-        output_doc, message = add_table_to_document(output_dir, JIANCHA_HUIZONG_DIR,4,3,total_table_num,JIANCHA_HUIZONG,False,ALIGMENT='LEFT', if_para=False)
         print(message)
         print(search_and_replace(output_dir, jiegou_xuhao, num_to_chinese[head_num]))
         total_table_num  += 1
@@ -425,7 +419,6 @@ async def generate_dt_report(base_info, baogao_info):
         if JIANCHA_NEIRONG_TOTAL_NUM <= 0:
             print("无典型图片数据,无法生成典型图表")
         else:
-            print(add_heading(output_dir, f"六、检查内容", 1))
             col ,row = 3, 0
             JIANCHA_NEIRONG_PICTURES_TABLE = get_resource_path("muban/check2.docx")
             JIANCHA_NEIRONG_Y1_DIR = get_resource_path("muban/check_content.docx")
@@ -445,8 +438,7 @@ async def generate_dt_report(base_info, baogao_info):
             print(f"Y3标题内容：{JIANCHA_NEIRONG_Y3}")
             print(f"当前表格序号为 {total_table_num}")
             print(key_words)
-
+            output_doc, message = add_table_to_document(output_dir, JIANCHA_NEIRONG_Y1_DIR,1,3,total_table_num,JIANCHA_NEIRONG_Y1,True, 1)
-            output_doc, message = add_table_to_document(output_dir, JIANCHA_NEIRONG_Y1_DIR,1,3,total_table_num,JIANCHA_NEIRONG_Y1,True, 1,if_para=False)
             print(message)
             total_table_num += 1
             

build/build/EXE-00.toc

@@ -0,0 +1,409 @@
+('Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\dist\\report_generator.exe',
+ True,
+ False,
+ False,
+ 'C:\\users\\dtyx\\Local Settings\\Application '
+ 'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PyInstaller\\bootloader\\images\\icon-console.ico',
+ None,
+ False,
+ False,
+ b'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<assembly xmlns='
+ b'"urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\n  <trustInfo x'
+ b'mlns="urn:schemas-microsoft-com:asm.v3">\n    <security>\n      <requested'
+ b'Privileges>\n        <requestedExecutionLevel level="asInvoker" uiAccess='
+ b'"false"/>\n      </requestedPrivileges>\n    </security>\n  </trustInfo>\n  '
+ b'<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">\n    <'
+ b'application>\n      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f'
+ b'0}"/>\n      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>\n '
+ b'     <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>\n      <s'
+ b'upportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>\n      <supporte'
+ b'dOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>\n    </application>\n  <'
+ b'/compatibility>\n  <application xmlns="urn:schemas-microsoft-com:asm.v3">'
+ b'\n    <windowsSettings>\n      <longPathAware xmlns="http://schemas.micros'
+ b'oft.com/SMI/2016/WindowsSettings">true</longPathAware>\n    </windowsSett'
+ b'ings>\n  </application>\n  <dependency>\n    <dependentAssembly>\n      <ass'
+ b'emblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version='
+ b'"6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" langua'
+ b'ge="*"/>\n    </dependentAssembly>\n  </dependency>\n</assembly>',
+ True,
+ False,
+ None,
+ None,
+ None,
+ 'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\report_generator.pkg',
+ [('pyi-contents-directory _internal', '', 'OPTION'),
+  ('PYZ-00.pyz',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\PYZ-00.pyz',
+   'PYZ'),
+  ('struct',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\struct.pyc',
+   'PYMODULE'),
+  ('pyimod01_archive',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\pyimod01_archive.pyc',
+   'PYMODULE'),
+  ('pyimod02_importers',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\pyimod02_importers.pyc',
+   'PYMODULE'),
+  ('pyimod03_ctypes',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\pyimod03_ctypes.pyc',
+   'PYMODULE'),
+  ('pyimod04_pywin32',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\pyimod04_pywin32.pyc',
+   'PYMODULE'),
+  ('pyiboot01_bootstrap',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PyInstaller\\loader\\pyiboot01_bootstrap.py',
+   'PYSOURCE'),
+  ('pyi_rth_inspect',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\Lib\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_inspect.py',
+   'PYSOURCE'),
+  ('pyi_rth_pkgutil',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\Lib\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgutil.py',
+   'PYSOURCE'),
+  ('pyi_rth_multiprocessing',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\Lib\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py',
+   'PYSOURCE'),
+  ('Generate_Report',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\Generate_Report.py',
+   'PYSOURCE'),
+  ('python39.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\python39.dll',
+   'BINARY'),
+  ('select.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\select.pyd',
+   'EXTENSION'),
+  ('_decimal.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_decimal.pyd',
+   'EXTENSION'),
+  ('_hashlib.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_hashlib.pyd',
+   'EXTENSION'),
+  ('unicodedata.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\unicodedata.pyd',
+   'EXTENSION'),
+  ('_socket.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_socket.pyd',
+   'EXTENSION'),
+  ('_lzma.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_lzma.pyd',
+   'EXTENSION'),
+  ('_bz2.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_bz2.pyd',
+   'EXTENSION'),
+  ('_multiprocessing.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_multiprocessing.pyd',
+   'EXTENSION'),
+  ('pyexpat.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\pyexpat.pyd',
+   'EXTENSION'),
+  ('_ssl.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_ssl.pyd',
+   'EXTENSION'),
+  ('_ctypes.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_ctypes.pyd',
+   'EXTENSION'),
+  ('_queue.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_queue.pyd',
+   'EXTENSION'),
+  ('lxml\\etree.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\etree.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\_elementpath.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\_elementpath.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\sax.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\sax.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\objectify.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\objectify.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\html\\diff.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\html\\diff.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\html\\_difflib.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\html\\_difflib.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\builder.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\builder.cp39-win32.pyd',
+   'EXTENSION'),
+  ('_overlapped.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_overlapped.pyd',
+   'EXTENSION'),
+  ('_asyncio.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_asyncio.pyd',
+   'EXTENSION'),
+  ('charset_normalizer\\md__mypyc.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\charset_normalizer\\md__mypyc.cp39-win32.pyd',
+   'EXTENSION'),
+  ('charset_normalizer\\md.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\charset_normalizer\\md.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_webp.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_webp.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_imagingtk.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_imagingtk.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_avif.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_avif.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_imagingcms.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_imagingcms.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_imagingmath.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_imagingmath.cp39-win32.pyd',
+   'EXTENSION'),
+  ('_elementtree.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_elementtree.pyd',
+   'EXTENSION'),
+  ('PIL\\_imaging.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_imaging.cp39-win32.pyd',
+   'EXTENSION'),
+  ('VCRUNTIME140.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\VCRUNTIME140.dll',
+   'BINARY'),
+  ('libcrypto-1_1.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\libcrypto-1_1.dll',
+   'BINARY'),
+  ('libssl-1_1.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\libssl-1_1.dll',
+   'BINARY'),
+  ('libffi-7.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\libffi-7.dll',
+   'BINARY'),
+  ('muban\\check2.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check2.docx',
+   'DATA'),
+  ('muban\\check3.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check3.docx',
+   'DATA'),
+  ('muban\\check_check.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check_check.docx',
+   'DATA'),
+  ('muban\\check_check_title.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check_check_title.docx',
+   'DATA'),
+  ('muban\\check_content.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check_content.docx',
+   'DATA'),
+  ('muban\\checkinfo.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\checkinfo.docx',
+   'DATA'),
+  ('muban\\checkmethod.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\checkmethod.docx',
+   'DATA'),
+  ('muban\\chengguo_sub.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\chengguo_sub.docx',
+   'DATA'),
+  ('muban\\fengmian.jpg',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\fengmian.jpg',
+   'DATA'),
+  ('muban\\fengmian1.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\fengmian1.docx',
+   'DATA'),
+  ('muban\\fengmian2.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\fengmian2.docx',
+   'DATA'),
+  ('muban\\result.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\result.docx',
+   'DATA'),
+  ('muban\\total_check.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\total_check.docx',
+   'DATA'),
+  ('muban\\xiangmugaikuo.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\xiangmugaikuo.docx',
+   'DATA'),
+  ('muban\\检查方案内容.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\检查方案内容.docx',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\readme.txt',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\readme.txt',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_abstract_expand.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_abstract_expand.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_svrl_for_xslt1.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_svrl_for_xslt1.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_schematron_message.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_schematron_message.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\RNG2Schtrn.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\RNG2Schtrn.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\XSD2Schtrn.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\XSD2Schtrn.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\rng\\iso-schematron.rng',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\rng\\iso-schematron.rng',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_dsdl_include.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_dsdl_include.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_schematron_skeleton_for_xslt1.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_schematron_skeleton_for_xslt1.xsl',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\docProps\\thumbnail.jpeg',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\docProps\\thumbnail.jpeg',
+   'DATA'),
+  ('docx\\py.typed',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\py.typed',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\customXml\\_rels\\item1.xml.rels',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\customXml\\_rels\\item1.xml.rels',
+   'DATA'),
+  ('docx\\templates\\default.docx',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default.docx',
+   'DATA'),
+  ('docx\\templates\\default-settings.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-settings.xml',
+   'DATA'),
+  ('docx\\templates\\default-header.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-header.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\docProps\\core.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\docProps\\core.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\document.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\document.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\settings.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\settings.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\_rels\\document.xml.rels',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\_rels\\document.xml.rels',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\customXml\\itemProps1.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\customXml\\itemProps1.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\styles.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\styles.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\customXml\\item1.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\customXml\\item1.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\docProps\\app.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\docProps\\app.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\numbering.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\numbering.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\_rels\\.rels',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\_rels\\.rels',
+   'DATA'),
+  ('docx\\templates\\default-styles.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-styles.xml',
+   'DATA'),
+  ('docx\\templates\\default-footer.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-footer.xml',
+   'DATA'),
+  ('docx\\templates\\default-comments.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-comments.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\[Content_Types].xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\[Content_Types].xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\stylesWithEffects.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\stylesWithEffects.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\webSettings.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\webSettings.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\theme\\theme1.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\theme\\theme1.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\fontTable.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\fontTable.xml',
+   'DATA'),
+  ('certifi\\cacert.pem',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\certifi\\cacert.pem',
+   'DATA'),
+  ('certifi\\py.typed',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\certifi\\py.typed',
+   'DATA'),
+  ('base_library.zip',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\base_library.zip',
+   'DATA')],
+ [],
+ False,
+ False,
+ 1753433900,
+ [('run.exe',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PyInstaller\\bootloader\\Windows-32bit-intel\\run.exe',
+   'EXECUTABLE')],
+ 'C:\\users\\dtyx\\Local Settings\\Application '
+ 'Data\\Programs\\Python\\Python39-32\\python39.dll')

build/build/PKG-00.toc

@@ -0,0 +1,384 @@
+('Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\report_generator.pkg',
+ {'BINARY': True,
+  'DATA': True,
+  'EXECUTABLE': True,
+  'EXTENSION': True,
+  'PYMODULE': True,
+  'PYSOURCE': True,
+  'PYZ': False,
+  'SPLASH': True,
+  'SYMLINK': False},
+ [('pyi-contents-directory _internal', '', 'OPTION'),
+  ('PYZ-00.pyz',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\PYZ-00.pyz',
+   'PYZ'),
+  ('struct',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\struct.pyc',
+   'PYMODULE'),
+  ('pyimod01_archive',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\pyimod01_archive.pyc',
+   'PYMODULE'),
+  ('pyimod02_importers',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\pyimod02_importers.pyc',
+   'PYMODULE'),
+  ('pyimod03_ctypes',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\pyimod03_ctypes.pyc',
+   'PYMODULE'),
+  ('pyimod04_pywin32',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\localpycs\\pyimod04_pywin32.pyc',
+   'PYMODULE'),
+  ('pyiboot01_bootstrap',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PyInstaller\\loader\\pyiboot01_bootstrap.py',
+   'PYSOURCE'),
+  ('pyi_rth_inspect',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\Lib\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_inspect.py',
+   'PYSOURCE'),
+  ('pyi_rth_pkgutil',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\Lib\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_pkgutil.py',
+   'PYSOURCE'),
+  ('pyi_rth_multiprocessing',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\Lib\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py',
+   'PYSOURCE'),
+  ('Generate_Report',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\Generate_Report.py',
+   'PYSOURCE'),
+  ('python39.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\python39.dll',
+   'BINARY'),
+  ('select.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\select.pyd',
+   'EXTENSION'),
+  ('_decimal.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_decimal.pyd',
+   'EXTENSION'),
+  ('_hashlib.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_hashlib.pyd',
+   'EXTENSION'),
+  ('unicodedata.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\unicodedata.pyd',
+   'EXTENSION'),
+  ('_socket.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_socket.pyd',
+   'EXTENSION'),
+  ('_lzma.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_lzma.pyd',
+   'EXTENSION'),
+  ('_bz2.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_bz2.pyd',
+   'EXTENSION'),
+  ('_multiprocessing.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_multiprocessing.pyd',
+   'EXTENSION'),
+  ('pyexpat.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\pyexpat.pyd',
+   'EXTENSION'),
+  ('_ssl.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_ssl.pyd',
+   'EXTENSION'),
+  ('_ctypes.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_ctypes.pyd',
+   'EXTENSION'),
+  ('_queue.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_queue.pyd',
+   'EXTENSION'),
+  ('lxml\\etree.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\etree.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\_elementpath.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\_elementpath.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\sax.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\sax.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\objectify.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\objectify.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\html\\diff.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\html\\diff.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\html\\_difflib.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\html\\_difflib.cp39-win32.pyd',
+   'EXTENSION'),
+  ('lxml\\builder.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\builder.cp39-win32.pyd',
+   'EXTENSION'),
+  ('_overlapped.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_overlapped.pyd',
+   'EXTENSION'),
+  ('_asyncio.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_asyncio.pyd',
+   'EXTENSION'),
+  ('charset_normalizer\\md__mypyc.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\charset_normalizer\\md__mypyc.cp39-win32.pyd',
+   'EXTENSION'),
+  ('charset_normalizer\\md.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\charset_normalizer\\md.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_webp.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_webp.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_imagingtk.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_imagingtk.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_avif.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_avif.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_imagingcms.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_imagingcms.cp39-win32.pyd',
+   'EXTENSION'),
+  ('PIL\\_imagingmath.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_imagingmath.cp39-win32.pyd',
+   'EXTENSION'),
+  ('_elementtree.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\_elementtree.pyd',
+   'EXTENSION'),
+  ('PIL\\_imaging.cp39-win32.pyd',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\PIL\\_imaging.cp39-win32.pyd',
+   'EXTENSION'),
+  ('VCRUNTIME140.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\VCRUNTIME140.dll',
+   'BINARY'),
+  ('libcrypto-1_1.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\libcrypto-1_1.dll',
+   'BINARY'),
+  ('libssl-1_1.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\libssl-1_1.dll',
+   'BINARY'),
+  ('libffi-7.dll',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\DLLs\\libffi-7.dll',
+   'BINARY'),
+  ('muban\\check2.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check2.docx',
+   'DATA'),
+  ('muban\\check3.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check3.docx',
+   'DATA'),
+  ('muban\\check_check.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check_check.docx',
+   'DATA'),
+  ('muban\\check_check_title.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check_check_title.docx',
+   'DATA'),
+  ('muban\\check_content.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\check_content.docx',
+   'DATA'),
+  ('muban\\checkinfo.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\checkinfo.docx',
+   'DATA'),
+  ('muban\\checkmethod.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\checkmethod.docx',
+   'DATA'),
+  ('muban\\chengguo_sub.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\chengguo_sub.docx',
+   'DATA'),
+  ('muban\\fengmian.jpg',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\fengmian.jpg',
+   'DATA'),
+  ('muban\\fengmian1.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\fengmian1.docx',
+   'DATA'),
+  ('muban\\fengmian2.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\fengmian2.docx',
+   'DATA'),
+  ('muban\\result.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\result.docx',
+   'DATA'),
+  ('muban\\total_check.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\total_check.docx',
+   'DATA'),
+  ('muban\\xiangmugaikuo.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\xiangmugaikuo.docx',
+   'DATA'),
+  ('muban\\检查方案内容.docx',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\muban\\检查方案内容.docx',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\readme.txt',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\readme.txt',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_abstract_expand.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_abstract_expand.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_svrl_for_xslt1.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_svrl_for_xslt1.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_schematron_message.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_schematron_message.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\RNG2Schtrn.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\RNG2Schtrn.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\XSD2Schtrn.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\XSD2Schtrn.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\rng\\iso-schematron.rng',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\rng\\iso-schematron.rng',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_dsdl_include.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_dsdl_include.xsl',
+   'DATA'),
+  ('lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_schematron_skeleton_for_xslt1.xsl',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\lxml\\isoschematron\\resources\\xsl\\iso-schematron-xslt1\\iso_schematron_skeleton_for_xslt1.xsl',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\docProps\\thumbnail.jpeg',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\docProps\\thumbnail.jpeg',
+   'DATA'),
+  ('docx\\py.typed',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\py.typed',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\customXml\\_rels\\item1.xml.rels',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\customXml\\_rels\\item1.xml.rels',
+   'DATA'),
+  ('docx\\templates\\default.docx',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default.docx',
+   'DATA'),
+  ('docx\\templates\\default-settings.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-settings.xml',
+   'DATA'),
+  ('docx\\templates\\default-header.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-header.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\docProps\\core.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\docProps\\core.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\document.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\document.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\settings.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\settings.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\_rels\\document.xml.rels',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\_rels\\document.xml.rels',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\customXml\\itemProps1.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\customXml\\itemProps1.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\styles.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\styles.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\customXml\\item1.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\customXml\\item1.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\docProps\\app.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\docProps\\app.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\numbering.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\numbering.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\_rels\\.rels',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\_rels\\.rels',
+   'DATA'),
+  ('docx\\templates\\default-styles.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-styles.xml',
+   'DATA'),
+  ('docx\\templates\\default-footer.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-footer.xml',
+   'DATA'),
+  ('docx\\templates\\default-comments.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-comments.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\[Content_Types].xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\[Content_Types].xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\stylesWithEffects.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\stylesWithEffects.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\webSettings.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\webSettings.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\theme\\theme1.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\theme\\theme1.xml',
+   'DATA'),
+  ('docx\\templates\\default-docx-template\\word\\fontTable.xml',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\docx\\templates\\default-docx-template\\word\\fontTable.xml',
+   'DATA'),
+  ('certifi\\cacert.pem',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\certifi\\cacert.pem',
+   'DATA'),
+  ('certifi\\py.typed',
+   'C:\\users\\dtyx\\Local Settings\\Application '
+   'Data\\Programs\\Python\\Python39-32\\lib\\site-packages\\certifi\\py.typed',
+   'DATA'),
+  ('base_library.zip',
+   'Z:\\home\\dtyx\\桌面\\yhh\\Report_Generate_Server\\build\\build\\base_library.zip',
+   'DATA')],
+ 'python39.dll',
+ False,
+ False,
+ False,
+ [],
+ None,
+ None,
+ None)

build/build/warn-build.txt

@@ -0,0 +1,78 @@
+
+This file lists modules PyInstaller was not able to find. This does not
+necessarily mean this module is required for running your program. Python and
+Python 3rd-party packages include a lot of conditional or optional modules. For
+example the module 'ntpath' only exists on Windows, whereas the module
+'posixpath' only exists on Posix systems.
+
+Types if import:
+* top-level: imported at the top-level - look at these first
+* conditional: imported within an if-statement
+* delayed: imported within a function
+* optional: imported within a try-except-statement
+
+IMPORTANT: Do NOT post this list to the issue-tracker. Use it as a basis for
+            tracking down the missing module yourself. Thanks!
+
+missing module named _posixsubprocess - imported by subprocess (optional), multiprocessing.util (delayed)
+missing module named grp - imported by shutil (optional), tarfile (optional), pathlib (delayed, optional), subprocess (optional)
+missing module named pwd - imported by posixpath (delayed, conditional), shutil (optional), tarfile (optional), pathlib (delayed, conditional, optional), subprocess (optional), netrc (delayed, conditional), getpass (delayed), http.server (delayed, optional), webbrowser (delayed)
+missing module named org - imported by pickle (optional)
+missing module named _frozen_importlib_external - imported by importlib._bootstrap (delayed), importlib (optional), importlib.abc (optional), zipimport (top-level)
+excluded module named _frozen_importlib - imported by importlib (optional), importlib.abc (optional), zipimport (top-level)
+missing module named pep517 - imported by importlib.metadata (delayed)
+missing module named urllib.urlopen - imported by urllib (delayed, optional), lxml.html (delayed, optional)
+missing module named urllib.urlencode - imported by urllib (delayed, optional), lxml.html (delayed, optional)
+missing module named posix - imported by os (conditional, optional), shutil (conditional), importlib._bootstrap_external (conditional)
+missing module named resource - imported by posix (top-level)
+missing module named 'org.python' - imported by copy (optional), xml.sax (delayed, conditional)
+missing module named _posixshmem - imported by multiprocessing.resource_tracker (conditional), multiprocessing.shared_memory (conditional)
+missing module named _scproxy - imported by urllib.request (conditional)
+missing module named termios - imported by getpass (optional), tty (top-level)
+missing module named 'java.lang' - imported by platform (delayed, optional), xml.sax._exceptions (conditional)
+missing module named multiprocessing.BufferTooShort - imported by multiprocessing (top-level), multiprocessing.connection (top-level)
+missing module named multiprocessing.AuthenticationError - imported by multiprocessing (top-level), multiprocessing.connection (top-level)
+missing module named multiprocessing.get_context - imported by multiprocessing (top-level), multiprocessing.pool (top-level), multiprocessing.managers (top-level), multiprocessing.sharedctypes (top-level)
+missing module named multiprocessing.TimeoutError - imported by multiprocessing (top-level), multiprocessing.pool (top-level)
+missing module named multiprocessing.set_start_method - imported by multiprocessing (top-level), multiprocessing.spawn (top-level)
+missing module named multiprocessing.get_start_method - imported by multiprocessing (top-level), multiprocessing.spawn (top-level)
+missing module named pyimod02_importers - imported by C:\users\dtyx\Local Settings\Application Data\Programs\Python\Python39-32\Lib\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgutil.py (delayed)
+missing module named annotationlib - imported by typing_extensions (conditional)
+missing module named htmlentitydefs - imported by lxml.html.soupparser (optional)
+missing module named BeautifulSoup - imported by lxml.html.soupparser (optional)
+missing module named bs4 - imported by lxml.html.soupparser (optional)
+missing module named urlparse - imported by lxml.ElementInclude (optional), lxml.html.html5parser (optional)
+missing module named urllib2 - imported by lxml.ElementInclude (optional), lxml.html.html5parser (optional)
+missing module named 'html5lib.treebuilders' - imported by lxml.html.html5parser (top-level)
+missing module named html5lib - imported by lxml.html._html5builder (top-level), lxml.html.html5parser (top-level)
+missing module named 'cython.cimports' - imported by lxml.html.diff (optional)
+missing module named cython - imported by lxml.html.diff (optional), lxml.html._difflib (optional)
+missing module named lxml_html_clean - imported by lxml.html.clean (optional)
+missing module named vms_lib - imported by platform (delayed, optional)
+missing module named java - imported by platform (delayed)
+missing module named _winreg - imported by platform (delayed, optional)
+missing module named readline - imported by cmd (delayed, conditional, optional), code (delayed, conditional, optional), pdb (delayed, optional)
+missing module named cssselect - imported by lxml.cssselect (optional)
+missing module named asyncio.DefaultEventLoopPolicy - imported by asyncio (delayed, conditional), asyncio.events (delayed, conditional)
+missing module named simplejson - imported by requests.compat (conditional, optional)
+missing module named dummy_threading - imported by requests.cookies (optional)
+missing module named zstandard - imported by urllib3.util.request (optional), urllib3.response (optional)
+missing module named compression - imported by urllib3.util.request (optional), urllib3.response (optional)
+missing module named 'h2.events' - imported by urllib3.http2.connection (top-level)
+missing module named 'h2.connection' - imported by urllib3.http2.connection (top-level)
+missing module named h2 - imported by urllib3.http2.connection (top-level)
+missing module named brotli - imported by urllib3.util.request (optional), urllib3.response (optional)
+missing module named brotlicffi - imported by urllib3.util.request (optional), urllib3.response (optional)
+missing module named socks - imported by urllib3.contrib.socks (optional)
+missing module named 'typing.io' - imported by importlib.resources (top-level)
+missing module named cryptography - imported by urllib3.contrib.pyopenssl (top-level), requests (conditional, optional)
+missing module named 'OpenSSL.crypto' - imported by urllib3.contrib.pyopenssl (delayed, conditional)
+missing module named 'cryptography.x509' - imported by urllib3.contrib.pyopenssl (delayed, optional)
+missing module named OpenSSL - imported by urllib3.contrib.pyopenssl (top-level)
+missing module named chardet - imported by requests (optional)
+missing module named 'pyodide.ffi' - imported by urllib3.contrib.emscripten.fetch (delayed, optional)
+missing module named pyodide - imported by urllib3.contrib.emscripten.fetch (top-level)
+missing module named js - imported by urllib3.contrib.emscripten.fetch (top-level)
+missing module named olefile - imported by PIL.FpxImagePlugin (top-level), PIL.MicImagePlugin (top-level)
+missing module named numpy - imported by PIL._typing (conditional, optional)
+missing module named defusedxml - imported by PIL.Image (optional)

tools/argtool.py

@@ -104,6 +104,6 @@ def get_default_config() -> Dict[str, Dict[str, Any]]:
             "if_docx_inspection_picture": True,
             "if_docx_defect_picture": True,
             "if_docx_conclusion": True,
-            "choose_template" : "DT"
+            "choose_template" : "JF"
         }
     }

tools/content_tools.py

@@ -361,10 +361,7 @@ def add_picture_to_table(
         # 添加图片（带异常捕获）
         try:
             if width:
-                try:
                 run.add_picture(final_bytes, width=Inches(width), height=Inches(height))
-                except:
-                    run.add_picture(final_bytes, width=Inches(width))
             else:
                 run.add_picture(final_bytes)
         except Exception:

tools/defines.py

@@ -205,16 +205,6 @@ class DocxColors(Enum):
     def rgb(self):
         return self.value
     
-DT_EADING_1_CONFIG = {
-    "alignment": "left",
-    "font" : {
-       "name" : "宋体",
-       "size" : Pt(14),
-       "bold" : True,
-       "color" : DocxColors.BLACK.rgb
-    },
-}
-
 HEADING_1_CONFIG = {
     "alignment": "left",
     "font" : {

tools/document_tools.py

@@ -253,7 +253,7 @@ def write_table(target_filename: str, rows: int, cols: int, table_num: int, data
                         if j >= cols + 1:
                             break
                         
-                        if cell_text is not None and cell_text.endswith((".png", ".jpg", ".jpeg")):
+                        if cell_text.endswith((".png", ".jpg", ".jpeg")):
                             target_doc.save(target_filename)
                             target_doc.tables[table_num].cell(i,j).text = ""
                             print(f"在[{i},{j}]处添加图片{cell_text}")
@@ -298,6 +298,22 @@ def write_table(target_filename: str, rows: int, cols: int, table_num: int, data
     print("表格写入完成")
     return target_doc
 
+def set_document_para(target_doc: Document) -> Document:
+    """设置文档的段落格式
+    """
+    paragraphs_to_remove = []
+    for i, paragraph in enumerate(target_doc.paragraphs):
+        if i <= 11:
+            continue
+        if not paragraph.text.strip():
+            paragraphs_to_remove.append(paragraph)
+    
+    for paragraph in paragraphs_to_remove:
+        p = paragraph._element
+        p.getparent().remove(p)
+    
+    return target_doc
+
 def add_table_to_document(target_filename: str, source_filename: str, rows: int, cols: int, table_num: int, data: Optional[List[List[str]]] = None, ifadjustheight: Optional[bool] = True, height: Optional[float] = None, key_words: re.Pattern[str] = None, ALIGMENT: Optional[str] = 'CENTER', if_merge : Optional[bool] = True, Report_Enum = 'DT', if_para : Optional[bool] = True, width : Optional[float] = None) -> str:
     """复制源文件中的文字与表格（先文字后表格格式）到目标文档
     Args:
@@ -350,9 +366,11 @@ def add_table_to_document(target_filename: str, source_filename: str, rows: int,
                         # 检查 run.font.name 是否为 None
                         if run.font.name is None:
                             # 设置默认的中文字体名称
-                            run.font.name = '宋体(中文正文)'  
+                            run.font.name = '宋体(中文正文)'  # 或者使用其他你喜欢的中文字体
                         rFonts.set(qn('w:eastAsia'), run.font.name)
                         new_run.font.color.rgb = run.font.color.rgb
+
+
                         # Font size if specified
                         if run.font.size:
                             new_run.font.size = run.font.size
@@ -373,9 +391,8 @@ def add_table_to_document(target_filename: str, source_filename: str, rows: int,
             print(f"{target_filename}写入{data}失败：{str(e)}")
     target_doc.save(target_filename)
     return target_doc,f"{target_filename}添加表格{source_doc}成功"
-
-
 from docx.document import Document as Document_
+from docx.table import Table
 def add_table(target_filename: str, source_filename : str | Document_, if_merge = True, REPORT_ENUM = 'DT'):
     if isinstance(source_filename, str):
         output_doc = copy_table(Document(source_filename).tables[0], Document(target_filename), True, if_merge=if_merge, REPORT_ENUM = REPORT_ENUM)
@@ -451,6 +468,14 @@ def add_table_and_replace(
                         if run.font.size:
                             new_run.font.size = run.font.size
                         
+                            # 复制分页符（处理w:br标签）
+                        for element in run._element:
+                            if element.tag.endswith('br'):
+                                br_type = element.get(qn('type'), '')
+                                if br_type == 'page':
+                                    new_br = OxmlElement('w:br')
+                                    new_br.set(qn('type'), 'page')
+                                    new_run._element.append(new_br)
         except Exception as e:
             print(f"添加表格前文章失败：{str(e)}")
     try:# Copy all tables
@@ -604,7 +629,7 @@ async def add_dynamic_table(output_doc, output_dir, table_num, TABLES, JIANCHA_X
     """
     for table_idx, Table in enumerate(TABLES):
         print(Table)
-        output_doc, message = add_table_to_document(output_dir, JIANCHA_XIANGQING_DIR, row, col, i, Table, FLAG, if_para=False)
+        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, [])
@@ -620,10 +645,8 @@ async def add_dynamic_table(output_doc, output_dir, table_num, TABLES, JIANCHA_X
                 add_picture_to_table(output_doc, output_dir, 4, 0, picturedir, i, 4.7232)
             except Exception as e:
                 print(f"添加图片失败:{e}")
-        try:
+        
-            print(search_and_replace(output_dir, 'tupian_xuhao', f'{xuhao}'))
+        print(await search_and_replace(output_dir, 'tupian_xuhao', f'{xuhao}'))
-        except Exception as e:
-            print(f"替换图片序号失败:{e}")
         table_num += 1
         i += 1
         xuhao += 1
@@ -660,14 +683,14 @@ async def process_images_table(data_dict, output_dir, start_i, JIANCHA_NEIRONG_P
                     line_index += 1
             print(f"当前待插入表格: {JIANCHA_NEIRONG_TEXT}")
             print(f"当前表格序号为 {i}")
-            output_doc, message = add_table_to_document(
+            output_doc, message = await add_table_to_document(
                 output_dir, JIANCHA_NEIRONG_PICTURES_TABLE, 1, 3, i, JIANCHA_NEIRONG_TEXT, False, None, key_words
             )
             i += 1
         else:
             # 图片行（从 items 取图片路径）
             print(f"当前表格序号为 {i}")
-            output_doc, message = add_table_to_document(
+            output_doc, message = await add_table_to_document(
                 output_dir, JIANCHA_NEIRONG_PICTURES_TABLE, 1, 3, i, None, False
             )
             for k in range(3):
@@ -735,14 +758,14 @@ async def process_server_images_table(data_list, image_source_list, output_dir,
                         line_index += 1
                 print(f"当前待插入表格: {JIANCHA_NEIRONG_TEXT}")
                 print(f"当前表格序号为 {i}")
-                output_doc, message = add_table_to_document(
+                output_doc, message = await add_table_to_document(
                     output_dir, JIANCHA_NEIRONG_PICTURES_TABLE, 1, 3, i, JIANCHA_NEIRONG_TEXT, False, None, key_words
                 )
                 i += 1
             else:
                 # 图片行（从 items 取图片路径）
                 print(f"当前表格序号为 {i}")
-                output_doc, message = add_table_to_document(
+                output_doc, message = await add_table_to_document(
                     output_dir, JIANCHA_NEIRONG_PICTURES_TABLE, 1, 3, i, None, False
                 )
                 for k in range(3):