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

src/pages/main/PatientBox.vue

@@ -5,7 +5,7 @@
       <!-- <router-link :to="{path:'/details',  query: {patient_id: patient.patient_id, date: patient.schedule_date}}"> -->
       <div class="kehu">
 
-        <div style="position: relative;" class="tx">
+        <div style="position: relative;flex:2;" class="tx">
             <img :src="patient.patient.avatar.length > 0 ? patient.patient.avatar : '../../assets/product/test.jpg'"
                  alt="">
             <span class="redpoint" v-if="getStatus(patient)">{{getUnReadNum(patient) > 99?getUnReadNum(patient)+"+":getUnReadNum(patient)}}</span>
@@ -16,7 +16,7 @@
 
           </div>
         </div>
-        <div class="online" v-show="computeState(patient) != 4">
+        <div class="online" style="flex:1.3;" v-show="computeState(patient) != 4">
           <p :class="stateColor(patient)">{{stateText(patient)}}</p>
           <!-- <span class="time">剩余时间 : 90:08</span>     -->
         </div>

src/pages/main/today/acceptsAssessment.vue

@@ -19,9 +19,9 @@
           <label>体位 : </label>
           <span class="content">{{posture}}</span>
         </li>
-      </ul>
+      <!-- </ul>
 
-      <ul>
+      <ul> -->
         <li style="height: 0.6rem;" v-if="isShow('病人食欲')">
           <label>病人食欲 : </label>
           <span class="content">{{appetite}}</span>
@@ -39,11 +39,11 @@
           <span class="content">{{intakes}}</span>
         </li>
 
-      </ul>
+      <!-- </ul>
 
 
 
-      <ul >
+      <ul > -->
         <li style="height: 0.6rem;" v-if="isShow('营养状况')">
           <label>营养状况:</label>
           <span class="content">{{nutritions}}</span>

src/pages/main/today/assessmentAfter.vue

@@ -55,9 +55,9 @@
           <span id="xgtlcz" class="content">{{blood_access_opera}}</span>
         </li>
 
-      </ul>
+      <!-- </ul>
 
-      <ul>
+      <ul> -->
         <li v-if="isShow('体重减少')">
           <label for="tzjs">体重减少 : </label>
           <span class="content" id="tzjs">{{weight_loss?weight_loss:''}}</span>
@@ -114,10 +114,10 @@
           <label for="bzh">拔针后穿刺点渗血: </label>
           <span id="bzh" class="content">{{puncture_point_oozing_blood_name}}</span>
         </li>
-      </ul>
+      <!-- </ul>
 
 
-      <ul >
+      <ul > -->
         <li v-if="isShow('透析过程')">
           <label for="tw">透析过程 : </label>
           <span class="content" id="tw" v-if="this.record.dialysis_process == 1">完成</span>

src/pages/main/today/assessmentBefore.vue

@@ -43,8 +43,8 @@
         </li>
 
 
-      </ul>
-      <ul>
+      <!-- </ul>
+      <ul> -->
         <li v-if="isShow('体温')">
           <label>体温 : </label>
           <span class="content">{{ temperature?temperature:''}}</span>
@@ -76,9 +76,9 @@
           <span class="unit"></span>
         </li>
 
-      </ul>
+      <!-- </ul>
 
-      <ul>
+      <ul> -->
 
         <li v-if="isShow('透析机型号')">
           <label>透析机型号: </label>
@@ -108,12 +108,12 @@
           <span class="content">{{getVenousCatheterization(this.record.venous_catheterization)}}</span>
           <span class="unit"> </span>
         </li>
-
+<!-- 
       </ul>
 
 
 
-      <ul >
+      <ul > -->
         <li style="height: 0.6rem;" v-if="isShow('位置')">
           <label>位置:</label>
           <span class="content" v-if="this.record.venous_catheterization_part != -1">{{getVenousCatheterizationPart(this.record.venous_catheterization_part)}}</span>

src/pages/main/today/dialysisPrescription.vue

@@ -33,8 +33,8 @@
           <span class="content">{{glucose != '0'?glucose:""}}</span>
           <span class="unit">{{glucose != '0'?"mmol/l":""}}</span>
         </li>
-      </ul>
-      <ul>
+      <!-- </ul>
+      <ul> -->
         <li v-if="isShow('透析时长')">
           <label>透析时长 : </label>
           <span class="content">{{dialysis_duration != '0'?dialysis_duration:""}}</span>
@@ -68,8 +68,8 @@
           <span class="content">{{dialysate_temperature != '0'?dialysate_temperature:""}}</span>
           <span class="unit">{{dialysate_temperature != '0'?"℃":""}}</span>
         </li>
-      </ul>
-      <ul>
+      <!-- </ul>
+      <ul> -->
         <li v-if="isShow('血流量')">
           <label>血流量 : </label>
           <span class="content">{{blood_flow_volume != '0'?blood_flow_volume:''}}</span>
@@ -99,8 +99,8 @@
           <span class="content">{{conductivity != '0'?conductivity:""}}</span>
           <span class="unit">{{conductivity != '0'?"mS/cm":""}}</span>
         </li>
-      </ul>
-      <ul>
+      <!-- </ul>
+      <ul> -->
         <li v-if="isShow('透析器/灌流器')">
           <label>透析器/灌流器 : </label>
           <span class="content">{{dialyzer_perfusion_apparatus}}</span>

src/styles/style.scss

@@ -81,6 +81,8 @@
       li {
         font-size: 0.34rem;
         line-height: 0.62rem;
+        float: left;
+        width: 5.6rem;
         .content {
           color: $main-color;
         }