Update app.py

app.py

@@ -6,8 +6,8 @@ import io
 import base64
 import matplotlib.gridspec as gridspec
 import math
-import matplotlib.font_manager as fm
 
+# [前面的常量定义和 process_schedule 函数保持不变]
 SPLIT_TIME = "17:30"
 BUSINESS_START = "09:30"
 BUSINESS_END = "01:30"
@@ -27,7 +27,7 @@ def process_schedule(file):
         df = df.dropna(subset=['Hall', 'StartTime', 'EndTime'])
         
         # 转换影厅格式为 "#号" 格式
-        df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str) + '#'
+        df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str) + ' '
         
         # 保存原始时间字符串用于诊断
         df['original_end'] = df['EndTime']
@@ -89,25 +89,28 @@ def process_schedule(file):
         for part in [part1, part2]:
             part['EndTime'] = part['EndTime'].dt.strftime('%-I:%M')
         
-        return part1[['Hall', 'EndTime']], part2[['Hall', 'EndTime']]
+        # 提取日期
+        date_df = pd.read_excel(file, skiprows=5, nrows=1, usecols="C")
+        date_str = date_df.iloc[0, 0].strftime('%Y-%m-%d') if not pd.isna(date_df.iloc[0, 0]) else datetime.today().strftime('%Y-%m-%d')
+        
+        return part1[['Hall', 'EndTime']], part2[['Hall', 'EndTime']], date_str
     
     except Exception as e:
         st.error(f"处理文件时出错: {str(e)}")
-        return None, None
+        return None, None, None
 
-def create_print_layout(data, title, date):
+def create_print_layout(data, title, date_str):
     """创建打印布局"""
     if data.empty:
         return None
-    
-    # 设置中文字体
-    plt.rcParams['font.family'] = 'Microsoft YaHei'
-    plt.rcParams['font.sans-serif'] = ['Microsoft YaHei']
-    plt.rcParams['axes.unicode_minus'] = False
-    
+        
     # 设置 A5 纸张竖向尺寸
     fig = plt.figure(figsize=(5.83, 8.27), dpi=300)
-    plt.subplots_adjust(left=0.05, right=0.95, top=0.95, bottom=0.05)
+    plt.subplots_adjust(left=0.05, right=0.95, top=0.95, bottom=0.1)
+    
+    # 设置字体
+    plt.rcParams['font.family'] = 'sans-serif'
+    plt.rcParams['font.sans-serif'] = ['SimHei']
     
     # 计算行数和总数
     total_items = len(data)
@@ -115,7 +118,7 @@ def create_print_layout(data, title, date):
     num_rows = math.ceil(total_items / num_cols)
     
     # 创建网格
-    gs = gridspec.GridSpec(num_rows, num_cols, hspace=0.1, wspace=0.1)
+    gs = gridspec.GridSpec(num_rows + 1, num_cols, hspace=0.1, wspace=0.1, height_ratios=[1] * num_rows + [0.2])
     
     # 计算字体大小
     base_fontsize = min(45, 265 / num_rows)
@@ -173,16 +176,22 @@ def create_print_layout(data, title, date):
             ax.set_yticks([])
     
     # 在底部添加日期和班次信息
-    plt.figtext(0.5, 0.02, 
-                f"{date} {'白班' if title == '第一部分' else '夜班'}",
-                ha='center', 
-                fontsize=10, 
-                fontweight='bold',
-                fontfamily='Microsoft YaHei')
+    ax_bottom = plt.subplot(gs[num_rows, :])
+    ax_bottom.text(0.5, 0.5, f"{date_str} {title}",
+                   fontsize=base_fontsize * 0.8,
+                   fontweight='bold',
+                   ha='center',
+                   va='center')
+    
+    # 移除底部坐标轴
+    ax_bottom.set_xticks([])
+    ax_bottom.set_yticks([])
+    for spine in ax_bottom.spines.values():
+        spine.set_visible(False)
     
     # 转换为图片
     buffer = io.BytesIO()
-    plt.savefig(buffer, format='png', bbox_inches='tight', pad_inches=0.1, dpi=300)
+    plt.savefig(buffer, format='png', bbox_inches='tight', pad_inches=0.05)
     buffer.seek(0)
     image_base64 = base64.b64encode(buffer.getvalue()).decode()
     plt.close()
@@ -196,16 +205,12 @@ st.title("散厅时间快捷打印")
 uploaded_file = st.file_uploader("上传【放映场次核对表.xls】文件", type=["xls", "xlsx"])
 
 if uploaded_file:
-    # 读取日期
-    date_df = pd.read_excel(uploaded_file, nrows=6)
-    date_str = date_df.iloc[5, 2]  # C6 单元格的日期
-    
-    part1, part2 = process_schedule(uploaded_file)
+    part1, part2, date_str = process_schedule(uploaded_file)
     
     if part1 is not None and part2 is not None:
-        # 创建打印布局，增加日期参数
-        part1_image = create_print_layout(part1, "第一部分", date_str)
-        part2_image = create_print_layout(part2, "第二部分", date_str)
+        # 创建打印布局
+        part1_image = create_print_layout(part1, "白班", date_str)
+        part2_image = create_print_layout(part2, "夜班", date_str)
         
         # 显示预览
         col1, col2 = st.columns(2)