Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/DialysisArea.vue

@@ -294,56 +294,56 @@ export default {
 
     var storedata = this.$store.getters.scheduals
     var scheduals = storedata.scheduals
-    // if (Object.keys(storedata).length > 0) {
-    //   var zoneMap = {}
-    //   var schedualMap = {}
-    //   for (let index = 0; index < scheduals.length; index++) {
-    //     const schedual = scheduals[index]
-    //     if (schedual.dialysis_order == null) {
-    //       continue
-    //     }
-    //     if (schedualMap[schedual.device_number.zone.name] == null) {
-    //       schedualMap[schedual.device_number.zone.name] = []
-    //     }
-    //     schedualMap[schedual.device_number.zone.name].push(schedual)
-    //     if (zoneMap[schedual.device_number.zone.name] == null) {
-    //       zoneMap[schedual.device_number.zone.name] =
-    //         schedual.device_number.zone
-    //     }
-    //   }
+    if (Object.keys(storedata).length > 0) {
+      var zoneMap = {}
+      var schedualMap = {}
+      for (let index = 0; index < scheduals.length; index++) {
+        const schedual = scheduals[index]
+        if (schedual.dialysis_order == null) {
+          continue
+        }
+        if (schedualMap[schedual.device_number.zone.name] == null) {
+          schedualMap[schedual.device_number.zone.name] = []
+        }
+        schedualMap[schedual.device_number.zone.name].push(schedual)
+        if (zoneMap[schedual.device_number.zone.name] == null) {
+          zoneMap[schedual.device_number.zone.name] =
+            schedual.device_number.zone
+        }
+      }
 
-    //   var zones = []
-    //   zones.push({ value: 0, text: '全部分区' })
-    //   for (var zoneName in zoneMap) {
-    //     zones.push({ value: zoneMap[zoneName].id, text: zoneName })
-    //   }
+      var zones = []
+      zones.push({ value: 0, text: '全部分区' })
+      for (var zoneName in zoneMap) {
+        zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+      }
 
-    //   zones = zones.sort(function (a, b) {
-    //     return a.value > b.value
-    //   })
-    //   this.zones = zones
+      zones = zones.sort(function (a, b) {
+        return a.value > b.value
+      })
+      this.zones = zones
 
-    //   var dialysis_scheduals = []
-    //   for (let index = 0; index < zones.length; index++) {
-    //     const zone = zones[index]
-    //     var scheduals = schedualMap[zone.text]
-    //     if (scheduals == null) {
-    //       continue
-    //     }
-    //     dialysis_scheduals.push({
-    //       zone_name: zone.text,
-    //       scheduals: scheduals
-    //     })
-    //   }
-    //   this.dialysis_scheduals = dialysis_scheduals
-    // } else {
+      var dialysis_scheduals = []
+      for (let index = 0; index < zones.length; index++) {
+        const zone = zones[index]
+        var scheduals = schedualMap[zone.text]
+        if (scheduals == null) {
+          continue
+        }
+        dialysis_scheduals.push({
+          zone_name: zone.text,
+          scheduals: scheduals
+        })
+      }
+      this.dialysis_scheduals = dialysis_scheduals
+    } else {
       this.requestDialysisScheduals()
-    // }
+    }
   },
   mounted () {
     this.timer = window.setInterval(() => {
       setTimeout(this.requestDialysisScheduals(), 0)
-    }, 120000)
+    }, 60000)
   },
   beforeDestroy () {
     clearInterval(this.timer)

src/pages/main/Print.vue

@@ -1102,7 +1102,7 @@
                     </td>
                     <td width="20">L</td>
                     <td></td>
-                    <td width="60">透后体重</td>
+                    <td width="60">透后称重</td>
                     <td width="50">
                       <div class="under-line">&nbsp;{{afterdialysis.weight_after?afterdialysis.weight_after:''}}</div>
                     </td>

src/pages/main/WaitingArea.vue

@@ -581,9 +581,11 @@ export default {
       // getWaitingScheduals({ date: date }).then(rs => {
       // var resp = rs.data
       // if (resp.state == 1) {
+      
       this.loading = false
       var storedata = this.$store.getters.waitscheduals
       var scheduals = storedata.waitscheduals
+  
 
       // var scheduals = resp.data.scheduals
       // this.$store.dispatch('SetWaitScheduals', {

src/pages/main/dialog/AssessmentDialog.vue

@@ -8,8 +8,8 @@
       </div>
 
       <div class="DialogContent" id="dialogTop">
-        <div class="item" v-if="isShow('透前体重')">
-          <h2 class="name">透前体重(kg)</h2>
+        <div class="item" v-if="isShow('透前称重')">
+          <h2 class="name">透前称重(kg)</h2>
           <div class="content">
             <input
               type="number"

src/pages/main/dialog/ThorougDialog.vue

@@ -28,8 +28,8 @@
           </div>
         </div>
 
-        <div class="item" v-if="isShow('透后体重')">
-          <label class="name" for="sjcll">透后体重(kg)</label>
+        <div class="item" v-if="isShow('透后称重')">
+          <label class="name" for="sjcll">透后称重(kg)</label>
           <div class="content">
             <input
               type="number"
@@ -1416,7 +1416,7 @@ export default {
         }
       }).catch(err => {
         Toast.fail(err)
-      });
+      })
     },
     close: function () {
       this.$emit('close')
@@ -1601,9 +1601,12 @@ export default {
       for (const key in this.formValue) {
         // console.log(key, this.record[key]);
         this.formValue[key] = this.record[key]
-        console.log(key + '----' + this.formValue[key])
       }
     }
+
+    if ((this.record.id == undefined || this.record.id == '') && this.predialysis.id != undefined) {
+      this.$set(this.formValue, 'additional_weight', this.predialysis['additional_weight'].toString())
+    }
     // else  {
     // if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
     //   this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)

src/pages/main/dialog/subMenu/MsgTip.vue

@@ -19,9 +19,9 @@
         </div>
       </div>
       <div class="item" style="display:block;">
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透前体重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{ getBeforeWeight(predialysis)}}</span></div>
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透前称重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{ getBeforeWeight(predialysis)}}</span></div>
         <div class="content" style="margin-top:5px;margin-left:0;">
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透前体重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{ getBeforeWeight(predialysis)}}</span>kg=
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透前称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{ getBeforeWeight(predialysis)}}</span>kg=
           透前总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.weight_before}}</span>kg-
           衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.additional_weight}}</span>kg
            </span>
