From 555daedda56d61fd1b50cd7e3dd0a483abf2e6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 22 Mar 2023 16:02:39 +0800 Subject: [PATCH] 'commit' --- Doc/Test/A01/{05.html => 01.html} | 0 Doc/Test/A01/{06.html => 02.html} | 0 Doc/Test/A01/{07.html => 03.html} | 0 Doc/Test/A01/index.html | 6 +- ETL/Mars/Test.py | 2 +- ETL/Mars/render.html | 10 ++-- src/main/java/Tools/XT_LoadExcel.java | 74 ++++++++++++++++++++++++ src/main/resource/xt_template_level1.txt | 8 +++ src/main/resource/xt_template_level2.txt | 1 + target/classes/xt_template_level1.txt | 8 +++ target/classes/xt_template_level2.txt | 1 + 11 files changed, 101 insertions(+), 9 deletions(-) rename Doc/Test/A01/{05.html => 01.html} (100%) rename Doc/Test/A01/{06.html => 02.html} (100%) rename Doc/Test/A01/{07.html => 03.html} (100%) create mode 100644 src/main/java/Tools/XT_LoadExcel.java create mode 100644 src/main/resource/xt_template_level1.txt create mode 100644 src/main/resource/xt_template_level2.txt create mode 100644 target/classes/xt_template_level1.txt create mode 100644 target/classes/xt_template_level2.txt diff --git a/Doc/Test/A01/05.html b/Doc/Test/A01/01.html similarity index 100% rename from Doc/Test/A01/05.html rename to Doc/Test/A01/01.html diff --git a/Doc/Test/A01/06.html b/Doc/Test/A01/02.html similarity index 100% rename from Doc/Test/A01/06.html rename to Doc/Test/A01/02.html diff --git a/Doc/Test/A01/07.html b/Doc/Test/A01/03.html similarity index 100% rename from Doc/Test/A01/07.html rename to Doc/Test/A01/03.html diff --git a/Doc/Test/A01/index.html b/Doc/Test/A01/index.html index dac86e9..f272585 100644 --- a/Doc/Test/A01/index.html +++ b/Doc/Test/A01/index.html @@ -18,9 +18,9 @@
- - - + + + diff --git a/ETL/Mars/Test.py b/ETL/Mars/Test.py index ffe3765..2cefd57 100644 --- a/ETL/Mars/Test.py +++ b/ETL/Mars/Test.py @@ -19,5 +19,5 @@ bar.add_xaxis(["衬衫", "毛衣", "领带", "裤子", "风衣", "高跟鞋", " bar.add_yaxis("商家A", [114, 55, 27, 101, 125, 27, 105]) bar.add_yaxis("商家B", [57, 134, 137, 129, 145, 60, 49]) bar.set_global_opts(title_opts=opts.TitleOpts(title="某商场销售情况")) +print(bar.dump_options()) bar.render() -bar.dump_options() diff --git a/ETL/Mars/render.html b/ETL/Mars/render.html index 2101492..bfde9f9 100644 --- a/ETL/Mars/render.html +++ b/ETL/Mars/render.html @@ -7,11 +7,11 @@ - +