From fe1570e63bf624919fd0c5a5a5eb23092468f3b9 Mon Sep 17 00:00:00 2001
From: koko1108 <vupzj62k@gmail.com>
Date: Thu, 16 Oct 2025 11:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E7=94=A2=E8=A8=AD=E5=AE=9A:=20?=
 =?UTF-8?q?=E5=8C=AF=E5=87=BAexcel=20API=E4=B8=B2=E6=8E=A5=20=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4=E5=A0=B1=E8=A1=A8=E7=AE=A1=E7=90=86=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=AF=84=E5=9C=8D=20=E4=BF=AE=E6=94=B9=E4=BB=8A=E6=97=A5?=
 =?UTF-8?q?=E7=94=9F=E7=94=A2=E7=9B=AE=E6=A8=99UI=20=E6=BA=AB=E5=BA=A6=20-?=
 =?UTF-8?q?=20=E7=B3=96=E5=BA=A6=E3=80=81=E5=86=B7=E8=97=8F=E6=BA=AB?=
 =?UTF-8?q?=E5=BA=A6=20=E6=96=B0=E5=A2=9E=20=E4=B8=80=E5=B0=8F=E6=99=82?=
 =?UTF-8?q?=E3=80=81=E5=9B=9B=E5=B0=8F=E6=99=82=E3=80=81=E5=85=AB=E5=B0=8F?=
 =?UTF-8?q?=E6=99=82=20=E8=A8=AD=E5=AE=9A=20=E5=91=8A=E8=AD=A6=E5=B0=8F?=
 =?UTF-8?q?=E9=A1=9E=E7=AF=A9=E9=81=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/productSetting/api.js                |   1 +
 src/apis/productSetting/index.js              |  27 +++-
 src/apis/report/index.js                      |  30 +++--
 .../AlertQuery/AlertSearchTypesButton.vue     |   2 +-
 .../components/AlertSetting/AlertSubList.vue  |  18 ++-
 src/views/dashboard/Dashboard.vue             |  15 ++-
 .../components/DashboardFrozenTemp.vue        |  40 ++++--
 .../components/DashboardImmediateTemp.vue     |  90 ++++++++-----
 .../components/DashboardMoreModal.vue         | 122 ++++++++++++++++++
 .../dashboard/components/DashboardTarget.vue  |   6 +-
 .../dashboardForgeCards/CookingPotCard.vue    |   5 +-
 .../components/InventorySettingAddModal.vue   |   1 +
 .../components/InventorySettingTable.vue      |  31 ++++-
 .../reportManagement/ReportManagement.vue     |  45 +++----
 14 files changed, 340 insertions(+), 93 deletions(-)
 create mode 100644 src/views/dashboard/components/DashboardMoreModal.vue

diff --git a/src/apis/productSetting/api.js b/src/apis/productSetting/api.js
index faf2dfe..a43716d 100644
--- a/src/apis/productSetting/api.js
+++ b/src/apis/productSetting/api.js
@@ -5,3 +5,4 @@ export const POST_SETTING_TYPE_API = `/SituationRoom/SetProduct`;
 export const GET_SETTING_INVENTORY_API = `/SituationRoom/GetInventory`;
 export const POST_SETTING_INVENTORY_API = `/SituationRoom/SaveInventory`;
 export const GET_SETTING_INVENTORY_LOG_API = `/SituationRoom/GetInventoryLog`;
+export const GET_SETTING_INVENTORY_EXPORT_API = `/api/report/Inventory`;
diff --git a/src/apis/productSetting/index.js b/src/apis/productSetting/index.js
index 5930409..6606986 100644
--- a/src/apis/productSetting/index.js
+++ b/src/apis/productSetting/index.js
@@ -1,4 +1,4 @@
-import instance from "@/util/request";
+import instance, { fileInstance } from "@/util/request";
 import apihandler from "@/util/apihandler";
 import {
   POST_CHANGE_GROUP_VALUE_API,
@@ -7,7 +7,9 @@ import {
   GET_SETTING_INVENTORY_API,
   POST_SETTING_INVENTORY_API,
   GET_SETTING_INVENTORY_LOG_API,
+  GET_SETTING_INVENTORY_EXPORT_API,
 } from "./api";
+import downloadExcel from "@/util/downloadExcel";
 
 export const postChangeGroupValue = async (data) => {
   const res = await instance.post(POST_CHANGE_GROUP_VALUE_API, data);
@@ -72,3 +74,26 @@ export const getSettingInventoryLog = async ({ start_time, end_time }) => {
     isSuccess: false,
   });
 };
