From b5646e3f08bf45a27a3db92f5e27568a5448cb03 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期二, 10 十二月 2024 12:34:11 +0800
Subject: [PATCH] 优化串口重连
---
src/views/home/index.vue | 83 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 5d3ff14..f5da880 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -54,7 +54,7 @@
<div style="display: grid;grid-template-columns: minmax(250px, 40%) 1fr; height: 100%; padding-left: 20px;padding-top: 20px;">
<!-- 头像 -->
<div :style="{backgroundImage:`url(${patientInfo.patientAvatarIcon})`}" style="background-size:100% 100%;height: 100%;" >
- <div style="width:140px; height: 50px; line-height: 50px; font-size: 25px; background: #DFB144;color: #FFFFFF; font-weight: 500; text-align: center; border-radius: 0px 8px 0px 30px; float: right;">
+ <div style="width:140px; height: 50px; line-height: 50px; font-size: 25px; background: #9F61DC;color: #FFFFFF; font-weight: 500; text-align: center; border-radius: 0px 8px 0px 30px; float: right;">
{{patientInfo.name}}
</div>
</div>
@@ -75,7 +75,7 @@
<div style="height: 31%; margin-top: 20px;border-radius: 12px;" >
<el-row style="height: 100%;background:rgba(246, 244, 244, 0.3);border-radius: 12px;opacity: 0.9;">
<el-col :span="8">
- <div class="textwenben" style="height: 28%; font-size: 25px;background-color: #DFB144; border-radius: 12px 0 0 0;">
+ <div class="textwenben" style="height: 28%; font-size: 25px;background-color: #9F61DC; border-radius: 12px 0 0 0;">
<template v-if="configData.deviceType==='体重秤'">
<template v-if="patientInfo.isAfterMed===0&&!configData.gantiziShow">
机号/床位号
@@ -91,7 +91,7 @@
</template>
</div>
- <div class="textwenben" style="height: 70%; font-size: 80px; color: #DFB144;">
+ <div class="textwenben" style="height: 70%; font-size: 80px; color: #9F61DC;font-weight: 1000;">
<template v-if="configData.deviceType==='体重秤'">
<template v-if="patientInfo.isAfterMed===0&&!configData.gantiziShow">
{{ patientInfo.deviceNo }}
@@ -129,7 +129,7 @@
</template>
</div>
- <div class="textwenben" style="height: 70%; font-size: 80px; color: #41B593;
+ <div class="textwenben" style="height: 70%; font-size: 80px; color: #41B593; font-weight: 1000;
border-left: #FFFFFF solid 2px;border-right: #FFFFFF solid 2px;">
<template v-if="configData.deviceType==='体重秤'">
<template v-if="patientInfo.isAfterMed===0">
@@ -280,6 +280,7 @@
import{initPort as TM2655VP} from '@/samples/deviceApi/TM2655VP'
import{initPort as zhiRongT605 } from '@/samples/deviceApi/zhiRongT605'
import{initPort as zhiRongHehui } from '@/samples/deviceApi/zhiRongHehui'
+import{initPort as zhiRongShantou } from '@/samples/deviceApi/zhiRongShantou'
import{initPort as taiHengM523 } from '@/samples/deviceApi/taiHengM523'
import{initPort as XK3190A12 } from '@/samples/deviceApi/XK3190A12'
import {initPort as mbp7000} from '@/samples/deviceApi/mbp7000'
@@ -287,10 +288,14 @@
import {initPort as mbp9020} from '@/samples/deviceApi/mbp-9020'
import {initPort as rbp9000c} from '@/samples/deviceApi/RBP-9000c'
-
+import {initPort as yuyueDevice} from '@/samples/deviceApi/yuyue'
import {initPort as M503} from '@/samples/deviceApi/M503'
import {initPort as seca102} from '@/samples/deviceApi/seca102'
+import {initPort as seca101Banger} from '@/samples/deviceApi/seca101Banger'
import {initPort as liangjiang} from '@/samples/deviceApi/liangjiang'
+import {initPort as xinanguojiTZC} from '@/samples/deviceApi/xinanguojiTZC'
+
+
// 引入模块
import config from '../../../package.json'
import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue'
@@ -298,7 +303,7 @@
// 读取体重文件
import{todatatzs } from '@/samples/deviceApi/seca101'
-import {ElMessage, UploadFile, UploadInstance, UploadProps } from 'element-plus'
+import {ElMessage, ElNotification, UploadFile, UploadInstance, UploadProps } from 'element-plus'
const { proxy } = getCurrentInstance() as any;
// 人脸检测对象
const options = new SsdMobilenetv1Options({
@@ -312,7 +317,6 @@
const stream = ref(null) // 当前流
const getUserMediaFail = ref(false) // 获取用户媒体失败
let lsDateTime:any=new Date()
-let imgSrc:'';
const msg = ref<string>("没识别到人脸...");
const datetext=computed(()=>{
return formatDate(new Date(),'YYYY-mm-dd WWW')
@@ -341,12 +345,7 @@
const gao_ya=ref("")//高压
const di_ya=ref("")//低压
const mai_bu=ref("")//脉搏,
-const tupianpath=ref('') //验证图片地址
const centerDialogVisible=ref(false)
-const uploadRef = ref<UploadInstance>()
-const fileList=ref([])
-const imageUrl = ref('')
-const dialogImageUrl = ref('')
// 打开图片验证
const yanzhengTUpian=()=>{
@@ -386,7 +385,13 @@
if(!netLink.value){
ElMessage.success('网络已经连接')
}else{
- ElMessage.warning('网络已断开,等待重连')
+ // ElNotification({
+ // title: '异常',
+ // message: '网络已断开,等待重连',
+ // type: 'warning',
+ // duration:10000
+ // })
+ // ElMessage.warning('网络已断开,等待重连')
}
})
@@ -467,10 +472,11 @@
}
if (isUseFaceRecogService.value) {
console.log('开启人脸识别')
+ lsDateTime=new Date()
dialogVisible.value = true
}else{
console.log('关闭人脸识别')
- dialogVisible.value = true
+ dialogVisible.value = false
}
}
@@ -745,7 +751,7 @@
() => weightInfo.value.resultTime,
async () => {
const X= jgTime(timer,new Date())
- console.log(X,'收到体重',configData.value.BobaoJg)
+ // console.log(X,'收到体重',configData.value.BobaoJg)
// 体重不能0
if (weightInfo.value.result !== "0"&&patientInfo.value.code!=='') {
ipcRenderer.invoke('logger', `体重变化了:${weightInfo.value.result}`)
@@ -844,6 +850,12 @@
updatePatient(mode).then(re=>{
ElMessage.success('结果发送成功')
ipcRenderer.invoke('logger', '结果上传成功')
+ // 测量结果发送成功后就一定要体重秤归零才行 关闭体重秤归零状态为false
+ // 只增对M503
+ if(configData.value.tzc_type==='M503'||configData.value.tzc_type==='seca101Banger'){
+ console.log('发送清理体重归零')
+ sockteStore().setis测量准备(false)
+ }
clockNum.value = Number(configData.value.timeJg/1000)
return false
}).catch(re=>{
@@ -876,16 +888,17 @@
ipcRenderer.invoke('logger', '结果上传成功')
// 倒计时结果显示
clockNum.value = Number(configData.value.timeJg/1000)
+
return false
}).catch(re=>{
ElMessage('结果发送失败')
console.log('结果发送失败')
- ipcRenderer.invoke('logger', `结果发送失败:第${fasongNum.value}次，3秒后重新发送`)
+ ipcRenderer.invoke('logger', `结果发送失败:第${fasongNum.value}次，2秒后重新发送`)
if(fasongNum.value<3){
- setTimeout(sundModeXyj,5000);
+ setTimeout(sundModeXyj,2000);
}
else{
- ipcRenderer.invoke('logger', '3次结果上传都失败放弃本次请求')
+ ipcRenderer.invoke('logger', '2次结果上传都失败放弃本次请求')
return false
}
})
@@ -946,8 +959,8 @@
}
}
const updateChengxu=()=>{
- console.log('检查更新')
- if(configData.value.isLanFace===true){
+ console.log('检查更新',)
+ if(configData.value.isLanFace===true||sockteStore().isLink){
console.log('是内网不能检查更新')
}else{
ipcRenderer.invoke("check-update");
@@ -981,6 +994,9 @@
}
else if(configData.value.xyj_type==='RBP-9000c'){
rbp9000c(configData.value.xueyanjiPortPath,configData.value.xueyanjiBaudRate)
+ // 鱼跃血压计
+ }else if(configData.value.xyj_type==='yuyue'){
+ yuyueDevice(configData.value.xueyanjiPortPath,configData.value.xueyanjiBaudRate)
}
else{
oumulongHbp9030(configData.value.xueyanjiPortPath,configData.value.xueyanjiBaudRate)
@@ -996,11 +1012,10 @@
M503(configData.value.tzcPortPath,configData.value.tzcBaudRate)
}else if(configData.value.tzc_type==='seca102'){
seca102(configData.value.tzcPortPath,configData.value.tzcBaudRate)
-
}
// seca101读取文件
- else if(configData.value.tzc_type==='seca101'){
- console.log('体重是读取文件')
+ else if(configData.value.tzc_type==='seca101Banger'){
+ seca101Banger(configData.value.tzcPortPath,configData.value.tzcBaudRate)
}// 耀华XK3190-A12
else if(configData.value.tzc_type==='XK3190-A12'){
XK3190A12(configData.value.tzcPortPath,configData.value.tzcBaudRate)
@@ -1008,6 +1023,12 @@
zhiRongHehui(configData.value.tzcPortPath,configData.value.tzcBaudRate)
}else if(configData.value.tzc_type==='lianjiang'){
liangjiang(configData.value.tzcPortPath,1200)
+ }else if(configData.value.tzc_type==='xinanguojiTZC'){
+ xinanguojiTZC(configData.value.tzcPortPath,9600)
+ }
+ // 志荣粤康 2400
+ else if(configData.value.tzc_type==='zhiRongShantou'){
+ zhiRongShantou(configData.value.tzcPortPath,configData.value.tzcBaudRate)
}
else{
zhiRongT605(configData.value.tzcPortPath,configData.value.tzcBaudRate)
@@ -1075,7 +1096,7 @@
speech.value = new Speech();
speech.value?.setLanguage('zh-CN')
speech.value?.init().then(() => {
- console.log('语音初始化成功')
+ console.log('加载人脸采集模型成功')
})
},8000)
})
@@ -1107,7 +1128,6 @@
draw.drawDetections(canvas.value, resizedResult.box);
drawBox(box, '')
// video.value.pause()
-
// //截取人脸图片
const image = await cameraShoot(
video.value,
@@ -1117,13 +1137,15 @@
)
if (!image) {
drawBox(box, '识别失败')
+ // 开启识别
video.value.play()
return detectFace()
}
const X= jgTime(lsDateTime,new Date())
- // console.log('----',X,dialogVisible.value)
- // console.log(image)
- if(dialogVisible.value&&X>configData.value.face_push&&isworkTime(new Date())){
+ //人脸上传到阿里云
+ // 只有是结果归零状态才能进行识别
+ console.log(`检查人脸是否要上传到阿里云识别:${sockteStore().is测量准备}`)
+ if(dialogVisible.value&&X>configData.value.face_push&&isworkTime(new Date())&&sockteStore().is测量准备){
lsDateTime=new Date()
// console.log(X,'上传图片间隔')
base64toFile(image)
@@ -1162,8 +1184,11 @@
const canvas = document.createElement('canvas')
canvas.width = video.videoWidth
canvas.height = video.videoHeight
- canvas.getContext('2d')?.drawImage(video, 0, 0, canvas.width, canvas.height)
+ // 参数：图片，裁剪开始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)
const imgSrc = canvas?.toDataURL('image/png');
+
return imgSrc
}
// 画盒子
--
Gitblit v1.8.0