From 47f0c0b6986b8dd423e81c77f341c829550e326d Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期一, 30 一月 2023 21:17:19 +0800
Subject: [PATCH] 更新api上传结果
---
src/views/home/index.vue | 49 ++++++++++++------------
src/api/user/index.ts | 11 ++++-
src/samples/sockteStomp.ts | 2
src/samples/httpApi.ts | 34 +++++++++++++++++
src/samples/node-api.ts | 1
electron/main/index.ts | 5 --
6 files changed, 70 insertions(+), 32 deletions(-)
diff --git a/electron/main/index.ts b/electron/main/index.ts
index 6245fad..b6fcd92 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -39,11 +39,6 @@
const store = new Store();
console.log(store.path)
-// 读
-// console.log(store.get('clientCode'))
-// console.log(store.get('deviceList'))
-// 写
-// store.set("testr","test001")
// Disable GPU Acceleration for Windows 7
if (release().startsWith('6.1')) app.disableHardwareAcceleration()
diff --git a/src/api/user/index.ts b/src/api/user/index.ts
index b48f7a8..f3f2771 100644
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@@ -50,9 +50,16 @@
data: params,
})
}
-export function forgetPassword(params: Object) {
+export function getPatientInfo2(params: Object) {
return request({
- url: '/user/info/forgetPassword',
+ url: '/topic/getPatientInfo2',
+ method: 'post',
+ data: params,
+ })
+}
+export function updatePatient(params: Object) {
+ return request({
+ url: '/topic/updatePatient',
method: 'post',
data: params,
})
diff --git a/src/samples/httpApi.ts b/src/samples/httpApi.ts
new file mode 100644
index 0000000..5b8fdb4
--- /dev/null
+++ b/src/samples/httpApi.ts
@@ -0,0 +1,34 @@
+import {sockteStore} from '@/stores/sockteInfo'
+import { confingInfoStore } from '@/stores/StoresConfing'
+import {getPatientInfo2,updatePatient} from '@/api/user/index'
+import {writePatient,writeResult} from './sockteStomp'
+/**
+ * 发送患者卡号返回患者信息
+ * @param codeStr
+ */
+const sendPationCodeApi=(codeStr:string)=>{
+ const pcName= sockteStore().pcName
+ const mode={
+ machineName:pcName,
+ clientCode:confingInfoStore().confingInfo.clientCode,
+ queryCode:codeStr
+ }
+ console.log('发送患者code 到http',mode)
+ getPatientInfo2(mode).then(re=>{
+ console.log('获取到患者信息-------')
+ console.log(re)
+ writePatient(re.data)
+ })
+}
+const updatePatientApi=(pam:object)=>{
+ console.log('发送患者结果到后台 到http',pam)
+ updatePatient(pam).then(re=>{
+ console.log('发送患者结果到后端返回',re)
+ writeResult(re.data)
+ })
+
+}
+export {
+ sendPationCodeApi,
+ updatePatientApi
+}
\ No newline at end of file
diff --git a/src/samples/node-api.ts b/src/samples/node-api.ts
index 6e92fa5..68056ca 100644
--- a/src/samples/node-api.ts
+++ b/src/samples/node-api.ts
@@ -43,6 +43,7 @@
console.log('配置文件没有配置')
}
else if(args.length>0&&args[0].clientCode.length>0){
+ console.log('配置文件读取')
clientCode=args[0].clientCode
// 建立sockte 通讯
deviceList=args[0].deviceList
diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index 06ff34e..34e6db5 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -187,4 +187,4 @@
stompClient.send(`/app/patient/info/set`,{},JSON.stringify(mode))
}
}
-export {creatorClient,sendPationCode,sendPationSet,writeResult}
+export {creatorClient,sendPationCode,sendPationSet,writeResult,writePatient}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 2cef78e..a68ec68 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -3,10 +3,12 @@
import { sockteStore } from '@/stores/sockteInfo'
import { ipcRenderer } from 'electron'
import { patientInfoStore } from '@/stores/patient'
+import {updatePatient} from '@/api/user/index'
import os from "os"
import Speech from 'speak-tts'
import { reactive, computed, toRefs, onMounted, ref, watch } from "vue"
import { sendPationCode, sendPationSet } from '../../samples/sockteStomp'
+import {sendPationCodeApi} from '../../samples/httpApi'
import { formatDate } from '@/utils/formatTime'
import state1 from '@/assets/state1.png'
import state2 from '@/assets/state2.png'
@@ -32,10 +34,6 @@
const user = userInfoStore()
const sockte = sockteStore()
const inputRef = ref()
- const AudioRef0 = ref()
- const AudioRef2 = ref()
- const AudioRef3 = ref()
- const AudioRef7=ref()
let patientCodeLs=''
const isUseFaceRecogService=ref(false)
const isLink = computed(() => {
@@ -191,8 +189,7 @@
if (patientInfo.value.id === 0) {
speech.value?.speak({text:"没有识别的患者,请先验证患者"}).then(()=>{
console.log("播报完成...")
- })
-
+ })
}
else {
if(weightInfo.value.result!=="0"){
@@ -206,13 +203,21 @@
console.log('发送患者结果,前提是患者code 不能重复', mode)
if(patientCodeLs!==mode.patientCode){
console.log('发送患者结果')
- AudioRef2.value.play()
- sendPationSet(mode)
+ speech.value?.speak({text:`称重完成,${mode.weight}kg`}).then(()=>{
+ console.log("播报完成...")
+ })
+ // api上传
+ updatePatient(mode).then(re=>{
+ console.log(re)
+ })
+ // sendPationSet(mode)
patientCodeLs=mode.patientCode
}
else{
console.log(`patientCodeLs===${patientCodeLs} ,mode.patCode${mode.patientCode}`)
- AudioRef7.value.play()
+ speech.value?.speak({text:"不能重复称重，请先刷卡然后再称重"}).then(()=>{
+ console.log("播报完成...")
+ })
}
// 计算目标脱水量
if (Number(weightInfo.value.result) > 0 && Number(patientInfo.value.pureWeight) !== 0) {
@@ -234,11 +239,11 @@
state.mai_bu = list[2]
}
if (patientInfo.value.id === 0) {
- AudioRef0.value.play()
- // inputRef.value.focus();
+ speech.value?.speak({text:"没有识别的患者,请先验证患者"}).then(()=>{
+ console.log("播报完成...")
+ })
settime()
} else {
- AudioRef3.value.play()
settime()
const mode = {
patientCode: patientInfo.value.code,
@@ -247,6 +252,12 @@
}
console.log('发送患者结果', mode)
+ speech.value?.speak({text:`收缩压：${state.gao_ya},舒张压：${state.di_ya},脉搏：${state.mai_bu}`}).then(()=>{
+ console.log("播报完成...")
+ })
+ updatePatient(mode).then(re=>{
+ console.log(re)
+ })
sendPationSet(mode)
}
} else {
@@ -264,7 +275,7 @@
if (dkqInfo.value.result !== ''&&dkqInfo.value.result !== undefined) {
const code=dkqInfo.value.result.split(",")[0]
console.log('获取读卡器的code',code)
- sendPationCode(code)
+ sendPationCodeApi(code)
}
}
);
@@ -274,7 +285,7 @@
}
);
const inputChabge = () => {
- sendPationCode(state.inputCode)
+ sendPationCodeApi(state.inputCode)
setTimeout(function () {
state.inputCode = ''
}, 1000)
@@ -297,7 +308,6 @@
state.haodu=(document.documentElement.clientHeight-180)/2+'px'
state.clockNum = patientInfoStore().viewNumber
setInterval(function () {
- console.log('sockte链接成功指标指向input',isLink.value)
inputRef.value.focus();
}, 1000)
speech.value=new Speech();
@@ -325,15 +335,6 @@
<login ref="loginRef" />
</el-dialog>
</div>
- <!-- 提醒刷卡 -->
- <audio :src="step1" ref="AudioRef0" id="eventAudio1"></audio>
-
- <!-- 体重结果回传成功 -->
- <audio :src="step3" ref="AudioRef2" id="eventAudio3"></audio>
- <!-- 血压结果回传成功 -->
- <audio :src="step4" ref="AudioRef3" id="eventAudio4"></audio>
- <!-- 不能重复称重 -->
- <audio :src="step7" ref="AudioRef7" id="eventAudio7"></audio>
<el-dialog title="提示" v-model="netLink" width="30%">
<span>无法链接到网络！</span>
</el-dialog>
--
Gitblit v1.8.0