From 2c9170fffd5f3ca35d92db51163db9dca6fe551e Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Fri, 19 Sep 2025 11:41:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4EnergyBar=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD6=E4=B8=AA=E8=83=BD=E9=87=8F=E6=A0=BC?=
 =?UTF-8?q?=E7=9A=84=E9=97=B4=E9=9A=99=E6=AF=948=E4=B8=AA=E7=9A=84?=
 =?UTF-8?q?=E5=A4=A7=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/EnergyBar.vue | 10 +++++++---
 src/renderer/components/main.vue      |  8 +++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/EnergyBar.vue b/src/renderer/components/EnergyBar.vue
index f1a09b4..34ea0e5 100644
--- a/src/renderer/components/EnergyBar.vue
+++ b/src/renderer/components/EnergyBar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="energy-bar compact energy-dash" :title="tooltip">
-    <div class="energy-cells" :style="{ gap: gap + 'px' }">
+    <div class="energy-cells" :style="{ gap: dynamicGap + 'px' }">
       <div
         v-for="n in segments"
         :key="n"
@@ -23,12 +23,16 @@ export default {
     // 自定义文本
     text: { type: String, default: '' },
     // 尺寸控制（像素）
-    cellWidth: { type: Number, default: 4 },
-    cellHeight: { type: Number, default: 10 },
+    cellWidth: { type: Number, default: 5 },
+    cellHeight: { type: Number, default: 14 },
     gap: { type: Number, default: 1 },
     borderRadius: { type: Number, default: 1 },
   },
   computed: {
+    dynamicGap() {
+      // 6个能量格的间隙比8个的大一点
+      return this.segments === 6 ? Math.max(this.gap, 2) : this.gap
+    },
     litCells() {
       const clamped = Math.max(0, Math.min(100, Math.round(this.percent || 0)))
       // 一个能量格代表10（进1制向上取整）
diff --git a/src/renderer/components/main.vue b/src/renderer/components/main.vue
index a9d55ca..55ee80e 100644
--- a/src/renderer/components/main.vue
+++ b/src/renderer/components/main.vue
@@ -428,10 +428,8 @@
                     <el-progress
                       class="ribbon-progress"
                       :color="customColors"
-                      :width="60"
                       define-back-color="#dfe4ed"
                       :format="() => String(scope.row.RibbonAmount || 0)"
-                      :stroke-width="3"
                       :percentage="safePercent(scope.row.RibbonAmount, getRibbonAmount(scope.row.ModeName, scope.row.RibbonType))"></el-progress>
                   </template>
                 </el-table-column>
@@ -466,6 +464,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column
+                  align="center"
                   prop="PrinterRemaCapa"
                   :label="$t('main.tablePrinterRemaCapa')"
                   min-width="100">
@@ -1780,11 +1779,10 @@ export default {
     },
     getPrinterRemaCapaAmount(ModeName) {
       // console.log('PrinterRemaCapa', this.ribbonList[ModeName].PrinterRemaCapa)
-      return this.ribbonList[ModeName].PrinterRemaCapa || 0
+      return this.ribbonList[ModeName]&&this.ribbonList[ModeName].PrinterRemaCapa ? this.ribbonList[ModeName].PrinterRemaCapa : 0
     },
     getRibbonAmount(ModeName, RibbonType) {
-      console.log('getRibbonAmount', this.ribbonList)
-      return this.ribbonList[ModeName][RibbonType] || 0
+      return this.ribbonList[ModeName]&&this.ribbonList[ModeName][RibbonType] ? this.ribbonList[ModeName][RibbonType] : 0
     },
     play() {
       this.$confirm(this.$t('index.tipsPlaying'), this.$t('index.tips'), {