From aec98248047327dd29d9ac6f5f307d5a86b939a1 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期三, 06 八月 2025 13:57:32 +0800
Subject: [PATCH] 更新
---
src/views/home/index.vue | 73 ++++++++++++++++--------------------
1 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1412579..0806e19 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -56,7 +56,7 @@
{{patientInfo.name}}
</div>
</div>
- <div style="display: grid;place-items: center;font-size: 120px;font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;font-weight: 800;color: #65AAF6;">
+ <div style="display: grid;place-items: center;font-size: 120px;font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;font-weight: 800;color: black;">
<template v-if="configData.deviceType==='体重秤'">
<!-- {{ weightInfo.result }} -->
{{weightInfoResult}}
@@ -90,7 +90,7 @@
</template>
</div>
- <div class="textwenben" style="height: 70%; font-size: 80px; color: #9F61DC;font-weight: 1000;text-align: center;">
+ <div class="textwenben" style="height: 70%; font-size: 80px; color: black;font-weight: 1000;text-align: center;">
<template v-if="configData.deviceType==='体重秤'">
<template v-if="patientInfo.isAfterMed===0&&!configData.gantiziShow">
<div style="font-size: 50px"> {{ patientInfo.设备分区名称 }}<br/>{{ patientInfo.deviceNo }}</div>
@@ -100,16 +100,20 @@
{{patientInfo.pureWeight}}
</template>
+ </template>
+ <template v-else>
+ <!-- 显示干体重 -->
+ <template v-if="configData.gantiziShow">
+ {{patientInfo.pureWeight}}
+
+
</template>
+ <!-- 显示分区 -->
<template v-else>
- <template v-if="patientInfo.isAfterMed===0">
- <div style="font-size: 50px"> {{ patientInfo.设备分区名称 }}<br/>{{ patientInfo.deviceNo }}</div>
- </template>
- <template v-else>
- {{patientInfo.pureWeight}}
- </template>
-
+ <div style="font-size: 50px"> {{ patientInfo.设备分区名称 }}<br/>{{ patientInfo.deviceNo }}</div>
</template>
+
+ </template>
</div>
</el-col>
<el-col :span="8">
@@ -131,7 +135,7 @@
</template>
</div>
- <div class="textwenben" style="height: 70%; font-size: 80px; color: #41B593; font-weight: 1000;
+ <div class="textwenben" style="height: 70%; font-size: 80px; color: black; font-weight: 1000;
border-left: #FFFFFF solid 2px;border-right: #FFFFFF solid 2px;">
<template v-if="configData.deviceType==='体重秤'">
<template v-if="patientInfo.isAfterMed===0">
@@ -156,7 +160,7 @@
</div>
</el-col>
<el-col :span="8">
- <div class="textwenben" style="height: 28%; font-size: 25px;background-color: #65AAF6;border-radius: 0 12px 0 0 ">
+ <div class="textwenben" style="height: 28%; font-size: 25px;background-color: #65AAF6; border-radius: 0 12px 0 0 ">
<template v-if="configData.deviceType==='体重秤'">
<template v-if="patientInfo.isAfterMed===0">
目标脱水量(L)
@@ -174,7 +178,7 @@
</template>
</div>
- <div class="textwenben" style="height: 70%; font-size: 80px; color: #65AAF6;">
+ <div class="textwenben" style="height: 70%; font-size: 80px; color:black ;">
<template v-if="configData.deviceType==='体重秤'">
<template v-if="patientInfo.isAfterMed===0">
<!-- 目标脱水量(L) -->
@@ -321,9 +325,7 @@
const getUserMediaFail = ref(false) // 获取用户媒体失败
let lsDateTime:any=new Date()
const msg = ref<string>("没识别到人脸...");
-const datetext=computed(()=>{
- return formatDate(new Date(),'YYYY-mm-dd WWW')
-})
+const datetext=ref(formatDate(new Date(),'YYYY-mm-dd WWW'))
/**体重发送时候显示在界面的体重 */
const weightInfoResult=ref()
let timer:any=new Date()
@@ -372,31 +374,18 @@
const configData=computed(()=>{
return confingInfoStore().confingInfo
})
-const isLink = computed(() => {
- return !sockte.isLink
-})
// 网络链接
const netLink = computed(() => {
- if(!sockte.netLink){
- ipcRenderer.invoke('logger', '网络已经断开')
- }else{
- ipcRenderer.invoke('logger', '网络已经恢复')
-
- }
- return !sockte.netLink
+ return sockte.netLink
})
watch(netLink,()=>{
- if(!netLink.value){
+ if(netLink.value){
+ ipcRenderer.invoke('logger', `检查网络状态True`)
ElMessage.success('网络已经连接')
}else{
- // ElNotification({
- // title: '异常',
- // message: '网络已断开,等待重连',
- // type: 'warning',
- // duration:10000
- // })
- // ElMessage.warning('网络已断开,等待重连')
+ // ElMessage.warning('网络已经断开')
+ ipcRenderer.invoke('logger', `检查网络状态Fales`)
}
})
@@ -442,6 +431,7 @@
id: 0,
code: '',
name: '',
+ patientNamePyFull:'',
patientAvatarIcon: '',
deviceCode: '',
hemoCode: '',
@@ -686,7 +676,7 @@
// 人脸识别成功后 1查看是否开启测温
// console.log(`患者信息识别成功:${patientInfo.value.name}`)
ipcRenderer.invoke('logger', `患者信息识别成功:${patientInfo.value.name}`)
- let str = `${patientInfo.value.name}识别成功,分区：${patientInfo.value.设备分区名称},床号：${patientInfo.value.deviceNo},`
+ let str = `${patientInfo.value.patientNamePyFull?patientInfo.value.patientNamePyFull:patientInfo.value.name}识别成功,分区 ${patientInfo.value.设备分区名称},床号：${patientInfo.value.deviceNo},`
dialogVisible.value = false
speech.value?.speak({ text: str }).then(() => {
})
@@ -717,7 +707,6 @@
else if (patientInfo.value.name === '') {
timer=new Date()
ipcRenderer.invoke('logger', '接收到的患者为空')
- console.log('接收到的患者为空')
if (isUseFaceRecogService.value) {
dialogVisible.value = true
}
@@ -891,7 +880,8 @@
}).catch(re=>{
ElMessage('结果发送失败')
console.log('结果发送失败')
- ipcRenderer.invoke('logger', `结果发送失败:第${fasongNum.value}次，3秒后重新发送`)
+ ipcRenderer.invoke('logger', `结果发送失败:${patientInfo.value.name}第${fasongNum.value}次，3秒后重新发送`)
+ ipcRenderer.invoke('logger', `发送失败服务器返回异常：${JSON.stringify(re)}`)
if(fasongNum.value<3){
setTimeout(sundModeTz,5000);
}
@@ -923,7 +913,8 @@
}).catch(re=>{
ElMessage('结果发送失败')
console.log('结果发送失败')
- ipcRenderer.invoke('logger', `结果发送失败:第${fasongNum.value}次，2秒后重新发送`)
+ ipcRenderer.invoke('logger', `结果发送失败:${patientInfo.value.name}第${fasongNum.value}次，3秒后重新发送`)
+ ipcRenderer.invoke('logger', `发送失败服务器返回异常：${JSON.stringify(re)}`)
if(fasongNum.value<3){
setTimeout(sundModeXyj,2000);
}
@@ -1083,6 +1074,7 @@
// 获取用户媒体流
getUserMedia(
(streams: null) => {
+ console.log('打开视频流')
//后续用于停止视频流
stream.value = streams
//显示视频
@@ -1107,6 +1099,7 @@
if(clockNum.value===0){
fuxuan()
}
+ datetext.value= formatDate(new Date(),'YYYY-mm-dd WWW')
date.value=formatDate(new Date(),'YYYY-mm-dd HH:MM')
if(Number(date.value.substring(11,13))<12){
timeShidaun.value='上午好！'
@@ -1171,16 +1164,14 @@
if (!image) {
drawBox(box, '识别失败')
// 开启识别
- video.value.play()
+ // video.value.play()
return detectFace()
}
const X= jgTime(lsDateTime,new Date())
//人脸上传到阿里云
// 只有是结果归零状态才能进行识别
- console.log(`检查人脸是否要上传到阿里云识别:归零状态${sockteStore().is测量准备},`)
if(dialogVisible.value&&X>configData.value.face_push&&sockteStore().is测量准备){
lsDateTime=new Date()
- // console.log(X,'上传图片间隔')
base64toFile(image)
}
return detectFace()
@@ -1219,7 +1210,7 @@
canvas.height = video.videoHeight
// 参数：图片，裁剪开始x坐标，裁剪开始y坐标，裁剪宽度，裁剪高度，目标x坐标，目标y坐标，目标宽度，目标高度
// context.drawImage(image, 100, 100, 200, 200, 0, 0, 200, 200);
- canvas.getContext('2d')?.drawImage(video, startPoint.x-10,startPoint.y-10,width+20,height+20,0,0,width+10,height+10)
+ canvas.getContext('2d')?.drawImage(video, startPoint.x-20,startPoint.y-20,width+60,height+60,20,20,width+60,height+60)
const imgSrc = canvas?.toDataURL('image/png');
return imgSrc
--
Gitblit v1.8.0