From bf53bd193071d74946455800dbb2edb5fdd0bb27 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期六, 04 三月 2023 13:18:39 +0800
Subject: [PATCH] 45
---
src/views/home/index.vue | 10 +++++-----
src/samples/sockteStomp.ts | 1 +
package.json | 3 ++-
src/stores/patient.ts | 1 +
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index 3b6a059..43f3e7f 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,9 @@
"@types/node": "^18.0.0",
"@types/stompjs": "^2.3.5",
"@vitejs/plugin-vue": "^2.3.3",
- "electron": "^19.0.3",
+ "electron": "^19.1.9",
"electron-builder": "^23.0.3",
+ "electron-packager": "^17.1.1",
"less": "4.1.2",
"less-loader": "10.2.0",
"sass": "^1.57.1",
diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index 34e6db5..d1e0468 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -90,6 +90,7 @@
hemoCode:resultInfo.hemoCode===null?"":resultInfo.hemoCode,
pureWeight:resultInfo.pureWeight===null?"":resultInfo.pureWeight,
datetime:da,
+ clothesWeight:resultInfo.clothesWeight===null?0:resultInfo.clothesWeight,
isScheduled:resultInfo.isScheduled
}
// 写入vuex里
diff --git a/src/stores/patient.ts b/src/stores/patient.ts
index 85ff186..9520957 100644
--- a/src/stores/patient.ts
+++ b/src/stores/patient.ts
@@ -12,6 +12,7 @@
hemoCode:'',
pureWeight:'',
datetime:'',
+ clothesWeight:0,
isScheduled:0,
})// 初始值
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 2e2923d..a5c58fe 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -219,14 +219,14 @@
patientCodeLs = mode.patientCode
}
else {
- console.log(`patientCodeLs===${patientCodeLs} ,mode.patCode${mode.patientCode}`)
- speech.value?.speak({ text: "不能重复称重，请先刷卡然后再称重" }).then(() => {
- console.log("播报完成...")
- })
+ // console.log(`patientCodeLs===${patientCodeLs} ,mode.patCode${mode.patientCode}`)
+ // speech.value?.speak({ text: "不能重复称重，请先刷卡然后再称重" }).then(() => {
+ // console.log("播报完成...")
+ // })
}
// 计算目标脱水量
if (Number(weightInfo.value.result) > 0 && Number(patientInfo.value.pureWeight) !== 0) {
- state.aimTSL = (Number(weightInfo.value.result) - Number(patientInfo.value.pureWeight)).toFixed(2)
+ state.aimTSL = (Number(weightInfo.value.result) - Number(patientInfo.value.pureWeight)- Number(patientInfo.value.clothesWeight)).toFixed(2)
}
}
}
--
Gitblit v1.8.0