diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue index a10e9af..109d5dd 100644 --- a/src/views/remote-manage/remote-control.vue +++ b/src/views/remote-manage/remote-control.vue @@ -37,11 +37,6 @@
- - - - - 病人尿量(ml):500 @@ -105,18 +100,10 @@ + @@ -136,8 +123,6 @@ - 确定 @@ -153,7 +138,12 @@ - + + + @@ -403,6 +393,11 @@ const subscribeVital = () => { chartDom3.value.updateChartData(data.vitalSignsList[0]); chartDom4.value.updateChartData(data.vitalSignsList[0]); isAIDose.value=data.flags.aiFlag==='1'?1:0; + console.log('data >>>>>',data); + if (!data.rateModTime) { + updateMedicineTable(data.medicineList); + return + } if (lastAddMedicineTime.value!==data.rateModTime) { lastAddMedicineTime.value=data.rateModTime updateMedicineTable(data.medicineList); @@ -505,8 +500,20 @@ function initData() { } function updateMedicineTable(doctorMedicine: any) { - varTableData.value = doctorMedicine.slice(0,4) - fixedTableData.value = doctorMedicine.slice(4,8) + const varTableData1=doctorMedicine.slice(0,4) + const fixedTableData1=doctorMedicine.slice(4,8) + varTableData.value = varTableData1.map((i:any)=>{ + return { + ...i, + change:i?.change||0 + } + }) + fixedTableData.value = fixedTableData1.map((i:any)=>{ + return { + ...i, + change:i?.change||0 + } + }) } function vitalExcepEvent(data: any) { @@ -622,24 +629,24 @@ function msgLogScrollBottom() { const tableItemPlus = (e: any) => { const obj = medicineCustom.find(item => item.name === e.row.medicineName) || {plus: 1}; - if (e.row.medicineRate >=obj.total) { - e.row.medicineRate =obj.total + if ((e.row.medicineRate + e.row.change) >=obj.total) { + e.row.change =obj.total - e.row.medicineRate return }; - let rate= Number(e.row.medicineRate); + let rate= Number(e.row.change); if (isNaN(rate)) { return } rate += obj.plus; - e.row.medicineRate = rate.toFixed(2); + e.row.change = rate.toFixed(2); } const tableItemMinus = (e: any) => { const obj = medicineCustom.find(item => item.name === e.row.medicineName) || {plus: 1}; - if (!isAIDose.value && e.row.medicineRate - obj.plus <= 0) return; - e.row.medicineRate -= obj.plus; - if (e.row.medicineRate < 0) e.row.medicineRate = 0; - else e.row.medicineRate = Number(e.row.medicineRate).toFixed(2); + if (!isAIDose.value && e.row.medicineRate + e.row.change - obj.plus <= 0) return; + e.row.change -= obj.plus; + if (e.row.change < 0) e.row.change = 0; + else e.row.change = Number(e.row.change).toFixed(2); } const tableItemConfirm = (e: any, tableData: any) => { @@ -658,7 +665,7 @@ const tableItemConfirm = (e: any, tableData: any) => { date: currentRemote.value.date, flag: "1", medicine: e.row.medicineName, - value: e.row.medicineRate, + value: Number(e.row.medicineRate)+Number(e.row.change), index: currentRemote.value.index } remoteWsStore.sendMedicine(params, function () {