From 12c9a4e2f5f69f3969631c0cfb761dacfd07376c Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Mon, 7 Jul 2025 19:51:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B6=88=E6=AF=92=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/HomeOperation.vue | 25 ++++++++++++++++++-------
 src/views/home/chart.vue              | 15 +++++++++++++--
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/components/home/HomeOperation.vue b/src/components/home/HomeOperation.vue
index 45487b4..3d3e4ee 100644
--- a/src/components/home/HomeOperation.vue
+++ b/src/components/home/HomeOperation.vue
@@ -155,7 +155,7 @@ const operationState = computed(() => {
 const startInjection = async () => {
   const stopParams = {
     className: 'DisinfectionCtrlServiceExt',
-    fnName: 'setHandleStopPumpInjectionFlag',
+    fnName: 'handleStartPumpInjection',
     params: {},
   }
   await sendCmd(stopParams)
@@ -165,12 +165,23 @@ const startInjection = async () => {
 const stopInjection = async () => {
   const stopParams = {
     className: 'DisinfectionCtrlServiceExt',
-    fnName: 'clearHandleStopPumpInjectionFlag',
+    fnName: 'handleStopPumpInjection',
     params: {},
   }
   await sendCmd(stopParams)
   FtMessage.success('操作成功')
 }
+
+const formatSeconds = (seconds: number) => {
+  const hours = Math.floor(seconds / 3600)
+  const minutes = Math.floor((seconds % 3600) / 60)
+  // const remainingSeconds = seconds % 60
+
+  // 补零函数
+  const padZero = (num: number) => num.toString().padStart(2, '0')
+
+  return `${padZero(hours)}:${padZero(minutes)}`
+}
 </script>
 
 <template>
@@ -212,10 +223,10 @@ const stopInjection = async () => {
     v-if="!operationState"
     style="width: 100%; display: flex; align-items: center; justify-content: center; margin-top: 10px"
   >
-    <div style="margin-right: 10px">
-      <span v-if="homeStore.disinfectionState.handlePumpStopFlag">已开启</span>
-      <span v-else>已关闭</span>
-    </div>
+    <!--    <div style="margin-right: 10px"> -->
+    <!--      <span v-if="homeStore.disinfectionState.handlePumpStopFlag">已开启</span> -->
+    <!--      <span v-else>已关闭</span> -->
+    <!--    </div> -->
     <el-button type="primary" @click="startInjection">
       开启喷液
     </el-button>
@@ -231,7 +242,7 @@ const stopInjection = async () => {
       <span v-else> 消毒状态： </span>
     </div>
     <div v-if="disinfectionState.state === 'disinfection'" class="home-remaini-value">
-      {{ curStateRemainTimeS }}
+      {{ formatSeconds(homeStore.disinfectionState.curStateRemainTimeS) }}
     </div>
     <div v-else>
       {{ deviceStateMap[disinfectionState.state] }}
diff --git a/src/views/home/chart.vue b/src/views/home/chart.vue
index 6fc0526..3146f6a 100644
--- a/src/views/home/chart.vue
+++ b/src/views/home/chart.vue
@@ -132,6 +132,17 @@ onMounted(async () => {
 onUnmounted(() => {
   clearInterval(poll)
 })
+
+const formatSeconds = (seconds: number) => {
+  const hours = Math.floor(seconds / 3600)
+  const minutes = Math.floor((seconds % 3600) / 60)
+  // const remainingSeconds = seconds % 60
+
+  // 补零函数
+  const padZero = (num: number) => num.toString().padStart(2, '0')
+
+  return `${padZero(hours)}:${padZero(minutes)}`
+}
 </script>
 
 <template>
@@ -155,8 +166,8 @@ onUnmounted(() => {
             <span v-if="disinfectionState.state === 'disinfection'"> 预计剩余时间: </span>
             <span v-else> 消毒状态： </span>
           </div>
-          <div v-if="curStateRemainTime" class="home-chart-value">
-            {{ curStateRemainTime }}
+          <div v-if="homeStore.disinfectionState.curStateRemainTimeS" class="home-chart-value">
+            {{ formatSeconds(homeStore.disinfectionState.curStateRemainTimeS) }}
           </div>
           <div v-else class="home-chart-value">
             {{ deviceStateMap[disinfectionState.state] }}