root/rax-medical
1
0
Fork 0
mirror of https://gitee.com/xiongmao1988/rax-medical.git synced 2025-08-24 13:04:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/一期' into 一期 

# Conflicts:
#	src/views/remote-manage/remote-control.vue
This commit is contained in:
熊猫 2024-05-29 17:02:32 +08:00
parent abb6ddef32 66dab4b687
commit 6256abe687
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stores/remote-ws-store.ts
View File

@ -82,9 +82,11 @@ export const useRemoteWsStore = defineStore("remoteWs", {
Session.set("remoteTasks", this.remoteTasks)
},
getActiveRemoteTask() {
let index = 0;
for (let i = 0; i < this.remoteTasks.length; i++) {
if (this.remoteTasks[i].isRemote) return i
if (this.remoteTasks[i].isRemote)index = i
}
return index
},
setRemoteLog(log: any, i: number) {
this.remoteTasks[i].log.push(log)

5
src/views/remote-manage/part/remote-dialog.vue
View File

@ -44,6 +44,7 @@ const emit = defineEmits(['confirmRemote', 'errorRemote', 'breakRemote'])
const dialogVisible = ref(false)
const patientInfo = ref({} as any)
const remoteWsStore = useRemoteWsStore();
let currentIndex = -1;
defineExpose({
open,
@ -51,8 +52,8 @@ defineExpose({
})
function open(i: number) {
remoteWsStore.setCurrentTaskIndex(i)
patientInfo.value = remoteWsStore.getRemoteTask()[remoteWsStore.getCurrentTaskIndex()];
currentIndex = i
patientInfo.value = remoteWsStore.getRemoteTask()[currentIndex];
patientInfo.value.date = new Date();
dialogVisible.value = true;
}

28
src/views/remote-manage/remote-control.vue
View File

@ -109,10 +109,8 @@
</el-dropdown>
</template> -->
</el-table-column>
<el-table-column prop="total" label="累计药量(ml)" width="100">
<template #default="scope">—</template>
</el-table-column>
<el-table-column prop="state" label="工作状态" width="150" align="center"/>
<el-table-column prop="total" label="累计药量(ml)" width="100"/>
<el-table-column prop="state" label="工作状态" width="70" align="center" />
<!-- <el-table-column label="特殊情况人为干预" align="center">
<template #default="scope">
<div class="table-btn-box">
@ -141,13 +139,11 @@
<!-- table2 -->
<div class="table-box">
<el-table :data="fixedTableData" height="100%" style="width: 100%">
<el-table-column type="index" label="序号" width="80" align="center"/>
<el-table-column type="index" label="序号" width="40" align="center" />
<el-table-column prop="name" label="药物名称" align="center" />
<el-table-column prop="speed" label="速度(ml/h)" width="100" />
<el-table-column prop="total" label="累计药量(ml)" width="100">
<template #default="scope">—</template>
</el-table-column>
<el-table-column prop="state" label="工作状态" width="150" align="center"/>
<el-table-column prop="total" label="累计药量(ml)" width="100"/>
<el-table-column prop="state" label="工作状态" width="70" align="center" />
<!-- <el-table-column label="特殊情况人为干预" align="center">
<template #default="scope">
<div class="table-btn-box">
@ -347,7 +343,7 @@ function updateMedicineTable(aiMedicine: any, doctorMedicine: any) {
Phase: 0,
name: key,
speed: aiMedicine[key],
total: 0,
total: aiMedicine[key + "sum"],
state: "正常"
}
if (remoteWsStore.varMedicine.includes(key)) {
@ -375,10 +371,12 @@ function updateMedicineTable(aiMedicine: any, doctorMedicine: any) {
if (varTableData.value.length > 0) {
varTableData.value.forEach((medicine: any) => {
medicine.speed = doctorMedicine[medicine.name];
medicine.speed = Number(doctorMedicine[medicine.name]) + Number(aiMedicine[medicine.name]);
medicine.total = Number(doctorMedicine[medicine.name + "sum"]) + Number(aiMedicine[medicine.name + "sum"]);
});
fixedTableData.value.forEach((medicine: any) => {
medicine.speed = doctorMedicine[medicine.name];
medicine.speed = Number(doctorMedicine[medicine.name]) + Number(aiMedicine[medicine.name]);
medicine.total = Number(doctorMedicine[medicine.name + "sum"]) + Number(aiMedicine[medicine.name + "sum"]);
})
} else {
const varTable: any = [];
@ -387,8 +385,8 @@ function updateMedicineTable(aiMedicine: any, doctorMedicine: any) {
const medicine = {
Phase: 0,
name: key,
speed: aiMedicine[key],
total: 0,
speed: Number(doctorMedicine[key]) + Number(aiMedicine[key]),
total: Number(doctorMedicine[key + "sum"]) + Number(aiMedicine[key + "sum"]),
state: "正常"
}
if (remoteWsStore.varMedicine.includes(key)) {
@ -641,7 +639,7 @@ function startAI() {
.body-box {
width: 100%;
height: 100%;
height: calc(100% - 110px);
display: flex;
justify-content: center;
align-items: center;