feat

src/views/remote-manage/remote-control.vue

@@ -37,11 +37,6 @@
       <div class="right-box">
         <div class="top-btn-box">
           <div class="top-left-btn-box" v-loading="connectionUnityLoading">
-            <!--                        <el-select v-model="database" filterable placeholder="Select" style="width: 100%;"-->
-            <!--                                   @change="selectDatabase">-->
-            <!--                            <el-option v-for="item in databaseOptions" :key="item.value" :label="item.label"-->
-            <!--                                       :value="item.value"/>-->
-            <!--                        </el-select>-->
             <el-space direction="vertical">
               <el-text style="margin-right:20px;font-size: 18px;font-weight:700;color:#006080 ">病人尿量(ml):500
               </el-text>
@@ -105,18 +100,10 @@
             <el-table-column prop="medicineRate" label="速度(ml/h)" width="120">
               <template #header>
                 <span>速度(ml/h)</span>
-                <!-- <el-dropdown @command="table1SpeedCommand">
+              </template>
-                  <span style="color: white;font-size: 14px;line-height: 20px;">
+              <template #default="scope">
-                    {{ table1SpeedVal || '请选择速度' }}
+               <span style="margin-right:25px">{{scope.row.medicineRate}}</span>
-                  </span>
+                <el-link type="success">+{{scope.row.change}}</el-link>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item command="速度(ug/kg/min)">速度(ug/kg/min)
-                      </el-dropdown-item>
-                      <el-dropdown-item command="速度(ml/h)">速度(ml/h)</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown> -->
               </template>
             </el-table-column>
             <el-table-column prop="countMedicine" label="累计药量(ml)" width="100">
@@ -136,8 +123,6 @@
                       <Minus/>
                     </el-icon>
                   </el-button>
-                  <!--									<el-button size="small" color="#006080" @click="tableItemConfirm(scope)"
-                             :disabled="tableDataStore[scope.$index].speed === scope.row.speed">确定-->
                   <el-button size="small" color="#006080"
                              @click="tableItemConfirm(scope, varTableData)" :disabled="!whetherControl">确定
                   </el-button>
@@ -153,7 +138,12 @@
           <el-table :data="fixedTableData" height="100%" style="width: 100%">
             <el-table-column prop="linkNum" label="泵号" width="40" align="center"/>
             <el-table-column prop="medicineName" label="药物名称" align="center"/>
-            <el-table-column prop="medicineRate" label="剂量(ml)" width="100"/>
+            <el-table-column prop="medicineRate" label="剂量(ml)" width="120">
+              <template #default="scope">
+               <span style="margin-right:25px">{{scope.row.medicineRate}}</span>
+                <el-link type="success">+{{scope.row.change}}</el-link>
+              </template>
+            </el-table-column>
             <el-table-column prop="countMedicine" label="累计药量(ml)" width="100">
             </el-table-column>
             <el-table-column prop="state" label="工作状态" width="70" align="center"/>
@@ -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)
+  const varTableData1=doctorMedicine.slice(0,4)
-  fixedTableData.value = doctorMedicine.slice(4,8)
+  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) {
+  if ((e.row.medicineRate + e.row.change) >=obj.total) {
-    e.row.medicineRate =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;
+  if (!isAIDose.value && e.row.medicineRate + e.row.change - obj.plus <= 0) return;
-  e.row.medicineRate -= obj.plus;
+  e.row.change -= obj.plus;
-  if (e.row.medicineRate < 0) e.row.medicineRate = 0;
+  if (e.row.change < 0) e.row.change = 0;
-  else e.row.medicineRate = Number(e.row.medicineRate).toFixed(2);
+  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 () {