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

src/pages/advice/DialysisAdviceTable.vue

@@ -79,13 +79,11 @@
           <td></td>
           <td></td>
           <td></td>
-
-
         </tr>
         <template v-for="(schedule) in schedules">
           <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
             <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
-            <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
+            <td style="color:#409eff;">{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
             <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
             <td>{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
             <td>{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
@@ -246,7 +244,7 @@ export default {
       console.log(this.admin_user)
 
       for (let i = 0; i < this.admin_user.length; i++) {
-        if (this.admin_user[i].id ==  val) {
+        if (this.admin_user[i].id == val) {
           return this.admin_user[i].name;
         }
       }

src/pages/main/dialysis/InspectionItemTable.vue

@@ -40,7 +40,7 @@
         </tr>
         <tr>
           <td width="20%"></td>
-          <td width="10%" @click="expandTable(indexs)" v-model="isExpand">{{items.expandName}}</td>
+          <td width="10%" style="color:#409EFF;" @click="expandTable(indexs)" v-model="isExpand">{{items.expandName}}</td>
           <td width="10%"></td>
           <td width="10%"></td>
         </tr>
@@ -283,7 +283,6 @@ export default {
       font-weight: normal;
     }
     td {
-      background: #fafafa;
       border: none;
       span {
         background: #ff7979;

src/pages/main/dialysis/MissionTable.vue

@@ -238,7 +238,7 @@ export default {
   }
 }
 .tableDate {
-  background: $text-color;
+  background: #ecf5ff;
   color: $pgh-color;
   @include box-sizing;
   ul {
@@ -250,6 +250,7 @@ export default {
       font-size: 0.3rem;
       padding:0.16rem 0;
       line-height: 0.5rem;
+      border-right: 2px #fff solid;
       span {
         @include flex;
         border-right: 2px #fff solid;

src/pages/monitoring/index.vue

@@ -66,7 +66,7 @@
           </tr>
           <tr v-for="(item,index) in items.scheduals" :key="index" @click="clickfunction(item)">
             <td width="8%">{{item.device_number.number}}</td>
-            <td width="10%">{{item.patient.name}}</td>
+            <td width="10%" style="color:#409eff;">{{item.patient.name}}</td>
             <td width="9%">{{item.patient.dialysis_no}}</td>
             <td width="13%">{{parseTime(item.schedule_date, "{y}-{m}-{d}")}}</td>
             <td width="10%">{{item.treatment_mode.name}}</td>