From 86210aee9fd2816718b90cdfc2c2cfd5816efe8f Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期六, 18 三月 2023 17:58:21 +0800
Subject: [PATCH] 更新人脸识别

---
 src/views/home/index.vue |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 8f032da..ec2126a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -47,6 +47,9 @@
     const weightInfo = computed(() => {
       return sockte.weightSockte
     })
+    const faceInfo = computed(() => {
+      return sockte.faceInfoSockte
+    })
     const xyjInfo = computed(() => {
       return sockte.xyjSockte
     })
@@ -194,11 +197,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,
@@ -223,18 +222,16 @@
               patientCodeLs = mode.patientCode
             }
             else {
-              console.log(`patientCodeLs===${patientCodeLs} ,mode.patCode${mode.patientCode}`)
-              speech.value?.speak({ text: "不能重复称重,请先刷卡然后再称重" }).then(() => {
-                console.log("播报完成...")
-              })
+              // console.log(`patientCodeLs===${patientCodeLs} ,mode.patCode${mode.patientCode}`)
+              // speech.value?.speak({ text: "不能重复称重,请先刷卡然后再称重" }).then(() => {
+              //   console.log("播报完成...")
+              // })
             }
             // 计算目标脱水量
             if (Number(weightInfo.value.result) > 0 && Number(patientInfo.value.pureWeight) !== 0) {
-              state.aimTSL = (Number(weightInfo.value.result) - Number(patientInfo.value.pureWeight)).toFixed(2)
+              state.aimTSL = (Number(weightInfo.value.result) - Number(patientInfo.value.pureWeight)- Number(patientInfo.value.clothesWeight)).toFixed(2)
             }
           }
-
-        }
       }
     );
     watch(
@@ -295,6 +292,14 @@
         }
       }
     );
+    watch(
+      ()=>faceInfo.value.result,
+      ()=>{
+        console.log('页面收到了人脸识别')
+        sendPationCodeApi(faceInfo.value.result)
+        // console.log(faceInfo.value.result)
+      }
+    )
     watch(() => viewNumber,
       () => {
         state.clockNum = viewNumber.value
@@ -437,12 +442,12 @@
           <el-row class="rowdiv">
             <el-col :span="12">
               <div class="lableclass">
-                机号:
+                衣物重(kg):
               </div>
             </el-col>
             <el-col :span="12">
               <div class="textclass">
-                {{ patientInfo.deviceCode }}
+                {{ patientInfo.clothesWeight }}
               </div>
             </el-col>
           </el-row>

--
Gitblit v1.8.0