@@ -46,8 +46,8 @@
         <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">体重增加（kg）<span style="text-align:right;float: right;color:#ec6618;">{{add_weight}}</span></div>
         <div class="content" style="margin-top:5px;margin-left:0;">
           <span class="text" style="text-align:left;display:block;height:0.8rem;line-height:0.6rem;" id="txms">体重增加:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{add_weight}}</span>kg=
-          透前体重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getBeforeWeight(predialysis)}}</span>kg -
-          上次透后体重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg
+          透前称重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getBeforeWeight(predialysis)}}</span>kg -
+          上次透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg
           </span>
         </div>
         <br>
@@ -59,9 +59,9 @@
         </div>
       </div> -->
       <div class="item" style="display:block;">
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透后体重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{getAfterWeight(record)}}</span></div>
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透后称重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{getAfterWeight(record)}}</span></div>
         <div class="content" style="margin-top:5px;margin-left:0;">
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透后体重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getAfterWeight(record)}}</span>kg=
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getAfterWeight(record)}}</span>kg=
           透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{record.weight_after}}</span>kg-
           衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.additional_weight}}</span>kg
            </span>
@@ -81,9 +81,9 @@
         </div>
       </div>
       <div class="item" style="display:block;">
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">上次透后体重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{getLastAfterWeight(last_record)}}</span></div>
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">上次透后称重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{getLastAfterWeight(last_record)}}</span></div>
         <div class="content" style="margin-top:5px;margin-left:0;">
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">上次透后体重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg=
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">上次透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg=
           上次透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_record.weight_after}}</span>kg-
           上次衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_predialysis.additional_weight}}</span>kg
            </span>

src/pages/main/dialysis/RecordTable.vue

@@ -63,8 +63,8 @@
             <th width="110px">透析模式</th>
             <th width="92px">透析时长(h)</th>
             <th width="76px">干体重(kg)</th>
-            <th width="76px">透前体重(kg)</th>
-            <th width="76px">透后体重(kg)</th>
+            <th width="76px">透前称重(kg)</th>
+            <th width="76px">透后称重(kg)</th>
             <th width="92px">透前血压(mmHg)</th>
             <th width="92px">透后血压(mmHg)</th>
             <th width="92px">超滤总量(L)</th>

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -99,78 +99,149 @@
                 </div>
 
                 <div class="row" style="padding: 2px 0;line-height:23px;">
