From 0f38c5e72493ee138a68ddc0bd838f1aa314f4b4 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期三, 04 九月 2024 18:13:15 +0800
Subject: [PATCH] 优化程序 更新邦尔的体重称签到通讯
---
src/views/home/index.vue | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index d1e2b29..d5912a7 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -290,6 +290,7 @@
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 config from '../../../package.json'
@@ -298,7 +299,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 +313,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 +341,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 +381,13 @@
if(!netLink.value){
ElMessage.success('网络已经连接')
}else{
- ElMessage.warning('网络已断开,等待重连')
+ // ElNotification({
+ // title: '异常',
+ // message: '网络已断开,等待重连',
+ // type: 'warning',
+ // duration:10000
+ // })
+ // ElMessage.warning('网络已断开,等待重连')
}
})
@@ -467,10 +468,11 @@
}
if (isUseFaceRecogService.value) {
console.log('开启人脸识别')
+ lsDateTime=new Date()
dialogVisible.value = true
}else{
console.log('关闭人脸识别')
- dialogVisible.value = true
+ dialogVisible.value = false
}
}
@@ -745,7 +747,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 +846,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 +884,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 +955,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");
@@ -999,11 +1008,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)
@@ -1078,7 +1086,7 @@
speech.value = new Speech();
speech.value?.setLanguage('zh-CN')
speech.value?.init().then(() => {
- console.log('语音初始化成功')
+ console.log('加载人脸采集模型成功')
})
},8000)
})
@@ -1110,7 +1118,6 @@
draw.drawDetections(canvas.value, resizedResult.box);
drawBox(box, '')
// video.value.pause()
-
// //截取人脸图片
const image = await cameraShoot(
video.value,
@@ -1125,7 +1132,10 @@
return detectFace()
}
const X= jgTime(lsDateTime,new Date())
- 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)
--
Gitblit v1.8.0