From c8e147509a41dc16e80a4fbc60055a18a4de9318 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期二, 15 八月 2023 09:01:00 +0800
Subject: [PATCH] 34
---
/dev/null | 0
src/views/home/index.vue | 66 +++------------------------------
package.json | 2
3 files changed, 7 insertions(+), 61 deletions(-)
diff --git a/imgs/1686890390880.png b/imgs/1686890390880.png
deleted file mode 100644
index a892944..0000000
--- a/imgs/1686890390880.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1689746492888.png b/imgs/1689746492888.png
deleted file mode 100644
index 821bdb7..0000000
--- a/imgs/1689746492888.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1689746844895.png b/imgs/1689746844895.png
deleted file mode 100644
index 4810f49..0000000
--- a/imgs/1689746844895.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1689747349082.png b/imgs/1689747349082.png
deleted file mode 100644
index b54a023..0000000
--- a/imgs/1689747349082.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1689749960328.png b/imgs/1689749960328.png
deleted file mode 100644
index ec24e93..0000000
--- a/imgs/1689749960328.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1691297562682.png b/imgs/1691297562682.png
deleted file mode 100644
index 7e9ed53..0000000
--- a/imgs/1691297562682.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1691297565044.png b/imgs/1691297565044.png
deleted file mode 100644
index e1821e7..0000000
--- a/imgs/1691297565044.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1691299807743.png b/imgs/1691299807743.png
deleted file mode 100644
index 5040bb4..0000000
--- a/imgs/1691299807743.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1691301604017.png b/imgs/1691301604017.png
deleted file mode 100644
index e69de29..0000000
--- a/imgs/1691301604017.png
+++ /dev/null
diff --git a/imgs/1691304871090.png b/imgs/1691304871090.png
deleted file mode 100644
index 698cbdf..0000000
--- a/imgs/1691304871090.png
+++ /dev/null
Binary files differ
diff --git a/imgs/1691387450973.png b/imgs/1691387450973.png
deleted file mode 100644
index af820f6..0000000
--- a/imgs/1691387450973.png
+++ /dev/null
Binary files differ
diff --git a/package.json b/package.json
index 85d3446..7ff1350 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sign-tool",
- "version": "2.6.8",
+ "version": "2.6.9",
"icon": "public/favicon.ico",
"main": "dist/electron/main/index.js",
"author": "",
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3873aa7..722ce91 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -254,7 +254,7 @@
base64toFile(imgSrc)
}
setTimeout(() => {
- console.log(configData.value.face_push+'秒跑一次人脸识别')
+ // console.log(configData.value.face_push+'秒跑一次人脸识别')
trackerTask.run();
}, configData.value.face_push*1000);
// @ts-ignore
@@ -346,59 +346,6 @@
})
const settime = () => {
clockNum.value = patientInfoStore().viewNumber
- // // 清除定时器
- // 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=()=>{
@@ -462,8 +409,9 @@
patientCodeLsXy = ''
aimTSL.value = ''
// 定时数秒器
- settime()
+
if (patientInfo.value.id !== 0 && patientInfo.value.name !== '' && patientInfo.value.isScheduled === 1) {
+ settime()
// 人脸识别成功后 1查看是否开启测温
// console.log(`患者信息识别成功:${patientInfo.value.name}`)
ipcRenderer.invoke('logger', `患者信息识别成功:${patientInfo.value.name}`)
@@ -498,6 +446,7 @@
}
// 没有排班
else if (patientInfo.value.isScheduled === 0) {
+ settime()
ipcRenderer.invoke('logger', `患者没有排班:${patientInfo.value.name}`)
// console.log( `患者没有排班:${patientInfo.value.name}`)
//关闭人脸弹框
@@ -537,8 +486,8 @@
weight: weightInfo.value.result,
bloodPressure: ''
}
- settime()
if (patientCodeLs !== mode.patientCode) {
+ settime()
// 定时数秒器
const tt = mode.weight.replace('.', '点')
speech.value?.speak({ text: `称重完成,${tt}kg` }).then(() => {
@@ -546,7 +495,6 @@
})
patientCodeLs = mode.patientCode
fasongNum.value=0
- // console.log(`开始发送结果到服务器：患者：${patientInfo.value.name},体重结果：${weightInfo.value.result}`)
ipcRenderer.invoke('logger', `开始发送结果到服务器：患者：${patientInfo.value.name},体重结果：${weightInfo.value.result}`)
console.log(`开始发送结果到服务器：患者：${patientInfo.value.name},体重结果：${weightInfo.value.result}`)
sundModeTz()
@@ -709,9 +657,6 @@
ipcRenderer.send('winClose')
}
}
-const openPort=()=>{
- initPort('com5',115200)
-}
onMounted(() => {
console.log('页面初始化', os.hostname())
setTimeout(()=>{
@@ -741,6 +686,7 @@
setInterval(function () {
clockNum.value--
if(clockNum.value===0){
+
fuxuan()
}
inputRef.value.focus();
--
Gitblit v1.8.0