-                  <div class="inline_block" >
+                  <div class="inline_block">
                     T：
-                    <div class="under_line" style="width: 50px;text-align: center">
-                      {{predialysis.temperature?predialysis.temperature:'/'}}
+                    <div
+                      class="under_line"
+                      style="width: 50px;text-align: center"
+                    >
+                      {{
+                        predialysis.temperature ? predialysis.temperature : "/"
+                      }}
                     </div>
                     °C
                   </div>
                   <div class="inline_block" style="margin-left:10px;">
                     P：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{predialysis.pulse_frequency?predialysis.pulse_frequency:'/'}}
+                    <div
+                      class="under_line"
+                      style="width: 50px;text-align: center;"
+                    >
+                      {{
+                        predialysis.pulse_frequency
+                          ? predialysis.pulse_frequency
+                          : "/"
+                      }}
                     </div>
                     次/分
                   </div>
                   <div class="inline_block" style="margin-left:10px;">
                     R：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{predialysis.breathing_rate?predialysis.breathing_rate:'/'}}
+                    <div
+                      class="under_line"
+                      style="width: 50px;text-align: center;"
+                    >
+                      {{
+                        predialysis.breathing_rate
+                          ? predialysis.breathing_rate
+                          : "/"
+                      }}
                     </div>
                     次/分
                   </div>
                   <div class="inline_block" style="margin-left:10px;">
                     BP：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:'/'}}
+                    <div
+                      class="under_line"
+                      style="width: 50px;text-align: center;"
+                    >
+                      {{
+                        predialysis.systolic_blood_pressure
+                          ? predialysis.systolic_blood_pressure
+                          : "/"
+                      }}
                     </div>
                     /
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:'/'}}
+                    <div
+                      class="under_line"
+                      style="width: 50px;text-align: center;"
+                    >
+                      {{
+                        predialysis.diastolic_blood_pressure
+                          ? predialysis.diastolic_blood_pressure
+                          : "/"
+                      }}
                     </div>
                     mmHg
                   </div>
-                  <div class="inline_block" style="margin-left:10px;">
-                    血管通路：
-                    <div class="under_line" style="width: 200px;text-align: center;">
-                      {{QueryPartById(predialysis.blood_access_part_id)}} {{predialysis.blood_access_part_opera_name}}
-                    </div>
-                  </div>
-                </div>
-                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                  <div class="inline_block" style="flex:1;">
-                    内瘘：
-                    <div class="under_line" style="width: 150px;text-align: center">
-                      {{predialysis.internal_fistula?predialysis.internal_fistula:'/'}}
-                    </div>
-                  </div>
-
-                  <div class="inline_block" style="margin-left:10px;flex:1;">
-                    导管：
-                    <div class="under_line" style="width: 150px;text-align: center">
-                      {{predialysis.catheter?predialysis.catheter:'/'}}
-                    </div>
-                  </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺方式：
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
+                    <div
+                      class="under_line"
+                      style="width: 100px;text-align: center"
+                      v-if="predialysis.puncture_way == 0"
+                    >
                       /
                     </div>
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
+                    <div
+                      class="under_line"
+                      style="width: 100px;text-align: center"
+                      v-if="predialysis.puncture_way == 1"
+                    >
                       绳梯
                     </div>
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 2">
+                    <div
+                      class="under_line"
+                      style="width: 100px;text-align: center"
+                      v-if="predialysis.puncture_way == 2"
+                    >
                       扣眼
                     </div>
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
+                    <div
+                      class="under_line"
+                      style="width: 100px;text-align: center"
+                      v-if="predialysis.puncture_way == 3"
+                    >
                       区域
                     </div>
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺针：
-                    <div class="under_line" style="width: 100px;text-align: center">
-                      {{predialysis.puncture_needle?predialysis.puncture_needle:'/'}}
+                    <div
+                      class="under_line"
+                      style="width: 100px;text-align: center"
+                    >
+                      {{
+                        predialysis.puncture_needle
+                          ? predialysis.puncture_needle
+                          : "/"
+                      }}
+                    </div>
+                  </div>
+                </div>
+
+                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" >
+                  <div class="inline_block" style="flex:1.4">
+                    血管通路：
+                    <div
+                      class="under_line"
+                      style="width: 200px;text-align: center;"
+                    >
+                      {{ QueryPartById(predialysis.blood_access_part_id) }}
+                      {{ predialysis.blood_access_part_opera_name }}
+                    </div>
+                  </div>
+                  <div class="inline_block" style="margin-left:10px;flex:1;">
+                    内瘘：
+                    <div
+                      class="under_line"
+                      style="width: 150px;text-align: center"
+                    >
+                      {{
+                        predialysis.internal_fistula
+                          ? predialysis.internal_fistula
+                          : "/"
+                      }}
+                    </div>
+                  </div>
+
+                  <div class="inline_block" style="margin-left:10px;flex:1.8;">
+                    导管：
+                    <div
+                      class="under_line"
+                      style="width: 150px;text-align: center"
+                    >
+                      {{ predialysis.catheter ? predialysis.catheter : "/" }}
                     </div>
                   </div>
                 </div>
