diff --git a/src/directives/draggable.js b/src/directives/draggable.js
index 726d156..3121b18 100644
--- a/src/directives/draggable.js
+++ b/src/directives/draggable.js
@@ -4,13 +4,16 @@ const moveModal = (elmnt) => {
     pos2 = 0,
     pos3 = 0,
     pos4 = 0;
-  document.body.addEventListener("mousedown", dragMouseDown, {
+  // 只在目標元素上監聽 mousedown，避免全域攔截
+  elmnt.addEventListener("mousedown", dragMouseDown, {
     passive: false,
   });
 
   function dragMouseDown(e) {
     console.log("dragMouseDown", e);
     e = e || window.event;
+    // 僅當左鍵拖曳才阻止預設（避免影響下拉選單等）
+    if (e.button !== 0) return;
     e.preventDefault();
     // get the mouse cursor position at startup:
     pos3 = e.clientX;
diff --git a/src/views/dashboard/components/DashboardElectricity.vue b/src/views/dashboard/components/DashboardElectricity.vue
index ee619f1..2a42e43 100644
--- a/src/views/dashboard/components/DashboardElectricity.vue
+++ b/src/views/dashboard/components/DashboardElectricity.vue
@@ -56,7 +56,7 @@ const getData = async () => {
 const getRealTime = async () => {
   if (store.selectedBuilding.building_guid) {
     const res = await getRealTimeDemand(store.selectedBuilding.building_guid);
-    realTimeDemand.value = res.data.reverse();
+    realTimeDemand.value = Array.isArray(res.data) ? res.data.reverse() : [];
     updateChart();
   }
 };