From 2013d16776b458105f090c01e097e81767564662 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期二, 31 一月 2023 13:30:26 +0800
Subject: [PATCH] 45
---
src/views/home/index.vue | 8 +++++---
src/samples/node-api.ts | 2 +-
electron/main/index.ts | 12 ------------
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/electron/main/index.ts b/electron/main/index.ts
index b6fcd92..ca4920a 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -144,16 +144,4 @@
"machineName": arg.machineName,
"screenTimeout": arg.screenTimeout,
}
- // //对比两端配置文件
- // if(JSON.stringify(mode1)!=JSON.stringify(mode2)){
- // //更新cofing.json
- // console.log('update confing.json')
- // store.set(mode2)
- // // 重新建立sockte 通讯
- // win?.webContents.send('getScreenTimeout',store.get('screenTimeout'))
- // win?.webContents.send('getPcName',store.get('machineName'))
- // win?.webContents.send('getConfigData',store.get('clientCode'),store.path)
- // }
-
-
})
\ No newline at end of file
diff --git a/src/samples/node-api.ts b/src/samples/node-api.ts
index 68056ca..5342b0f 100644
--- a/src/samples/node-api.ts
+++ b/src/samples/node-api.ts
@@ -50,7 +50,7 @@
// 存放conging到仓库
confingInfoStore().setconfingInfo(args[0])
connect()
- creatorClient(args[0])
+ // creatorClient(args[0])
}
}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index fca99f8..87c3f2a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -23,6 +23,7 @@
import step7 from '@/assets/mp3/chongfuchengzhong.mp3'
import login from '@/views/login/index.vue'
import { confingInfoStore } from '@/stores/StoresConfing'
+import { ElMessage } from 'element-plus'
export default {
name: 'hoem',
@@ -137,8 +138,7 @@
console.log('患者信息变化',patientInfo.value)
patientCodeLs=''
console.log(patientCodeLs,'患者codec初始化')
-
- if (patientInfo.value.id !== 0) {
+ if (patientInfo.value.id !== 0&&patientInfo.value.name!==''&&patientInfo.value.isScheduled===1) {
let str=`${patientInfo.value.name}识别成功。`
speech.value?.speak({text:str}).then(()=>{
console.log("播报完成...")
@@ -172,7 +172,7 @@
}
// 没有排班
else if(patientInfo.value.isScheduled===0){
- speech.value?.speak({text:"当前患者没有排班,不能自动签到"}).then(()=>{
+ speech.value?.speak({text:`${patientInfo.value.name}今日没有排班,不能自助签到`}).then(()=>{
console.log("播报完成...")
})
if(isUseFaceRecogService.value){
@@ -209,6 +209,8 @@
// api上传
updatePatient(mode).then(re=>{
console.log(re)
+ }).catch(()=>{
+ ElMessage.error('结果上报出错，请联系后台管理员')
})
// sendPationSet(mode)
patientCodeLs=mode.patientCode
--
Gitblit v1.8.0