From 387cceb92cb2ed96bdb4a38d355d389d7252f122 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期六, 25 二月 2023 15:57:31 +0800
Subject: [PATCH] 45

---
 src/views/home/index.vue |    8 +-------
 src/stores/sockteInfo.ts |   15 ++++++++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/stores/sockteInfo.ts b/src/stores/sockteInfo.ts
index 4199126..3b4b95f 100644
--- a/src/stores/sockteInfo.ts
+++ b/src/stores/sockteInfo.ts
@@ -52,11 +52,16 @@
      */
     function setweightSockte(infoObj:info){
         console.log(infoObj,'入参')
-        weightSockte.value.deviceName=infoObj.deviceName
-        weightSockte.value.result=infoObj.result
-        weightSockte.value.resultTime=infoObj.resultTime
-        weightSockte.value.state=infoObj.state
-        console.log('体重秤更新')
+        if(Number(infoObj.result)>10||Number(infoObj.result)===0){
+            weightSockte.value.deviceName=infoObj.deviceName
+            weightSockte.value.result=infoObj.result
+            weightSockte.value.resultTime=infoObj.resultTime
+            weightSockte.value.state=infoObj.state
+            console.log('体重秤更新')
+        }else{
+            console.log('体重不足10gk')
+        }
+       
     }
      /**
      * 更新体重秤工作状态
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 8f032da..2e2923d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -194,11 +194,7 @@
             console.log("播报完成...")
           })
         }
-        else {
-          if( Number(weightInfo.value.result)<=10){
-            return false
-          }
-          else if (weightInfo.value.result !== "0") {
+        if (weightInfo.value.result !== "0") {
             // 发送结果到sockte服务
             const mode = {
               patientCode: patientInfo.value.code,
@@ -233,8 +229,6 @@
               state.aimTSL = (Number(weightInfo.value.result) - Number(patientInfo.value.pureWeight)).toFixed(2)
             }
           }
-
-        }
       }
     );
     watch(

--
Gitblit v1.8.0