diff --git a/chart/charts.py b/chart/charts.py index 102c9a5..e86ffdf 100644 --- a/chart/charts.py +++ b/chart/charts.py @@ -3861,8 +3861,7 @@ def Aggregated_Pyramids(file_path, char_out_path, out_path, title, caption, subt """ keep_txt_to_file(code, f"{out_path}.R") - os.system( - f"Rscript {out_path}.R") + os.system(f"Rscript {out_path}.R") # 基础参数 file_path, char_out_path, out_path, title, caption, subtitle, title_font_size, x_name, x_font_size, x_scale_font_size, y_name, y_font_size, y_scale_font_size, event_1, event_2, event_3, font_size @@ -3989,8 +3988,7 @@ def Areas_Under_a_Time_Series(file_path, char_out_path, out_path, title, caption """ keep_txt_to_file(code, f"{out_path}.R") - os.system( - f"Rscript {out_path}.R") + os.system(f"Rscript {out_path}.R") # 基础参数 file_path, char_out_path, out_path, title, caption_1, caption_2, subtitle, title_font_size, font_size @@ -4085,8 +4083,8 @@ def Balloon_Plot(file_path, char_out_path, out_path, title, caption_1, caption_2 """ keep_txt_to_file(code, f"{out_path}.R") - os.system( - f"Rscript {out_path}.R") # 基础参数 file_path, char_out_path, out_path, title, caption, subtitle, title_font_size, x_name, x_font_size, x_scale_font_size, y_name, y_font_size, y_scale_font_size, image_name_font_size, mark_country_1, mark_country_2, average_font_size + os.system(f"Rscript {out_path}.R") # 基础参数 file_path, char_out_path, out_path, title, caption, subtitle, title_font_size, x_name, x_font_size, x_scale_font_size, y_name, y_font_size, y_scale_font_size, image_name_font_size, mark_country_1, mark_country_2, average_font_size + # 高级参数 title_font_color, x_font_color, x_scale_font_color, y_font_color, y_scale_font_color, image_name_font_color, average_font_color, mark_color, color diff --git a/static/css/layui.css b/static/css/layui.css index 3d73a90..2cc0e95 100644 --- a/static/css/layui.css +++ b/static/css/layui.css @@ -3951,10 +3951,6 @@ body .layui-table-tips .layui-layer-content { font-size: 14px; // 所有字体大小 } -.layui-nav-head * { - font-size: 14px; // 所有字体大小 -} - .layui-nav .layui-nav-item { position: relative; display: inline-block; diff --git a/templates/chart/Basic.html b/templates/chart/Basic.html index 8cc9d20..159b7ae 100644 --- a/templates/chart/Basic.html +++ b/templates/chart/Basic.html @@ -15,11 +15,11 @@