Update app.py

app.py

@@ -2,6 +2,7 @@ import streamlit as st
 import pandas as pd
 import requests
 import plotly.express as px
+import matplotlib.pyplot as plt
 import io
 
 # 設置顏色主題
@@ -30,6 +31,17 @@ def beautify_chart(fig):
     fig.update_yaxes(showline=True, linewidth=2, linecolor='lightgray', gridcolor='lightgray')
     return fig
 
+# **生成 Matplotlib 圖表**
+def generate_matplotlib_plot(df, selected_columns):
+    fig, ax = plt.subplots()
+    for col in selected_columns:
+        ax.plot(df["公司名稱"], df[col], label=col)
+    ax.set_xlabel("公司名稱")
+    ax.set_ylabel("排放量")
+    ax.set_title("Matplotlib 折線圖")
+    ax.legend()
+    st.pyplot(fig)
+
 # **生成 Plotly 圖表**
 def generate_plots(df, df_name, selected_columns, chart_type):
     selected_columns = list(selected_columns)  # 確保是列表
@@ -51,8 +63,6 @@ def generate_plots(df, df_name, selected_columns, chart_type):
 
         if chart_type == "折線圖":
             fig = px.line(df, x="公司名稱", y=valid_selected_columns, title=f"{df_name} - 折線圖", color_discrete_sequence=theme)
-        elif chart_type == "散點圖":
-            fig = px.scatter(df, x="公司名稱", y=valid_selected_columns, title=f"{df_name} - 散點圖", color_discrete_sequence=theme)
         elif chart_type == "長條圖":
             fig = px.bar(df, x="公司名稱", y=valid_selected_columns, title=f"{df_name} - 長條圖", color_discrete_sequence=theme)
         elif chart_type == "餅圖":
@@ -60,10 +70,14 @@ def generate_plots(df, df_name, selected_columns, chart_type):
             total_emissions = total_emissions.melt(id_vars=["公司名稱"], value_vars=valid_selected_columns, var_name="排放類型", value_name="總排放量")
             fig = px.pie(total_emissions, values='總排放量', names='公司名稱', title=f"{df_name} - 餅圖", color_discrete_sequence=theme, hole=0.3)
             fig.update_traces(textposition='inside', textinfo='percent+label')
-
+        
         if fig:
             fig = beautify_chart(fig)
             st.plotly_chart(fig, use_container_width=True)
+        
+        # 額外顯示 Matplotlib 圖表
+        st.subheader("📉 Matplotlib 折線圖")
+        generate_matplotlib_plot(df, valid_selected_columns)
 
 # **下載數據**
 urls = [
@@ -86,7 +100,7 @@ emission_columns = [col for col in ["範疇一排放量(噸CO2e)", "範疇二排
 selected_columns = st.multiselect("選擇要顯示的排放類別", emission_columns, default=emission_columns[:1] if emission_columns else [])
 
 # **選擇圖表類型**
-chart_type = st.selectbox("選擇圖表類型", ["折線圖", "散點圖", "長條圖", "餅圖"])
+chart_type = st.selectbox("選擇圖表類型", ["折線圖", "長條圖", "餅圖"])
 
 # **生成圖表**
 if selected_columns: