From f4de4859835453beb578e6aa177380dd844595cd Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Sun, 21 Sep 2025 08:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=83=BD=E9=87=8F=E6=9D=A1?=
 =?UTF-8?q?=E6=95=B0=E5=80=BC=E5=A4=84=E7=90=86=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=A7=91=E5=AD=A6=E8=AE=A1=E6=95=B0=E6=B3=95=E3=80=81=E5=B8=A6?=
 =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E5=92=8C=E9=80=97=E5=8F=B7=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/EnergyBar.vue | 53 ++++++++++++++---
 src/renderer/components/main.vue      | 82 +++++++++++++++++----------
 src/renderer/components/work.vue      |  2 +-
 3 files changed, 98 insertions(+), 39 deletions(-)

diff --git a/src/renderer/components/EnergyBar.vue b/src/renderer/components/EnergyBar.vue
index f1a09b4..f03ed0b 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,43 +23,78 @@ 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个的大一点，10个格子的间隙适中
+      if (this.segments === 6) return 2
+      return this.gap
+    },
     litCells() {
-      const clamped = Math.max(0, Math.min(100, Math.round(this.percent || 0)))
+      // 处理科学计数法、带符号和逗号的数值
+      const percent = this.parseNumericValue(this.percent)
+      const clamped = Math.max(0, Math.min(100, Math.round(percent)))
       // 一个能量格代表10（进1制向上取整）
       const cells = Math.ceil(clamped / 10)
       return Math.max(0, Math.min(this.segments, cells))
     },
     displayText() {
-      return this.text || `${Math.max(0, Math.min(100, Math.round(this.percent || 0)))}%`
+      const percent = this.parseNumericValue(this.percent)
+      return this.text || `${Math.max(0, Math.min(100, Math.round(percent)))}%`
     },
     tooltip() {
       return this.displayText
     },
     tone() {
       // 低电量红 / 中电量橙 / 高电量绿
-      const p = Math.max(0, Math.min(100, this.percent || 0))
+      const percent = this.parseNumericValue(this.percent)
+      const p = Math.max(0, Math.min(100, percent))
       if (p <= 20) return 'danger'
       if (p <= 50) return 'warning'
       return 'success'
     },
     chargingIndex() {
-      // 若不是整十，最后一格视为“充能中”
-      const p = Math.max(0, Math.min(100, this.percent || 0))
+      // 若不是整十，最后一格视为"充能中"
+      const percent = this.parseNumericValue(this.percent)
+      const p = Math.max(0, Math.min(100, percent))
       if (p % 10 === 0 || this.litCells === 0) return -1
       return this.litCells
     }
   },
   methods: {
+    parseNumericValue(value) {
+      if (value === null || value === undefined || value === '') return 0
+      
+      // 转换为字符串处理
+      let str = String(value).trim()
+      
+      // 移除逗号分隔符
+      str = str.replace(/,/g, '')
+      
+      // 处理科学计数法 (如 1.23e+5, 1.23E-2)
+      if (/[eE]/.test(str)) {
+        const num = parseFloat(str)
+        return isFinite(num) ? num : 0
+      }
+      
+      // 处理带符号的数值 (如 +123, -456)
+      if (/^[+-]/.test(str)) {
+        const num = parseFloat(str)
+        return isFinite(num) ? num : 0
+      }
+      
+      // 普通数值转换
+      const num = parseFloat(str)
+      return isFinite(num) ? num : 0
+    },
     cellClass(n) {
       const lit = n <= this.litCells
       // 仿数码表样式：前2格为红色，其余为绿色（只在被点亮时着色）
-      const zone = n <= 2 ? 'low' : 'high'
+      const zone = 'high'
       return [
         'energy-cell',
         lit ? (zone === 'low' ? 'is-red' : 'is-green') : 'is-off',
diff --git a/src/renderer/components/main.vue b/src/renderer/components/main.vue
index a9d55ca..dc6a39c 100644
--- a/src/renderer/components/main.vue
+++ b/src/renderer/components/main.vue
@@ -223,6 +223,7 @@
                     :class="{ guide_body: beginStep && currentStep == 7 }">
                     <el-button
                       type="primary"
+                      :disabled="infoData.length == 0 && state == false"
                       @click="newWork">
                       {{ $t('index.newWork') }}
                     </el-button>
@@ -421,18 +422,19 @@
                   min-width="80">
                 </el-table-column>
                 <el-table-column
+                  align="center"
                   prop="RibbonAmount"
                   :label="$t('main.tableRibbonAmount')"
                   min-width="100">
                   <template slot-scope="scope">
-                    <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>
+                    <EnergyBar
+                      :percent="getRibbonPercent(scope.row.RibbonAmount, getRibbonAmount(scope.row.ModeName, scope.row.RibbonType))"
+                      :segments="10"
+                      :text="String(scope.row.RibbonAmount || 0)"
+                      :show-text="false"
+                      :gap="1"
+                      :border-radius="1">
+                    </EnergyBar>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -466,13 +468,14 @@
                   </template>
                 </el-table-column>
                 <el-table-column
+                  align="center"
                   prop="PrinterRemaCapa"
                   :label="$t('main.tablePrinterRemaCapa')"
                   min-width="100">
                   <template slot-scope="scope">
                     <EnergyBar
-                      :percent="safePercent((scope.row.PrinterRemaCapa > 0 ? scope.row.PrinterRemaCapa : 0), getPrinterRemaCapaAmount(scope.row.ModeName))"
-                      :segments="(scope.row.ModeName === 'TH80N' ? 6 : 8)"
+                      :percent="safePercent((scope.row.PrinterRemaCapa > 0 ? scope.row.PrinterRemaCapa : 0), 100)"
+                      :segments="(os.CardsoonModel&&os.CardsoonModel.toLowerCase() === 'th80n' ? 6 : 8)"
                       :showText="true"
                       :text="String(scope.row.PrinterRemaCapa > 0 ? scope.row.PrinterRemaCapa : 0)" />
                   </template>
@@ -1150,8 +1153,10 @@ export default {
       return row.AssUuid ? 'ass-row' : ''
     },
     safePercent(value, total) {
-      const v = Number(value)
-      const t = Number(total)
+      console.log(value, total)
+      // 处理科学计数法、带符号和逗号的数值
+      const v = this.parseNumericValue(value)
+      const t = this.parseNumericValue(total)
       if (!isFinite(v) || !isFinite(t) || t <= 0) return 0
       const p = (v / t) * 100
       if (!isFinite(p) || isNaN(p)) return 0
@@ -1780,11 +1785,44 @@ 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
+    },
+    parseNumericValue(value) {
+      if (value === null || value === undefined || value === '') return 0
+      
+      // 转换为字符串处理
+      let str = String(value).trim()
+      
+      // 移除逗号分隔符
+      str = str.replace(/,/g, '')
+      
+      // 处理科学计数法 (如 1.23e+5, 1.23E-2)
+      if (/[eE]/.test(str)) {
+        const num = parseFloat(str)
+        return isFinite(num) ? num : 0
+      }
+      
+      // 处理带符号的数值 (如 +123, -456)
+      if (/^[+-]/.test(str)) {
+        const num = parseFloat(str)
+        return isFinite(num) ? num : 0
+      }
+      
+      // 普通数值转换
+      const num = parseFloat(str)
+      return isFinite(num) ? num : 0
+    },
+    getRibbonPercent(current, total) {
+      console.log('current, total', current, total)
+      // 处理科学计数法、带符号和逗号的数值
+      const c = this.parseNumericValue(current)
+      const t = this.parseNumericValue(total)
+      if (!t || t <= 0) return 0
+      const percent = (c / t) * 100
+      return Math.max(0, Math.min(100, Math.round(percent)))
     },
     play() {
       this.$confirm(this.$t('index.tipsPlaying'), this.$t('index.tips'), {
@@ -2195,10 +2233,6 @@ a {
 /deep/ .el-table__expand-icon > i {
   font-size: 12px;
 }
-/* 进度条内数字不换行 */
-/deep/ .ribbon-progress .el-progress-bar__innerText {
-  white-space: nowrap;
-}
 
 .user {
   font-size: 15px;
@@ -2260,16 +2294,6 @@ a {
   }
 }
 
-/* 色带进度条样式优化 */
-/deep/ .ribbon-progress .el-progress-bar__outer {
-  background: linear-gradient(180deg, #f3f6fa, #e5ebf5);
-  border-radius: 6px;
-  border: 1px solid #cfd6e3;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,.08);
-}
-/deep/ .ribbon-progress .el-progress-bar__inner {
-  border-radius: 6px;
-}
 +.ribbon-wrap {
   display: inline-flex;
   align-items: center;
diff --git a/src/renderer/components/work.vue b/src/renderer/components/work.vue
index f76bd9e..7ae33c0 100644
--- a/src/renderer/components/work.vue
+++ b/src/renderer/components/work.vue
@@ -1096,7 +1096,7 @@ export default {
       //    value: 4,
       //    label: this.$t("work.forbidCopyU")
       //}],
-      size_form: 4,
+      size_form: null,
       type_form: 0,
       file_form: 0,
       number: 1,