From 4725009d035cd7f4616ab17cea36345cd03f68aa Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期一, 07 八月 2023 13:55:14 +0800
Subject: [PATCH] 更新

---
 src/views/home/index.vue |  128 ++++++++++++++++++++++--------------------
 1 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 31d4389..71a2cd0 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -156,11 +156,12 @@
                 </div>
               </div>
               <div style="height: 75%;">
-                <div style="background: rgba(243, 247, 243, 0.3); height: 100%; width: 100%; font-size: 1.3rem; font-weight: 800; color: #FFFFFF;">
-                  <div class="textjuzhong" style="height: 25%;  width: 100%;">干体重  {{patientInfo.pureWeight}}  kg</div>
-                  <div class="textjuzhong" style="height: 25%;  width: 100%;">透析器  {{patientInfo.txq}}</div>
-                  <div class="textjuzhong" style="height: 25%;  width: 100%;">治疗模式  {{patientInfo.medMethod}}</div>
-                  <div class="textjuzhong" style="height: 25%;  width: 100%;">灌流器  {{patientInfo.glq}}</div>
+                <div style="background: rgba(243, 247, 243, 0.3); height: 100%; width: 100%; font-size: 2.5rem; line-height: 4.5rem; font-weight: 800; color: #FFFFFF; text-align: center;padding-top: 1rem;">
+                  <span style="font-size: 4rem; color:#DFB144 ; " >干体重  {{patientInfo.pureWeight}}  kg</span>
+                  <br>
+                  <span > 透析器:{{patientInfo.txq}}</span>
+                  <span > 治疗模式:{{patientInfo.medMethod}}</span>
+                  <span > 灌流器:{{patientInfo.glq}}</span>
                 </div>
               </div>
           </el-col>
@@ -344,56 +345,60 @@
   return patientInfoStore().viewNumber
 })
 const settime = () => {
-  // 计数倒计时
   clockNum.value = patientInfoStore().viewNumber
-  // 清除定时器
-  clearInterval(timerNum.value)
-  timer = setInterval(() => {
-    if (clockNum.value > 0) {
-      clockNum.value--
-    }
-    else {
-      clearInterval(timer)
-      clockNum.value = patientInfoStore().viewNumber
-      patientInfoStore().setpatientInfo({
-        id: 0,
-        code: '',
-        name: '',
-        patientAvatarIcon: '',
-        deviceCode: '',
-        hemoCode: '',
-        pureWeight: '',
-        datetime: ''
-      })
-      sockteStore().setweightSockte({
-        type: '体重秤',
-        deviceName: '',
-        result: '0',
-        resultTime: '',
-        state: 2
-      })
-      sockteStore().setxyjSockte({
-        type: '血压计',
-        deviceName: '',
-        result: '',
-        resultTime: '',
-        state: 2
-      })
-      sockteStore().setfaceSockte({
-        type: '人脸识别',
-        deviceName: '',
-        result: '',
-        resultTime: '',
-        state: 2
-      })
-      aimTSL.value = ''
-      gao_ya.value = ''
-      di_ya.value = ''
-      mai_bu.value = ''
-    }
-  }, 1000)
-  // 记录定时器
-  timerNum.value = timer
+  // // 清除定时器
+  // clearInterval(timerNum.value)
+  // if(timerNum.value===0){
+  //   timer = setInterval(() => {
+  //       if (clockNum.value > 0) {
+  //         clockNum.value--
+  //       }
+  //       else {
+  //         // clearInterval(timer)
+  //         clockNum.value = patientInfoStore().viewNumber
+  //         patientInfoStore().setpatientInfo({
+  //           id: 0,
+  //           code: '',
+  //           name: '',
+  //           patientAvatarIcon: '',
+  //           deviceCode: '',
+  //           hemoCode: '',
+  //           pureWeight: '',
+  //           datetime: ''
+  //         })
+  //         sockteStore().setweightSockte({
+  //           type: '体重秤',
+  //           deviceName: '',
+  //           result: '0',
+  //           resultTime: '',
+  //           state: 2
+  //         })
+  //         sockteStore().setxyjSockte({
+  //           type: '血压计',
+  //           deviceName: '',
+  //           result: '',
+  //           resultTime: '',
+  //           state: 2
+  //         })
+  //         sockteStore().setfaceSockte({
+  //           type: '人脸识别',
+  //           deviceName: '',
+  //           result: '',
+  //           resultTime: '',
+  //           state: 2
+  //         })
+  //         aimTSL.value = ''
+  //         gao_ya.value = ''
+  //         di_ya.value = ''
+  //         mai_bu.value = ''
+  //       }
+  //     }, 1000)
+  //   // 记录定时器
+  //   timerNum.value = timer
+  // }else{
+    
+  // }
+ 
 }
 //发送消除某些状态
 const fuxuan=()=>{
@@ -532,9 +537,9 @@
           weight: weightInfo.value.result,
           bloodPressure: ''
         }
+        settime()
         if (patientCodeLs !== mode.patientCode) {
           // 定时数秒器
-          settime()
           const tt = mode.weight.replace('.', '点')
           speech.value?.speak({ text: `称重完成,${tt}kg` }).then(() => {
             console.log("播报完成...")
@@ -616,9 +621,7 @@
   updatePatient(mode).then(re=>{
     ElMessage.success('结果发送成功')
     ipcRenderer.invoke('logger', '结果上传成功')
-    setTimeout(() => {
-      fuxuan()
-    },configData.value.timeJg)
+    clockNum.value = Number(configData.value.timeJg/1000)
     return false
   }).catch(re=>{
     ElMessage('结果发送失败')
@@ -648,9 +651,8 @@
   updatePatient(mode).then(re=>{
     ElMessage.success('结果发送成功')
     ipcRenderer.invoke('logger', '结果上传成功')
-    setTimeout(() => {
-      fuxuan()
-    },configData.value.timeJg)
+    // 倒计时结果显示
+    clockNum.value = Number(configData.value.timeJg/1000)
     return false
   }).catch(re=>{
     ElMessage('结果发送失败')
@@ -737,6 +739,10 @@
     }
     clockNum.value = patientInfoStore().viewNumber
     setInterval(function () {
+      clockNum.value--
+      if(clockNum.value===0){
+        fuxuan()
+      }
       inputRef.value.focus();
       date.value=formatDate(new Date(),'YYYY-mm-dd HH:MM')
       if(Number(date.value.substring(11,13))<12){

--
Gitblit v1.8.0