fix(energy): 优化能耗数据显示与图表自适应刻度

@@ -695,8 +695,11 @@ function drawBarChart() {
   const chartW = w - padLeft - padRight
   const chartW = w - padLeft - padRight
   const chartH = h - padTop - padBottom
   const chartH = h - padTop - padBottom
 
 
-  const maxVal = Math.max(...kwhList.map(d => d.value || 0), 70)
-  const niceMax = Math.ceil(maxVal / 10) * 10
+  const rawMax = Math.max(...kwhList.map(d => d.value || 0))
+  const maxVal = rawMax > 0 ? rawMax : 1
+  // 按数据量级自适应刻度间隔：>=10 用 10，>=1 用 1，否则用 0.1
+  const step = maxVal >= 10 ? 10 : maxVal >= 1 ? 1 : 0.1
+  const niceMax = Math.ceil(maxVal / step) * step
 
 
   // 网格线 + Y轴标签
   // 网格线 + Y轴标签
   ctx.strokeStyle = '#eee'
   ctx.strokeStyle = '#eee'
@@ -704,13 +707,13 @@ function drawBarChart() {
   ctx.fillStyle = '#999'
   ctx.fillStyle = '#999'
   ctx.font = '11px sans-serif'
   ctx.font = '11px sans-serif'
   ctx.textAlign = 'right'
   ctx.textAlign = 'right'
-  for (let v = 0; v <= niceMax; v += 10) {
+  for (let v = 0; v <= niceMax + 1e-9; v += step) {
     const y = padTop + chartH - (v / niceMax) * chartH
     const y = padTop + chartH - (v / niceMax) * chartH
     ctx.beginPath()
     ctx.beginPath()
     ctx.moveTo(padLeft, y)
     ctx.moveTo(padLeft, y)
     ctx.lineTo(w - padRight, y)
     ctx.lineTo(w - padRight, y)
     ctx.stroke()
     ctx.stroke()
-    ctx.fillText(String(v), padLeft - 6, y + 4)
+    ctx.fillText(Number(v).toFixed(step < 1 ? 1 : 0), padLeft - 6, y + 4)
   }
   }
 
 
   // X 轴线
   // X 轴线
@@ -758,7 +761,7 @@ function drawBarChart() {
       ctx.fillStyle = '#2060a8'
       ctx.fillStyle = '#2060a8'
       ctx.font = 'bold 13px sans-serif'
       ctx.font = 'bold 13px sans-serif'
       ctx.textAlign = 'center'
       ctx.textAlign = 'center'
-      ctx.fillText(String(val), x + barW_px / 2, y - 7)
+      ctx.fillText(Number(val).toFixed(2), x + barW_px / 2, y - 7)
 
 
       // X 轴标签高亮
       // X 轴标签高亮
       ctx.fillStyle = '#2060a8'
       ctx.fillStyle = '#2060a8'
@@ -776,7 +779,7 @@ function drawBarChart() {
         ctx.fillStyle = '#555'
         ctx.fillStyle = '#555'
         ctx.font = '9px sans-serif'
         ctx.font = '9px sans-serif'
         ctx.textAlign = 'center'
         ctx.textAlign = 'center'
-        ctx.fillText(String(val), x + barW_px / 2, y - 4)
+        ctx.fillText(Number(val).toFixed(2), x + barW_px / 2, y - 4)
       }
       }
 
 
       // X 轴标签
       // X 轴标签

@@ -553,11 +553,15 @@ function drawComboChart() {
       }
       }
     })
     })
 
 
-    // 存储碰撞矩形（整个堆叠柱区域）
+    // 存储碰撞矩形（整列区域：图表顶部到 X 轴，便于在空柱/折线上也能 hover）
     const fullH = (totalSec / 3600 / niceMaxHours) * chartH
     const fullH = (totalSec / 3600 / niceMaxHours) * chartH
     comboBarRects.push({
     comboBarRects.push({
-      x, y: padTop + chartH - fullH, w: barW, h: fullH,
-      totalSec, kwh: item.value || 0
+      x: x - gap / 2,
+      y: padTop,
+      w: barW + gap,
+      h: chartH,
+      totalSec, kwh: item.value || 0,
+      fullStackH: fullH
     })
     })
 
 
     // --- X轴标签 ---
     // --- X轴标签 ---

@@ -53,7 +53,7 @@
           </div>
           </div>
           
           
           <div class="info-list">
           <div class="info-list">
-            <div class="info-item">用电量:<span>{{ device.evalue }} kw·h</span></div>
+            <div class="info-item">用电量:<span>{{ Number(device.evalue).toFixed(2) }} kw·h</span></div>
             <div class="info-item">{{ getRunStatusLabel(device.runStatus) }}:<span>{{ device.duration }}</span></div>
             <div class="info-item">{{ getRunStatusLabel(device.runStatus) }}:<span>{{ device.duration }}</span></div>
           </div>
           </div>
         </div>
         </div>
@@ -249,7 +249,7 @@
           <div v-for="(item, idx) in effHover.devices" :key="idx" class="eft-row">
           <div v-for="(item, idx) in effHover.devices" :key="idx" class="eft-row">
             <i class="dot" :style="{ background: item.color }"></i>
             <i class="dot" :style="{ background: item.color }"></i>
             <span class="eft-name">{{ item.name }}</span>
             <span class="eft-name">{{ item.name }}</span>
-            <span class="eft-val">{{ item.value }} kw·h</span>
+            <span class="eft-val">{{ Number(item.value).toFixed(2) }} kw·h</span>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>