+
+export const getInventoryExportData = async ({ start_date, end_date }) => {
+  const res = await fileInstance.get(
+    GET_SETTING_INVENTORY_EXPORT_API,
+    {
+      params: {
+        start_date,
+        end_date,
+      },
+      responseType: "blob",
+    }
+  );
+
+  return apihandler(
+    res.code,
+    res,
+    {
+      msg: res.msg,
+      code: res.code,
+    },
+    downloadExcel
+  );
+};
diff --git a/src/apis/report/index.js b/src/apis/report/index.js
index 93b0e1c..0eb6579 100644
--- a/src/apis/report/index.js
+++ b/src/apis/report/index.js
@@ -12,10 +12,11 @@ import instance, { fileInstance } from "@/util/request";
 import apihandler from "@/util/apihandler";
 import downloadExcel from "@/util/downloadExcel";
 
-export const getElectricMeterLog = async ({ start_date }) => {
+export const getElectricMeterLog = async ({ start_date, end_date }) => {
   const res = await instance.get(GET_ELECTRIC_METER_API, {
     params: {
       start_date,
+      end_date,
     },
   });
 
@@ -26,10 +27,14 @@ export const getElectricMeterLog = async ({ start_date }) => {
   });
 };
 
-export const getRefrigerationRoomTemperatureLog = async ({ start_date }) => {
+export const getRefrigerationRoomTemperatureLog = async ({
+  start_date,
+  end_date,
+}) => {
   const res = await instance.get(GET_REFRIGERATION_ROOM_TEMPERATURE_API, {
     params: {
       start_date,
+      end_date,
     },
   });
   return apihandler(res.code, res.data, {
@@ -39,10 +44,11 @@ export const getRefrigerationRoomTemperatureLog = async ({ start_date }) => {
   });
 };
 
-export const getSipLog = async ({ start_date }) => {
+export const getSipLog = async ({ start_date, end_date }) => {
   const res = await instance.get(GET_SIP_API, {
     params: {
       start_date,
+      end_date,
     },
   });
   return apihandler(res.code, res.data, {
@@ -52,10 +58,11 @@ export const getSipLog = async ({ start_date }) => {
   });
 };
 
-export const getCipLog = async ({ start_date }) => {
+export const getCipLog = async ({ start_date, end_date }) => {
   const res = await instance.get(GET_CIP_API, {
     params: {
       start_date,
+      end_date,
     },
   });
   return apihandler(res.code, res.data, {
@@ -65,10 +72,11 @@ export const getCipLog = async ({ start_date }) => {
   });
 };
 
-export const exportElectricMeterLog = async ({ start_date }) => {
+export const exportElectricMeterLog = async ({ start_date, end_date }) => {
   const res = await fileInstance.get(EXPORT_ELECTRIC_METER_API, {
     params: {
       start_date,
+      end_date,
     },
     responseType: "blob",
   });
@@ -84,12 +92,16 @@ export const exportElectricMeterLog = async ({ start_date }) => {
   );
 };
 
-export const exportRefrigerationRoomTemperatureLog = async ({ start_date }) => {
+export const exportRefrigerationRoomTemperatureLog = async ({
+  start_date,
+  end_date,
+}) => {
   const res = await fileInstance.get(
     EXPORT_REFRIGERATION_ROOM_TEMPERATURE_API,
     {
       params: {
         start_date,
+        end_date,
       },
       responseType: "blob",
     }
@@ -106,10 +118,11 @@ export const exportRefrigerationRoomTemperatureLog = async ({ start_date }) => {
   );
 };
 
-export const exportSipLog = async ({ start_date }) => {
+export const exportSipLog = async ({ start_date, end_date }) => {
   const res = await fileInstance.get(EXPORT_SIP_API, {
     params: {
       start_date,
+      end_date,
     },
     responseType: "blob",
   });
@@ -124,10 +137,11 @@ export const exportSipLog = async ({ start_date }) => {
   );
 };
 
-export const exportCipLog = async ({ start_date }) => {
+export const exportCipLog = async ({ start_date, end_date }) => {
   const res = await fileInstance.get(EXPORT_CIP_API, {
     params: {
       start_date,
+      end_date,
     },
     responseType: "blob",
   });
diff --git a/src/views/alert/components/AlertQuery/AlertSearchTypesButton.vue b/src/views/alert/components/AlertQuery/AlertSearchTypesButton.vue
index 5760493..81803d6 100644
--- a/src/views/alert/components/AlertQuery/AlertSearchTypesButton.vue
+++ b/src/views/alert/components/AlertQuery/AlertSearchTypesButton.vue
@@ -68,7 +68,7 @@ watch(searchParams, (newValue) => {
       {{ checkedItem.length === store.subSys.length ? "取消全選" : "全選" }}
     </button>
     <Checkbox
-      v-for="sub in store.subSys"
+      v-for="sub in store.subSys.filter(sub => sub.is_alarm === 1)"
       :key="sub.key"
       :title="sub.full_name"
       :value="sub.sub_system_tag"
diff --git a/src/views/alert/components/AlertSetting/AlertSubList.vue b/src/views/alert/components/AlertSetting/AlertSubList.vue
index a77b693..3a5d20c 100644
--- a/src/views/alert/components/AlertSetting/AlertSubList.vue
+++ b/src/views/alert/components/AlertSetting/AlertSubList.vue
@@ -2,29 +2,33 @@
 import { ref, onMounted, watch } from "vue";
 import useSearchParam from "@/hooks/useSearchParam";
 import useActiveBtn from "@/hooks/useActiveBtn";
-import { getAlertSubList } from "@/apis/alert";
+import useBuildingStore from "@/stores/useBuildingStore";
 
 const { searchParams, changeParams } = useSearchParam();
 const { items, changeActiveBtn, setItems, selectedBtn } = useActiveBtn();
+const store = useBuildingStore();
 
-const getSubSystems = async () => {
-  const res = await getAlertSubList();
-  const subSystems = res.data.history_Main_Systems.flatMap((mainSystem) => {
-    return mainSystem.history_Sub_systems.map((subSystem, index) => ({
+const updateSubSystemsFromStore = () => {
+  const subSystems = store.subSys
+    .filter(subSystem => subSystem.is_alarm === 1)
+    .map(subSystem => ({
       title: subSystem.full_name,
       key: subSystem.sub_system_tag,
       active: searchParams.value?.subSys_id
         ? searchParams.value.subSys_id === subSystem.sub_system_tag
         : subSystem.sub_system_tag == "DP",
     }));
-  });
   setItems(subSystems);
 };
 
 onMounted(() => {
-  getSubSystems();
+  updateSubSystemsFromStore();
 });
 
+watch(() => store.subSys, () => {
+  updateSubSystemsFromStore();
+}, { deep: true });
+
 watch(selectedBtn,
   (newValue) => {
     if (newValue) {
diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
index 24d16e9..15f5f01 100644
--- a/src/views/dashboard/Dashboard.vue
+++ b/src/views/dashboard/Dashboard.vue
@@ -9,6 +9,7 @@ import DashboardElectricity from "./components/DashboardElectricity.vue";
 import DashboardAlert from "./components/DashboardAlert.vue";
 import DashboardForgeOptionButton from "./components/DashboardForgeOptionButton.vue";
 import DashboardForgeOptionCard from "./components/DashboardForgeOptionCard.vue";
+import DashboardMoreModal from "./components/DashboardMoreModal.vue";
 import {
   getDashboardInit,
   getDashboardOptionRealTimeData,
@@ -106,6 +107,13 @@ const getCompany = async () => {
   companyOptions.value = res.data.map((d) => ({ ...d, key: d.id }));
 };
 
+const currentIntervalType = ref("");
+
+const openModal = (type) => {
+  currentIntervalType.value = type;
+  dashboard_more.showModal();
+};
+
 // 開始定時器
 const startInterval = (option) => {
   // 清除之前的定時器
@@ -155,6 +163,7 @@ onUnmounted(() => {
 </script>
 
 <template>
+  <DashboardMoreModal :currentIntervalType="currentIntervalType" />
   <div class="flex justify-between">
     <div class="w-1/4 h-full flex flex-col justify-start border-dashboard z-20">
       <div class=""><DashboardProduct /></div>
@@ -186,9 +195,11 @@ onUnmounted(() => {
       :companyOptions="companyOptions"
     />
     <div class="w-1/4 flex flex-col justify-start border-dashboard z-20">
-      <div class=""><DashboardImmediateTemp /></div>
+      <div class="">
+        <DashboardImmediateTemp @open-modal="openModal" />
+      </div>
       <div class="mt-5">
-        <DashboardFrozenTemp />
+        <DashboardFrozenTemp  @open-modal="openModal"/>
       </div>
       <div class="mt-5">
         <DashboardElectricity />
diff --git a/src/views/dashboard/components/DashboardFrozenTemp.vue b/src/views/dashboard/components/DashboardFrozenTemp.vue
index 0b43d0d..fcd161f 100644
--- a/src/views/dashboard/components/DashboardFrozenTemp.vue
+++ b/src/views/dashboard/components/DashboardFrozenTemp.vue
@@ -55,12 +55,11 @@ const defaultChartOption = ref({
 
 const frozen_temp_chart = ref(null);
 
-
 const data = ref([]);
 
-const getData = async () => {
+const getData = async (timeInterval) => {
   const res = await getDashboardTemp({
-    timeInterval: 1, // 時間間隔=>1.4.8
+    timeInterval, // 時間間隔=>1.4.8
     tempOption: 2, // 1:即時溫度;2:冷藏溫度
   });
   if (res.isSuccess) {
@@ -68,6 +67,25 @@ const getData = async () => {
   }
 };
 
+watch(
+  searchParams,
+  (newValue, oldValue) => {
+    if (
+      newValue[intervalType] &&
+      newValue[intervalType] !== oldValue[intervalType]
+    ) {
+      window.clearInterval(timeoutTimer.value);
+      getData(parseInt(newValue[intervalType]));
+      timeoutTimer.value = setInterval(() => {
+        getData(parseInt(newValue[intervalType]));
+      }, 60000);
+    }
+  },
+  {
+    deep: true,
+  }
+);
+
 watch(data, (newValue) => {
   if (newValue?.length > 0) {
     frozen_temp_chart.value.chart.setOption({
@@ -90,19 +108,19 @@ watch(data, (newValue) => {
   }
 });
 
-let timer = null;
+const timeoutTimer = ref("");
 
 onMounted(() => {
   getData();
-  timer = setInterval(() => {
+  timeoutTimer.value = setInterval(() => {
     getData();
   }, 60 * 1000);
 });
 
 onUnmounted(() => {
-  if (timer) {
-    clearInterval(timer);
-    timer = null;
+  if (timeoutTimer.value) {
+    clearInterval(timeoutTimer.value);
+    timeoutTimer.value = null;
   }
 });
 </script>
@@ -111,6 +129,12 @@ onUnmounted(() => {
   <!-- 冷藏溫度 -->
   <div class="flex items-center justify-between mb-3">
     <h3 class="text-info font-bold text-xl text-center">冷藏溫度</h3>
+    <button
+      class="btn-xs btn btn-info"
+      @click="$emit('open-modal', intervalType)"
+    >
+      時間設定
+    </button>
   </div>
 
   <LineChart
diff --git a/src/views/dashboard/components/DashboardImmediateTemp.vue b/src/views/dashboard/components/DashboardImmediateTemp.vue
index d93a5b6..a57cd9a 100644
--- a/src/views/dashboard/components/DashboardImmediateTemp.vue
+++ b/src/views/dashboard/components/DashboardImmediateTemp.vue
@@ -80,9 +80,9 @@ onMounted(() => {
   ]);
 });
 
-const getData = async (typeOption) => {
+const getData = async (timeInterval, typeOption) => {
   const res = await getDashboardTemp({
-    timeInterval: 1, // 時間間隔=>1.4.8
+    timeInterval, // 時間間隔=>1.4.8
     tempOption: 1,
     typeOption, // 1:二重釜-溫度;2:調理鍋-溫度;3:二重釜-糖度
   });
@@ -91,16 +91,35 @@ const getData = async (typeOption) => {
   }
 };
 
-let timer = null;
+const timeoutTimer = ref("");
 
 watch(
   selectedBtn,
   (newValue) => {
-    window.clearInterval(timer);
-    getData(newValue.key);
-    timer = setInterval(() => {
-      getData(newValue.key);
-    }, 60 * 1000);
+    window.clearInterval(timeoutTimer.value);
+    getData(parseInt(searchParams.value[intervalType] || 1), newValue.key);
+    timeoutTimer.value = setInterval(() => {
+      getData(parseInt(searchParams.value[intervalType] || 1), newValue.key);
+    }, 60000);
+  },
+  {
+    deep: true,
+  }
+);
+
+watch(
+  searchParams,
+  (newValue, oldValue) => {
+    if (
+      newValue[intervalType] &&
+      newValue[intervalType] !== oldValue[intervalType]
+    ) {
+      window.clearInterval(timeoutTimer.value);
+      getData(parseInt(newValue[intervalType]), selectedBtn.value.key);
+      timeoutTimer.value = setInterval(() => {
+        getData(parseInt(newValue[intervalType]), selectedBtn.value.key);
+      }, 60000);
+    }
   },
   {
     deep: true,
@@ -110,34 +129,39 @@ watch(
 watch(data, (newValue) => {
   // clearChart(other_real_temp_chart.value.chart);
   if (newValue?.length > 0) {
-    other_real_temp_chart.value.chart.setOption({
-      ...defaultChartOption.value,
-      legend: {
-        data: newValue.map(({ full_name }) => full_name),
-        ...defaultChartOption.value.legend,
-      },
-      xAxis: {
-        ...defaultChartOption.value.xAxis,
-        data: newValue[0]?.data.map(({ time }) => dayjs(time).format("HH:mm")),
-      },
-      series: newValue.map(({ full_name, data: seriesData }, index) => ({
-        name: full_name,
-        type: "line",
-        data: seriesData.map(({ value }) => value),
-        showSymbol: false,
-        itemStyle: {
-          color: SECOND_CHART_COLOR[index],
+    other_real_temp_chart.value.chart.setOption(
+      {
+        ...defaultChartOption.value,
+        legend: {
+          data: newValue.map(({ full_name }) => full_name),
+          ...defaultChartOption.value.legend,
         },
-      })),
-    }, { notMerge: true });
+        xAxis: {
+          ...defaultChartOption.value.xAxis,
+          data: newValue[0]?.data.map(({ time }) =>
+            dayjs(time).format("HH:mm")
+          ),
+        },
+        series: newValue.map(({ full_name, data: seriesData }, index) => ({
+          name: full_name,
+          type: "line",
+          data: seriesData.map(({ value }) => value),
+          showSymbol: false,
+          itemStyle: {
+            color: SECOND_CHART_COLOR[index],
+          },
+        })),
+      },
+      { notMerge: true }
+    );
   }
   // other_real_temp_chart.value.chart.hideLoading();
 });
 
 onUnmounted(() => {
-  if (timer) {
-    clearInterval(timer);
-    timer = null;
+  if (timeoutTimer.value) {
+    clearInterval(timeoutTimer.value);
+    timeoutTimer.value = null;
   }
 });
 </script>
@@ -145,6 +169,12 @@ onUnmounted(() => {
 <template>
   <div class="flex items-center justify-between mb-3">
     <h3 class="text-info font-bold text-xl text-center">溫度-糖度</h3>
+    <button
+      class="btn-xs btn btn-info"
+      @click="$emit('open-modal', intervalType)"
+    >
+      時間設定
+    </button>
   </div>
   <div class="text-center">
     <ButtonConnectedGroup
diff --git a/src/views/dashboard/components/DashboardMoreModal.vue b/src/views/dashboard/components/DashboardMoreModal.vue
new file mode 100644
index 0000000..ac25321
--- /dev/null
+++ b/src/views/dashboard/components/DashboardMoreModal.vue
@@ -0,0 +1,122 @@
+<script setup>
+import useActiveBtn from "@/hooks/useActiveBtn";
+import { onMounted, watch } from "vue";
+import useSearchParams from "@/hooks/useSearchParam";
+const { changeParams, searchParams } = useSearchParams();
+
+const { items, changeActiveBtn, setItems, selectedBtn } = useActiveBtn();
+
+const props = defineProps({
+  currentIntervalType: {
+    type: String,
+    default: "interval_hour",
+  },
+});
+
+onMounted(() => {
+  setItems([
+    {
+      title: "1小時",
+      key: "1hour",
+      active:
+        !searchParams.value?.[props.currentIntervalType] ||
+        searchParams.value?.[props.currentIntervalType] === 1,
+      timeInterval: 1,
+    },
+    {
+      title: "4小時",
+      key: "4hour",
+      active: searchParams.value?.[props.currentIntervalType] === 4,
+      timeInterval: 4,
+    },
+    {
+      title: "8小時",
+      key: "8hour",
+      active: searchParams.value?.[props.currentIntervalType] === 8,
+      timeInterval: 8,
+    },
+  ]);
+});
+
+watch(
+  () => props.currentIntervalType,
+  (newValue) => {
+    console.log(
+      "currentIntervalType",
+      newValue,
+      searchParams.value,
+      searchParams.value?.[newValue]
+    );
+    setItems([
+      {
+        title: "1小時",
+        key: "1hour",
+        active:
+          !searchParams.value?.[newValue] ||
+          parseInt(searchParams.value?.[newValue]) === 1,
+        timeInterval: 1,
+      },
+      {
+        title: "4小時",
+        key: "4hour",
+        active: parseInt(searchParams.value?.[newValue]) === 4,
+        timeInterval: 4,
+      },
+      {
+        title: "8小時",
+        key: "8hour",
+        active: parseInt(searchParams.value?.[newValue]) === 8,
+        timeInterval: 8,
+      },
+    ]);
+  }
+);
+
+const onCancel = () => {
+  dashboard_more.close();
+};
+
+const onOk = async () => {
+  console.log(searchParams.value);
+  changeParams({
+    ...searchParams.value,
+    [props.currentIntervalType]: selectedBtn.value.timeInterval,
+  });
+  onCancel();
+};
+</script>
+
+<template>
+  <Modal id="dashboard_more" title="顯示設定" :onCancel="onCancel" width="500">
+    <template #modalContent>
+      <ButtonGroup
+        :items="items"
+        :withLine="true"
+        class="mt-8 mb-6"
+        :onclick="
+          (e, item) => {
+            changeActiveBtn(item);
+          }
+        "
+      />
+    </template>
+    <template #modalAction>
+      <button
+        type="reset"
+        class="btn btn-outline-success mr-2"
+        @click.prevent="onCancel"
+      >
+        取消
+      </button>
+      <button
+        type="submit"
+        class="btn btn-outline-success"
+        @click.stop.prevent="onOk"
+      >
+        確定
+      </button>
+    </template>
+  </Modal>
+</template>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/dashboard/components/DashboardTarget.vue b/src/views/dashboard/components/DashboardTarget.vue
index 371e54e..0ee6f08 100644
--- a/src/views/dashboard/components/DashboardTarget.vue
+++ b/src/views/dashboard/components/DashboardTarget.vue
@@ -48,7 +48,7 @@ onMounted(() => {
   setItems([
     {
       id: 1,
-      title: "配方",
+      title: "調理",
       key: 1,
       active: true,
     },
@@ -107,7 +107,7 @@ onUnmounted(() => {
           <tr>
             <th>品名</th>
             <th>狀態</th>
-            <th>生產進度</th>
+            <!-- <th>生產進度</th> -->
             <th v-if="selectedBtn?.key === 1">功能</th>
           </tr>
         </thead>
@@ -131,7 +131,7 @@ onUnmounted(() => {
             <tr v-for="item in production_data" :key="item.name">
               <td>{{ item.name }}</td>
               <td>{{ item.status }}</td>
-              <td>{{ item.progress }}</td>
+              <!-- <td>{{ item.progress }}</td> -->
               <td v-if="item.details && item.details.length">
                 <button
                   class="btn btn-xs btn-outline-info"
diff --git a/src/views/dashboard/components/dashboardForgeCards/CookingPotCard.vue b/src/views/dashboard/components/dashboardForgeCards/CookingPotCard.vue
index 4833cb8..2caf261 100644
--- a/src/views/dashboard/components/dashboardForgeCards/CookingPotCard.vue
+++ b/src/views/dashboard/components/dashboardForgeCards/CookingPotCard.vue
@@ -9,6 +9,7 @@ const tabs = [
   { label: "品檢" },
   { label: "流量計" },
   { label: "SIP" },
+  { label: "AI" },
 ];
 const activeTab = ref(tabs[0].label);
 </script>
@@ -86,9 +87,9 @@ const activeTab = ref(tabs[0].label);
                   <th>風味</th>
                   <th>色澤</th>
                   <th>雜異物</th>
-                  <th>鹽度</th>
                   <th>酸度</th>
                   <th>糖度</th>
+                  <th>鹽度</th>
                 </tr>
               </thead>
               <tbody>
@@ -102,9 +103,9 @@ const activeTab = ref(tabs[0].label);
                   <td>{{ flow.flavor }}</td>
                   <td>{{ flow.color }}</td>
                   <td>{{ flow.impurities }}</td>
-                  <td>{{ flow.actual_Salinity }}</td>
                   <td>{{ flow.actual_PH }}</td>
                   <td>{{ flow.actual_Brix }}</td>
+                  <td>{{ flow.actual_Salinity }}</td>
                 </tr>
                 <tr
                   v-if="!pot.qcResult || !pot.qcResult.length"
diff --git a/src/views/productSetting/components/InventorySettingAddModal.vue b/src/views/productSetting/components/InventorySettingAddModal.vue
index 8c7aa6d..58f298b 100644
--- a/src/views/productSetting/components/InventorySettingAddModal.vue
+++ b/src/views/productSetting/components/InventorySettingAddModal.vue
@@ -62,6 +62,7 @@ const onOk = async () => {
           class="my-2"
           name="total_capacity"
           v-if="formState?.type == 1"
+          readonly
         >
           <template #topLeft>總庫存量</template>
           <template #bottomLeft>
diff --git a/src/views/productSetting/components/InventorySettingTable.vue b/src/views/productSetting/components/InventorySettingTable.vue
index af70234..1e4d239 100644
--- a/src/views/productSetting/components/InventorySettingTable.vue
+++ b/src/views/productSetting/components/InventorySettingTable.vue
@@ -5,8 +5,9 @@ import {
   getSettingInventory,
   postSettingInventory,
   getSettingInventoryLog,
+  getInventoryExportData,
 } from "@/apis/productSetting";
-import { ref, onMounted, inject, watch } from "vue";
+import { ref, onMounted, inject, watch, computed } from "vue";
 import useActiveBtn from "@/hooks/useActiveBtn";
 const { items, changeActiveBtn, setItems, selectedBtn } = useActiveBtn();
 import dayjs from "dayjs";
@@ -106,6 +107,15 @@ const onSearch = async () => {
   }
 };
 
+const exportFile = async () => {
+  const res = await getInventoryExportData({
+    start_date: dayjs(dateRange.value[0].value).format("YYYY-MM-DD"),
+    end_date: dayjs(dateRange.value[1].value).format("YYYY-MM-DD"),
+  }).catch((err) => {
+    console.error(err);
+  });
+};
+
 const openModal = (type, item_id, record) => {
   if (type === 1) {
     formState.value = {
@@ -146,6 +156,21 @@ onMounted(() => {
   ]);
 });
 
+const submitBtns = computed(() => [
+  {
+    title: "搜尋",
+    key: "submit",
+    active: false,
+    onClick: onSearch,
+  },
+  {
+    title: "匯出",
+    key: "export",
+    active: false,
+    onClick: exportFile,
+  },
+]);
+
 watch(
   () => selectedBtn.value?.key,
   (key) => {
@@ -185,9 +210,7 @@ watch(
           :isBottomLabelExist="false"
           class="mr-5"
         />
-        <button class="btn btn-success" @click.stop.prevent="onSearch">
-          搜尋
-        </button>
+        <ButtonGroup class="ml-5" :items="submitBtns" :withLine="false" />
       </template>
     </div>
   </div>
diff --git a/src/views/reportManagement/ReportManagement.vue b/src/views/reportManagement/ReportManagement.vue
index 2d37202..048cc2a 100644
--- a/src/views/reportManagement/ReportManagement.vue
+++ b/src/views/reportManagement/ReportManagement.vue
@@ -20,15 +20,21 @@ const { items, changeActiveBtn, setItems, selectedBtn } = useActiveBtn();
 const dateRange = ref([
   {
     key: "start_at",
-    value: dayjs(),
-    dateFormat: "yyyy-MM",
+    value: dayjs().subtract(30, "day").valueOf(),
+    dateFormat: "yyyy-MM-dd",
     placeholder: "起始日期",
-    monthPicker: true,
+  },
+  {
+    key: "end_at",
+    value: dayjs().valueOf(),
+    dateFormat: "yyyy-MM-dd",
+    placeholder: "結束日期",
   },
 ]);
 
 const searchState = ref({
-  start_date: dayjs().format("YYYY-MM"),
+  start_date: dayjs().subtract(30, "day").format("YYYY-MM-DD"),
+  end_date: dayjs().format("YYYY-MM-DD"),
 });
 
 // Table 相關變數
@@ -88,26 +94,6 @@ watch(
   { immediate: true }
 );
 
-watch(
-  dateRange,
-  (newRange) => {
-    let raw = newRange && newRange[0] && newRange[0].value;
-    let baseDayjs = null;
-    if (raw && typeof raw === "object" && "year" in raw && "month" in raw) {
-      baseDayjs = dayjs(new Date(raw.year, raw.month, 1));
-    } else {
-      baseDayjs = dayjs(raw);
-    }
-    if (!baseDayjs.isValid()) {
-      baseDayjs = dayjs();
-    }
-    searchState.value = {
-      start_date: baseDayjs.format("YYYY-MM"),
-    };
-  },
-  { deep: true }
-);
-
 const submit = async (e, type = "") => {
   e?.preventDefault?.();
   e?.stopPropagation?.();
@@ -181,8 +167,13 @@ onBeforeMount(() => {
         }
       "
     />
-    <div class="flex flex-wrap items-center">
-      <DateGroup :items="dateRange" />
+    <div class="flex flex-wrap items-center mt-2">
+      <DateGroup
+        :items="dateRange"
+        :withLine="true"
+        :isTopLabelExist="false"
+        :isBottomLabelExist="false"
+      />
       <ButtonGroup class="ml-5" :items="submitBtns" :withLine="false" />
     </div>
   </div>
@@ -190,4 +181,4 @@ onBeforeMount(() => {
   </Table>
 </template>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>