diff --git a/ETL/Mars/Config/Config.py b/ETL/Mars/Config/Config.py index f18831b..ed82ce6 100644 --- a/ETL/Mars/Config/Config.py +++ b/ETL/Mars/Config/Config.py @@ -2,7 +2,7 @@ city = '湘潭市' # 数据库配置 -dbname = 'eduData_temp' +dbname = 'eduData_xt' user = 'postgres' password = 'dsideal' host = '10.10.14.231' diff --git a/ETL/Mars/Config/__pycache__/Config.cpython-37.pyc b/ETL/Mars/Config/__pycache__/Config.cpython-37.pyc index 8227361..29eaaf4 100644 Binary files a/ETL/Mars/Config/__pycache__/Config.cpython-37.pyc and b/ETL/Mars/Config/__pycache__/Config.cpython-37.pyc differ diff --git a/ETL/Mars/Doc/安装文档.md b/ETL/Mars/Doc/安装文档.md index b7b1f08..98c2d50 100644 --- a/ETL/Mars/Doc/安装文档.md +++ b/ETL/Mars/Doc/安装文档.md @@ -60,11 +60,11 @@ python3 Start.py ## 四、测试 ```shell -http://10.10.14.214:8888/exportDoc?year=2020 -http://10.10.14.214:8888/exportPpt?year=2020 +http://192.168.100.100:8888/Mars/exportDoc?year=2020 +http://192.168.100.100:8888/Mars/exportPpt?year=2020 -http://10.10.14.214:8888/exportDoc?year=2019 -http://10.10.14.214:8888/exportPpt?year=2019 +http://12:8888/Mars/exportDoc?year=2019 +http://192.168.100.100:8888/Mars/exportPpt?year=2019 ``` ## 五、异常处理 diff --git a/ETL/Mars/Out/2019.docx b/ETL/Mars/Out/2019.docx new file mode 100644 index 0000000..70d529d Binary files /dev/null and b/ETL/Mars/Out/2019.docx differ diff --git a/ETL/Mars/OutImage/1.png b/ETL/Mars/OutImage/1.png index 72bcb27..156f3b9 100644 Binary files a/ETL/Mars/OutImage/1.png and b/ETL/Mars/OutImage/1.png differ diff --git a/ETL/Mars/OutImage/2.png b/ETL/Mars/OutImage/2.png index 5e64d88..4b6185b 100644 Binary files a/ETL/Mars/OutImage/2.png and b/ETL/Mars/OutImage/2.png differ diff --git a/ETL/Mars/OutImage/3.png b/ETL/Mars/OutImage/3.png index 29d4025..cbec9a9 100644 Binary files a/ETL/Mars/OutImage/3.png and b/ETL/Mars/OutImage/3.png differ diff --git a/ETL/Mars/OutImage/4.png b/ETL/Mars/OutImage/4.png index 1c69529..42c5867 100644 Binary files a/ETL/Mars/OutImage/4.png and b/ETL/Mars/OutImage/4.png differ diff --git a/ETL/Mars/OutImage/5.png b/ETL/Mars/OutImage/5.png index 323577d..c8aed98 100644 Binary files a/ETL/Mars/OutImage/5.png and b/ETL/Mars/OutImage/5.png differ diff --git a/ETL/Mars/Start.py b/ETL/Mars/Start.py index c408ced..0c2da56 100644 --- a/ETL/Mars/Start.py +++ b/ETL/Mars/Start.py @@ -39,7 +39,7 @@ def exportPpt(): path = basepath + '/Out/' + str(year) + '.pptx' # 如果存在,直接返回 if os.path.exists(path): - return send_file(path, as_attachment=True, download_name="Word版本" + str(year) + "年年报.docx") + return send_file(path, as_attachment=True, download_name="PPT版本" + str(year) + "年年报.pptx") from_to = str(year) + "-" + str(year + 1) # 开始终止年份 # 修改Ppt