Parcourir la source

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

zhengchengwu il y a 5 ans
Parent
révision
24e37bde9d

+ 2 - 4
src/pages/advice/DialysisAdviceTable.vue Voir le fichier

79
           <td></td>
79
           <td></td>
80
           <td></td>
80
           <td></td>
81
           <td></td>
81
           <td></td>
82
-
83
-
84
         </tr>
82
         </tr>
85
         <template v-for="(schedule) in schedules">
83
         <template v-for="(schedule) in schedules">
86
           <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
84
           <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
87
             <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
85
             <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
88
-            <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
86
+            <td style="color:#409eff;">{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
89
             <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
87
             <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
90
             <td>{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
88
             <td>{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
91
             <td>{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
89
             <td>{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
246
       console.log(this.admin_user)
244
       console.log(this.admin_user)
247
 
245
 
248
       for (let i = 0; i < this.admin_user.length; i++) {
246
       for (let i = 0; i < this.admin_user.length; i++) {
249
-        if (this.admin_user[i].id ==  val) {
247
+        if (this.admin_user[i].id == val) {
250
           return this.admin_user[i].name;
248
           return this.admin_user[i].name;
251
         }
249
         }
252
       }
250
       }

+ 1 - 2
src/pages/main/dialysis/InspectionItemTable.vue Voir le fichier

40
         </tr>
40
         </tr>
41
         <tr>
41
         <tr>
42
           <td width="20%"></td>
42
           <td width="20%"></td>
43
-          <td width="10%" @click="expandTable(indexs)" v-model="isExpand">{{items.expandName}}</td>
43
+          <td width="10%" style="color:#409EFF;" @click="expandTable(indexs)" v-model="isExpand">{{items.expandName}}</td>
44
           <td width="10%"></td>
44
           <td width="10%"></td>
45
           <td width="10%"></td>
45
           <td width="10%"></td>
46
         </tr>
46
         </tr>
283
       font-weight: normal;
283
       font-weight: normal;
284
     }
284
     }
285
     td {
285
     td {
286
-      background: #fafafa;
287
       border: none;
286
       border: none;
288
       span {
287
       span {
289
         background: #ff7979;
288
         background: #ff7979;

+ 2 - 1
src/pages/main/dialysis/MissionTable.vue Voir le fichier

238
   }
238
   }
239
 }
239
 }
240
 .tableDate {
240
 .tableDate {
241
-  background: $text-color;
241
+  background: #ecf5ff;
242
   color: $pgh-color;
242
   color: $pgh-color;
243
   @include box-sizing;
243
   @include box-sizing;
244
   ul {
244
   ul {
250
       font-size: 0.3rem;
250
       font-size: 0.3rem;
251
       padding:0.16rem 0;
251
       padding:0.16rem 0;
252
       line-height: 0.5rem;
252
       line-height: 0.5rem;
253
+      border-right: 2px #fff solid;
253
       span {
254
       span {
254
         @include flex;
255
         @include flex;
255
         border-right: 2px #fff solid;
256
         border-right: 2px #fff solid;

+ 1 - 1
src/pages/monitoring/index.vue Voir le fichier

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