@@ -443,26 +514,27 @@
                       <td  width="100">护士签名</td> -->
                     </tr>
 
-                    <tr v-for="(monitor,monindex) in monitors" :key="monindex">
-                      <td>{{getTime(monitor.operate_time,'{h}:{i}')}}</td>
-                      <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure+'/':''}}{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
-                      <td>{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
-                      <td>{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
-                      <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
-                      <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}</td>
-                      <td>{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:0}}</td>
-                      <td>{{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}</td>
-                      <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
-                      <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
-                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12" width="50">{{monitor.displacement_quantity?monitor.displacement_quantity:0}}</td>
+                    <tr v-for="(monitor, monindex) in monitors" :key="monindex">
+                      <td> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                      <td> {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}{{  monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }} </td> 
+                      <td> {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }} </td>
+                      <td> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
+                      <td> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
+                      <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} </td>
+                      <td v-if="monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure  : "" }} </td>
+                      <td v-if="monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time"> {{  monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
+                      <td> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>
+                      <td> {{ monitor.sodium_concentration  ? monitor.sodium_concentration : "" }}  </td>
+                      <td v-if="monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume  : "" }} </td>
+                      <td v-if="monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume  : 0 }} </td>
+                      <td v-if="  (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time > dialysisOrder.end_time  "  width="50" >  {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
+                      <td v-if=" (prescription.mode_id == 2 ||  prescription.mode_id == 5) && monitor.operate_time <= dialysisOrder.end_time  " width="50"  > {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }} </td>
                       <td style="line-height:16px;padding:0px;">
-                        <div style="min-height:40px;line-height:40px; overflow:hidden;">
-                          <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
-                          <template v-if="monitor.operate_time == dialysisOrder.start_time">【开始透析】</template>
-                            {{monitor.end}}
-                            {{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}
+                        <div style="min-height:35px;line-height:35px; overflow:hidden;">
+                          <span  style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
+                            <template v-if=" monitor.operate_time == dialysisOrder.start_time " >【开始透析】</template > {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
-                        </div>
+                        </div> 
                       </td>
                     </tr>
                     <tr v-for="(monitor,monindex) in monitors2" :key="monindex">
@@ -677,28 +749,42 @@
                   min
                 </div>
               </div>
-              <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                <div class="inline_block" style="flex:2;">
-                  凝血程度：
-                  <div class="under_line" style="width: 200px;text-align: center">
-                    {{afterdialysis.cruor?afterdialysis.cruor:'/'}}
+              <div  class="row"  style="padding: 2px 0;line-height:23px;display:flex;"  >
+                  <div class="inline_block" style="flex:2;">
+                    凝血程度：
+                    <div
+                      class="under_line"
+                      style="width:200px;text-align:center;"
+                    >
+                      {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
+                    </div>
                   </div>
-                </div>
-                <div class="inline_block" style="flex:2;">
-                  内瘘：
-                  <div class="under_line" style="width: 200px;text-align: center">
-                    {{afterdialysis.internal_fistula?afterdialysis.internal_fistula:'/'}}
+                  <div class="inline_block" style="flex:1;">
+                    内瘘：
+                    <div
+                      class="under_line"
+                      style="width: 70px;text-align: center"
+                    >
+                      {{
+                        afterdialysis.internal_fistula
+                          ? afterdialysis.internal_fistula
+                          : "/"
+                      }}
+                    </div>
                   </div>
-                </div>
-                <div class="inline_block" style="flex:1;">
-                  导管：
-                  <div class="under_line" style="width: 150px;text-align: center">
-                    {{afterdialysis.catheter?afterdialysis.catheter:'/'}}
+                  <div class="inline_block" style="flex:3;">
+                    导管：
+                    <div
+                      class="under_line"
+                      style="min-width: 120px;text-align: center"
+                    >
+                      {{
+                        afterdialysis.catheter ? afterdialysis.catheter : "/"
+                      }}
+                    </div>
                   </div>
                 </div>
 
-              </div>
-
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
 
                 <div class="inline_block" style="flex:1;">

src/pages/main/today/assessmentAfter.vue

@@ -24,8 +24,8 @@
           <span class="content" id="ssy">{{systolic_blood_pressure?systolic_blood_pressure:''}}</span>
           <span class="unit">{{systolic_blood_pressure?'mmHg':''}}</span>
         </li>
-        <li v-if="isShow('透后体重')">
-          <label for="thtz">透后体重 : </label>
+        <li v-if="isShow('透后称重')">
+          <label for="thtz">透后称重 : </label>
           <span class="content" id="thtz">{{weight_after?weight_after:''}}</span>
           <span class="unit">{{weight_after?'kg':''}}</span>
         </li>

src/pages/main/today/assessmentBefore.vue

@@ -7,8 +7,8 @@
     </h2>
     <div class="plate ">
       <ul>
-        <li v-if="isShow('透前体重')">
-          <label>透前体重 : </label>
+        <li v-if="isShow('透前称重')">
+          <label>透前称重 : </label>
           <span class="content">{{ weight_before ? weight_before : "" }}</span>
           <span class="unit">{{ weight_before ? "kg" : "" }}</span>
         </li>

src/pages/main/today/pastData.vue

@@ -36,8 +36,8 @@ export default {
       tableTit: [
         "日期",
         "透析模式",
-        "透前体重(kg)",
-        "透后体重(kg)",
+        "透前称重(kg)",
+        "透后称重(kg)",
         "设定脱水(L)",
         "实际脱水(L)"
       ],

src/pages/waitingRoom/components/assessmentAfter.vue

@@ -8,7 +8,7 @@
     <div class="plate ">
       <ul>
         <li>
-          <label>透后体重 : </label>
+          <label>透后称重 : </label>
           <span class="content">{{ weight_after }}</span>
           <span class="unit">kg</span>
         </li>
@@ -98,7 +98,7 @@ export default {
       note: "无明显异常",
       doctor: "刘小军  医生",
       info1: [
-        { value: "1", label: "透后体重 : ", content: "55", unit: "kg" },
+        { value: "1", label: "透后称重 : ", content: "55", unit: "kg" },
         { value: "2", label: "收缩压 : ", content: "174", unit: "mmHg" },
         { value: "3", label: "实际超滤量: ", content: "20", unit: "ml" },
         { value: "4", label: "疑血 : ", content: "无震颤", unit: "" },

src/pages/waitingRoom/components/assessmentBefore.vue

@@ -44,7 +44,7 @@ export default {
       note: "",
       doctor: "刘小军  医生",
       info1: [
-        { value: "1", label: "透前体重 : ", content: "0", unit: "kg" },
+        { value: "1", label: "透前称重 : ", content: "0", unit: "kg" },
         { value: "2", label: "收缩压 : ", content: "0", unit: "mmHg" },
         { value: "3", label: "前次透析后: ", content: "0", unit: "" },
         { value: "4", label: " ", content: " ", unit: "" }

src/pages/waitingRoom/components/dialog/afterThoroughly.vue

@@ -7,7 +7,7 @@
     </h2>
     <div class="content">
       <div class="cell">
-        <label>透后体重(kg)</label>
+        <label>透后称重(kg)</label>
         <input
           type="text"
           class="inputBox"

src/pages/waitingRoom/components/dialog/preDialysis.vue

@@ -7,7 +7,7 @@
     </h2>
     <div class="content">
       <div class="cell">
-        <label>透前体重(kg)</label>
+        <label>透前称重(kg)</label>
         <input
           type="text"
           class="inputBox"

src/pages/waitingRoom/components/pastData.vue

@@ -36,8 +36,8 @@ export default {
       tableTit: [
         "日期",
         "透析模式",
-        "透前体重(kg)",
-        "透后体重(kg)",
+        "透前称重(kg)",
+        "透后称重(kg)",
         "设定脱水(L)",
         "实际脱水(L)"
       ],

src/styles/style.scss

@@ -501,7 +501,7 @@ body {
         height: 11.8rem !important;
       }
       @media only screen and (min-width: 768px) {
-        height: 11.8rem !important;
+        height: 9.8rem !important;
       }
       .item {
         padding: 0 0.32rem;