From 5f863174c87662b967d4c5e123ea0cd3e6e11ebb Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期五, 19 五月 2023 14:36:57 +0800
Subject: [PATCH] 34
---
src/views/home/index.vue | 30 +++++++++++++++++++++++++++---
src/views/login/index.vue | 14 +++++++++++---
package.json | 2 +-
3 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index fb4071d..e3c5f34 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sign-tool",
- "version": "2.6.2",
+ "version": "2.6.3",
"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 77173cf..b8103bc 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -106,6 +106,7 @@
}
//发送消除某些状态
const fuxuan=()=>{
+ console.log('返回---')
const datetimeCON = patientInfoStore().patientInfo.datetime
// 获取是否是一台主机连2个设备
const islinkDouble=confingInfoStore().confingInfo.islinkDouble
@@ -135,6 +136,13 @@
resultTime: '',
state: 2
})
+ sockteStore().setfaceSockte({
+ type: '人脸识别',
+ deviceName: '',
+ result: '',
+ resultTime: '',
+ state: 2
+ })
state.clockNum = patientInfoStore().viewNumber
state.aimTSL = ''
state.gao_ya = ''
@@ -181,7 +189,7 @@
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}识别成功。`
+ let str = `${patientInfo.value.name}识别成功。床号：${patientInfo.value.deviceNo}`
state.dialogVisible = false
speech.value?.speak({ text: str }).then(() => {
})
@@ -440,7 +448,7 @@
},3000)
})
return {
- ...toRefs(state),isUseFaceRecogService, guyanbi, loginRef, isLink, netLink, weightInfo, patientInfo, xyjInfo, inputRef, inputChabge
+ ...toRefs(state),isUseFaceRecogService,fuxuan, guyanbi, loginRef, isLink, netLink, weightInfo, patientInfo, xyjInfo, inputRef, inputChabge
}
}
}
@@ -454,7 +462,7 @@
<h4>人脸识别中。。。</h4>
</div>
</template>
- <login ref="loginRef" />
+ <login ref="loginRef" :dialogVisible="dialogVisible" />
</el-dialog>
</div>
<el-dialog title="提示" v-model="netLink" width="30%">
@@ -620,6 +628,9 @@
</div>
</el-col>
</el-row>
+ <div class="chongzhi" @click="fuxuan">
+ 返回
+ </div>
</div>
</template>
@@ -630,6 +641,19 @@
margin: 0;
}
+.chongzhi{
+ width: 100px;
+ height: 100px;
+ background: #769AFF;
+ color: #FFFFFF;
+ font-size: 20px;
+ line-height: 100px;
+ text-align: center;
+ position:fixed;
+ bottom:0px;
+ right:0px;
+ border-radius: 50px;
+}
.devcont{
width: 100%;
height: 99%;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ff1f3c4..8be8141 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -26,7 +26,12 @@
import { confingInfoStore } from "@/stores/StoresConfing";
const msg = ref<string>("没识别到人脸...");
-
+const props = defineProps({
+ dialogVisible:{
+ type:Boolean,
+ default:false
+ }
+})
let trackerTask: any = null;
const inputCode=ref('')
const inputRef = ref()
@@ -57,9 +62,12 @@
thisContext.drawImage(myVideo, 0,0, 250, 200);
imgSrc = myCanvas?.toDataURL('image/png');
// 转文件
- base64toFile(imgSrc)
+ // 识别框显示才能到传阿里云识别
+ if(props.dialogVisible){
+ base64toFile(imgSrc)
+ }
setTimeout(() => {
- console.log('监测到人脸后1s')
+ console.log('监测到人脸后3s')
trackerTask.run();
}, 3000);
// @ts-ignore
--
Gitblit v1.8.0