Update app.py

app.py

@@ -6,52 +6,74 @@ import plotly.express as px
 import matplotlib.font_manager as fm
 import matplotlib as mpl
 import io
+import time
 
-# Ensure proper encoding for Chinese characters
+# 確保正確的中文字符編碼
 st.set_page_config(page_title="ESG 專題數據分析", page_icon=":chart_with_upwards_trend:", layout="wide")
 
-# Define URLs
+# 定義 URL
 urls = {
     "溫室氣體": "https://mopsfin.twse.com.tw/opendata/t187ap46_L_1.csv",
     "能源": "https://mopsfin.twse.com.tw/opendata/t187ap46_O_2.csv",
     "董事會揭露": "https://mopsfin.twse.com.tw/opendata/t187ap46_L_6.csv"
 }
 
-# Function to download and load CSV files into DataFrame
+# 下載並加載 CSV 文件到 DataFrame 的函數
+@st.cache_data
 def load_data():
     dataframes = {}
     for name, url in urls.items():
         response = requests.get(url)
-        response.encoding = 'utf-8'  # Set encoding to UTF-8
+        response.encoding = 'utf-8'
         df = pd.read_csv(io.StringIO(response.text), encoding='utf-8')
-        df = df.fillna(0)  # Replace missing values with 0
+        df = df.fillna(0)
         dataframes[name] = df
     return dataframes
 
-# Load all datasets
-dataframes = load_data()
-
-# Streamlit App
+# Streamlit 應用
 st.title("ESG 專題數據分析")
 
-# Allow user to select dataset
-dataset_choice = st.selectbox("選擇要顯示的數據集", list(dataframes.keys()))
+# 添加一個加載數據的按鈕
+if st.button("加載數據"):
+    # 顯示進度條
+    progress_bar = st.progress(0)
+    for i in range(100):
+        time.sleep(0.01)
+        progress_bar.progress(i + 1)
+    
+    # 加載所有數據集
+    dataframes = load_data()
+    st.success("數據加載完成！")
+
+    # 允許用戶選擇數據集
+    dataset_choice = st.selectbox("選擇要顯示的數據集", list(dataframes.keys()))
 
-# Get the selected dataframe
-selected_df = dataframes[dataset_choice]
+    # 獲取選定的 DataFrame
+    selected_df = dataframes[dataset_choice]
 
-# Allow user to select a column for pie chart
-column_choice = st.selectbox("選擇欄位來繪製圓餅圖", selected_df.columns)
+    # 允許用戶選擇用於繪製圓餅圖的列
+    column_choice = st.selectbox("選擇欄位來繪製圖表", selected_df.columns)
 
-# Check if the column is numerical
-if pd.api.types.is_numeric_dtype(selected_df[column_choice]):
-    # Create a pie chart using plotly
-    fig = px.pie(selected_df, names=selected_df.index, values=column_choice, title=f"{dataset_choice} - {column_choice} 圓餅圖")
-    st.plotly_chart(fig)
-else:
-    st.write("選定的欄位不是數值類型，無法繪製圓餅圖。")
+    # 檢查該列是否為數值類型
+    if pd.api.types.is_numeric_dtype(selected_df[column_choice]):
+        # 創建一個標籤頁布局
+        tab1, tab2 = st.tabs(["圓餅圖", "長條圖"])
+        
+        with tab1:
+            # 使用 plotly 創建圓餅圖
+            fig_pie = px.pie(selected_df, names=selected_df.index, values=column_choice, 
+                             title=f"{dataset_choice} - {column_choice} 圓餅圖")
+            st.plotly_chart(fig_pie)
+        
+        with tab2:
+            # 使用 plotly 創建長條圖
+            fig_bar = px.bar(selected_df, x=selected_df.index, y=column_choice, 
+                             title=f"{dataset_choice} - {column_choice} 長條圖")
+            st.plotly_chart(fig_bar)
+    else:
+        st.write("選定的欄位不是數值類型，無法繪製圖表。")
 
-# Download and set custom font for displaying Chinese characters
+# 下載並設置自定義字體以顯示中文字符
 font_url = "https://drive.google.com/uc?id=1eGAsTN1HBpJAkeVM57_C7ccp7hbgSz3_&export=download"
 font_response = requests.get(font_url)
 with open("TaipeiSansTCBeta-Regular.ttf", "wb") as font_file: