From f920064ce42eaaa74311446c089ceb52d2830491 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期四, 13 四月 2023 14:35:33 +0800
Subject: [PATCH] 34
---
src/views/home/index.vue | 128 +++++++++++++++++++++++++++++++-----------
src/samples/httpApi.ts | 5 -
src/samples/node-api.ts | 7 +-
package.json | 2
src/samples/faceApi.ts | 8 +-
src/stores/sockteInfo.ts | 6 +
imgs/1681365418963.png | 0
7 files changed, 105 insertions(+), 51 deletions(-)
diff --git a/imgs/1681365418963.png b/imgs/1681365418963.png
new file mode 100644
index 0000000..db59e46
--- /dev/null
+++ b/imgs/1681365418963.png
Binary files differ
diff --git a/package.json b/package.json
index b2b99c8..3ab2169 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sign-tool",
- "version": "2.5.9",
+ "version": "2.6.0",
"icon": "public/favicon.ico",
"main": "dist/electron/main/index.js",
"author": "",
diff --git a/src/samples/faceApi.ts b/src/samples/faceApi.ts
index 3faa6a4..24c1117 100644
--- a/src/samples/faceApi.ts
+++ b/src/samples/faceApi.ts
@@ -55,11 +55,11 @@
let runtime = new $Util.RuntimeOptions({ });
console.log('-----监测图片--')
client.searchFaceAdvance(searchFaceAdvanceRequest, runtime).then(re=>{
- console.log('返回结果')
- console.log(re.statusCode)
+ // console.log('返回结果')
+ // console.log(re.statusCode)
if(re.statusCode===200){
const matchList=re.body.data?.matchList
- console.log('得到的人脸库')
+ // console.log('得到的人脸库')
console.log(matchList)
if(matchList?.length>0){
const faceItems =matchList[0].faceItems
@@ -79,7 +79,7 @@
}
}).finally(()=>{
- console.log('---------------都要执行的')
+ // console.log('---------------都要执行的')
// 删除图片
delImg(path)
})
diff --git a/src/samples/httpApi.ts b/src/samples/httpApi.ts
index 5b8fdb4..fa3ac2c 100644
--- a/src/samples/httpApi.ts
+++ b/src/samples/httpApi.ts
@@ -13,17 +13,12 @@
clientCode:confingInfoStore().confingInfo.clientCode,
queryCode:codeStr
}
- console.log('发送患者code 到http',mode)
getPatientInfo2(mode).then(re=>{
- console.log('获取到患者信息-------')
- console.log(re)
writePatient(re.data)
})
}
const updatePatientApi=(pam:object)=>{
- console.log('发送患者结果到后台 到http',pam)
updatePatient(pam).then(re=>{
- console.log('发送患者结果到后端返回',re)
writeResult(re.data)
})
diff --git a/src/samples/node-api.ts b/src/samples/node-api.ts
index 9b67661..4f129ca 100644
--- a/src/samples/node-api.ts
+++ b/src/samples/node-api.ts
@@ -24,8 +24,7 @@
let clientCode=''
// 主进程发送消息到渲染进程
ipcRenderer.on('message-koa', (_event, ...args) => {
-
- console.log('koa返回http请求消息', ...args)
+ // console.log('koa返回http请求消息', ...args)
const Result:ResultInfo=args[0]
writeResult(Result)
})
@@ -79,8 +78,8 @@
})
},10000)
const writeResult=(res: ResultInfo)=>{
- console.log(res)
- console.log(`写入结果类型${res.deviceType},写入结果=${res.result}`)
+ // console.log(`收到设备回传结果：类型=${res.deviceType},结果=${res.result}`)
+ ipcRenderer.invoke('logger', `收到设备回传结果：类型=${res.deviceType},结果=${res.result}`)
switch(res.deviceType){
case '读卡器':
console.log('读卡器收到消息')
diff --git a/src/stores/sockteInfo.ts b/src/stores/sockteInfo.ts
index 64f7f4a..e52ebda 100644
--- a/src/stores/sockteInfo.ts
+++ b/src/stores/sockteInfo.ts
@@ -59,13 +59,11 @@
* @param infoObj 体重结果
*/
function setweightSockte(infoObj:info){
- console.log(infoObj,'入参')
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')
}
@@ -100,6 +98,10 @@
dkqSockte.value.result=info.result
dkqSockte.value.resultTime=info.resultTime
}
+ /**
+ * 更新人脸识别
+ * @param info
+ */
function setfaceSockte(info:info){
faceInfoSockte.value.deviceName=info.deviceName
faceInfoSockte.value.result=info.result
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 8828af0..c1235a7 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -65,7 +65,6 @@
state.clockNum = patientInfoStore().viewNumber
// 清除定时器
clearInterval(state.timerNum)
- console.log('------------------')
timer = setInterval(() => {
if (state.clockNum > 0) {
state.clockNum--
@@ -142,7 +141,6 @@
state.di_ya = ''
state.mai_bu = ''
}
- state.clockNum = patientInfoStore().viewNumber
if (isUseFaceRecogService.value) {
console.log('开启人脸识别')
state.dialogVisible = true
@@ -171,39 +169,42 @@
mai_bu: "",//脉搏,
haodu: "0px",
})
+ // 监控患者信息变化
watch(
() => patientInfo.value.datetime,
() => {
- console.log('患者信息变化，置空临时患者code', patientInfo.value)
patientCodeLs = ''
patientCodeLsXy = ''
- console.log(patientCodeLs, '患者codec初始化')
state.aimTSL = ''
- sockteStore().setweightSockte({
- type: "体重秤",
- state: 2,
- deviceName: "",
- result: "0",
- resultTime: ""
- })
- sockteStore().setxyjSockte({
- type: "血压计",
- state: 2,
- deviceName: "",
- result: "",
- resultTime: ""
- })
+ // 定时数秒器
settime()
if (patientInfo.value.id !== 0 && patientInfo.value.name !== '' && patientInfo.value.isScheduled === 1) {
+ // console.log(`患者信息识别成功:${patientInfo.value.name}`)
+ ipcRenderer.invoke('logger', `患者信息识别成功:${patientInfo.value.name}`)
let str = `${patientInfo.value.name}识别成功。`
state.dialogVisible = false
speech.value?.speak({ text: str }).then(() => {
- console.log("播报完成...")
+ })
+ sockteStore().setweightSockte({
+ type: "体重秤",
+ state: 2,
+ deviceName: "",
+ result: "0",
+ resultTime: ""
+ })
+ sockteStore().setxyjSockte({
+ type: "血压计",
+ state: 2,
+ deviceName: "",
+ result: "",
+ resultTime: ""
})
}
// 没有找到患者
else if (patientInfo.value.name === '') {
+ ipcRenderer.invoke('logger', '接收到的患者为空')
+ // console.log('接收到的患者为空')
if (isUseFaceRecogService.value) {
state.dialogVisible = true
}
@@ -211,21 +212,39 @@
}
// 没有排班
else if (patientInfo.value.isScheduled === 0) {
+ ipcRenderer.invoke('logger', `患者没有排班:${patientInfo.value.name}`)
+ // console.log( `患者没有排班:${patientInfo.value.name}`)
//关闭人脸弹框
state.dialogVisible = false
speech.value?.speak({ text: `${patientInfo.value.name}今日没有排班,不能自助签到` }).then(() => {
- console.log("播报完成...")
+ // console.log("播报完成...")
+ })
+ sockteStore().setweightSockte({
+ type: "体重秤",
+ state: 2,
+ deviceName: "",
+ result: "0",
+ resultTime: ""
+ })
+ sockteStore().setxyjSockte({
+ type: "血压计",
+ state: 2,
+ deviceName: "",
+ result: "",
+ resultTime: ""
})
return
}
}
);
+ // 体重发生了变化
watch(
() => weightInfo.value.resultTime,
async () => {
- console.log("体重变化了", weightInfo.value)
// 体重不能0
if (weightInfo.value.result !== "0"&&patientInfo.value.code!=='') {
+ ipcRenderer.invoke('logger', `体重变化了:${weightInfo.value.result}`)
+ console.log(`体重变化了:${weightInfo.value.result}`)
// 发送结果到sockte服务
const mode = {
patientCode: patientInfo.value.code,
@@ -234,13 +253,15 @@
}
if (patientCodeLs !== mode.patientCode) {
const tt = mode.weight.replace('.', '点')
- console.log('发送患者结果', tt)
speech.value?.speak({ text: `称重完成,${tt}kg` }).then(() => {
console.log("播报完成...")
})
patientCodeLs = mode.patientCode
state.fasongNum=0
- sundMode(mode)
+ // 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()
}
else {
// 临时患者code=当前患者code
@@ -253,34 +274,38 @@
}
}
);
+ // 血压发送了变化
watch(
() => xyjInfo.value.resultTime,
async () => {
if (xyjInfo.value.result !== '') {
+ ipcRenderer.invoke('logger', `血压发生变化了:${weightInfo.value.result}`)
+ console.log(`血压发生变化了:${weightInfo.value.result}`)
const list = xyjInfo.value.result.split(',')
if (list.length === 3) {
state.gao_ya = list[0]
state.di_ya = list[1]
state.mai_bu = list[2]
}
+ // 患者信息为空
if (patientInfo.value.id === 0) {
speech.value?.speak({ text: "没有识别的患者,请先验证患者" }).then(() => {
- console.log("播报完成...")
+ // console.log("播报完成...")
})
+ // 有患者信息
} else {
speech.value?.speak({ text: `收缩压：${state.gao_ya},舒张压：${state.di_ya},脉搏：${state.mai_bu}` }).then(() => {
- console.log("播报完成...")
+ // console.log("播报完成...")
})
const mode = {
patientCode: patientInfo.value.code,
weight: '',
bloodPressure: xyjInfo.value.result
-
}
- // 写入vuex
- // sendPationSet(mode)
state.fasongNum=0
- sundMode(mode)
+ // console.log(`开始发送结果到服务器：患者：${patientInfo.value.name},血压结果：${mode.bloodPressure}`)
+ ipcRenderer.invoke('logger', `开始发送结果到服务器：患者：${patientInfo.value.name},血压结果：${mode.bloodPressure}`)
+ sundModeXyj()
}
} else {
state.gao_ya = ""
@@ -296,7 +321,7 @@
console.log(dkqInfo.value, '读卡器')
if (dkqInfo.value.result !== '' && dkqInfo.value.result !== undefined) {
const code = dkqInfo.value.result.split(",")[0]
- console.log('获取读卡器的code', code)
+ console.log(`获取读卡器的code=${code},发送到服务请求患者信息`)
sendPationCodeApi(code)
}
}
@@ -305,8 +330,8 @@
watch(
()=>faceInfo.value.result,
()=>{
- console.log('页面收到了人脸识别')
if(faceInfo.value.result!==''){
+ console.log(`获取人脸识别code=${faceInfo.value.result},发送到服务请求患者信息`)
sendPationCodeApi(faceInfo.value.result)
}
}
@@ -316,9 +341,13 @@
state.clockNum = viewNumber.value
}
);
- const sundMode= (mode:any)=>{
+ const sundModeTz= ()=>{
+ const mode = {
+ patientCode: patientInfo.value.code,
+ weight: weightInfo.value.result,
+ bloodPressure: ''
+ }
state.fasongNum++
- // const res= await updatePatient(mode)
ipcRenderer.invoke('logger', `患者结果上传,第${state.fasongNum}次`)
ipcRenderer.invoke('logger', '参数：'+JSON.stringify(mode))
updatePatient(mode).then(re=>{
@@ -330,9 +359,39 @@
return false
}).catch(re=>{
ElMessage('结果发送失败')
+ console.log('结果发送失败')
ipcRenderer.invoke('logger', `结果发送失败:第${state.fasongNum}次，3秒后重新发送`)
if(state.fasongNum<3){
- setTimeout(sundMode,5000);
+ setTimeout(sundModeTz,5000);
+ }
+ else{
+ ipcRenderer.invoke('logger', '3次结果上传都失败放弃本次请求')
+ return false
+ }
+ })
+ }
+ const sundModeXyj= ()=>{
+ const mode = {
+ patientCode: patientInfo.value.code,
+ weight: '',
+ bloodPressure: xyjInfo.value.result
+ }
+ state.fasongNum++
+ ipcRenderer.invoke('logger', `患者结果上传,第${state.fasongNum}次`)
+ ipcRenderer.invoke('logger', '参数：'+JSON.stringify(mode))
+ updatePatient(mode).then(re=>{
+ ElMessage.success('结果发送成功')
+ ipcRenderer.invoke('logger', '结果上传成功')
+ setTimeout(() => {
+ fuxuan()
+ },8000)
+ return false
+ }).catch(re=>{
+ ElMessage('结果发送失败')
+ console.log('结果发送失败')
+ ipcRenderer.invoke('logger', `结果发送失败:第${state.fasongNum}次，3秒后重新发送`)
+ if(state.fasongNum<3){
+ setTimeout(sundModeXyj,5000);
}
else{
ipcRenderer.invoke('logger', '3次结果上传都失败放弃本次请求')
@@ -351,7 +410,6 @@
if (state.caozuo > 10) {
ipcRenderer.send('winClose')
}
- console.log(state.caozuo)
}
onMounted(() => {
console.log('页面初始化', os.hostname())
--
Gitblit v1.8.0