Browse Source

固定头部修改

柳香萍 5 years ago
parent
commit
36af79f265

+ 31 - 18
src/pages/advice/DialysisAdviceTable.vue View File

45
       </ul>
45
       </ul>
46
     </div>
46
     </div>
47
 
47
 
48
-    <div class="blueBorder"></div>
49
-    <div style="width:100%;overflow:hildden;overflow-x:auto;">
48
+    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="DialysisAdvice">
49
+     <div class="blueBorder"></div>
50
      <table class="table">
50
      <table class="table">
51
       <tr>
51
       <tr>
52
         <th width="50px">机号</th>
52
         <th width="50px">机号</th>
213
   },
213
   },
214
   methods: {
214
   methods: {
215
     clickfunction: function(val) {
215
     clickfunction: function(val) {
216
-      console.log(val);
216
+      // console.log(val);
217
       this.$router.push({
217
       this.$router.push({
218
         path: "/details",
218
         path: "/details",
219
         query: {
219
         query: {
231
     openPicker() {
231
     openPicker() {
232
       this.$refs.picker.open();
232
       this.$refs.picker.open();
233
     },
233
     },
234
-    getAdaviceType(type) {
235
-      if (type == 1) {
236
-        return "长嘱";
237
-      } else if (type == 2) {
238
-        return "临嘱";
239
-      } else if (type == 3) {
240
-        return "临嘱";
234
+    getAdaviceType(type,parent_id) {
235
+      if(parent_id == 0) {
236
+        if (type == 1) {
237
+          return "长嘱";
238
+        } else if (type == 2) {
239
+          return "临嘱";
240
+        } else if (type == 3) {
241
+          return "临嘱";
242
+        }
241
       }
243
       }
242
     },
244
     },
243
     getName(val) {
245
     getName(val) {
246
+      console.log(this.admin_user)
244
 
247
 
245
       for (let i = 0; i < this.admin_user.length; i++) {
248
       for (let i = 0; i < this.admin_user.length; i++) {
246
-        if ((this.admin_user[i].id = val)) {
249
+        if (this.admin_user[i].id ==  val) {
247
           return this.admin_user[i].name;
250
           return this.admin_user[i].name;
248
         }
251
         }
249
       }
252
       }
262
       this.show_zone_selector = false;
265
       this.show_zone_selector = false;
263
     },
266
     },
264
     parseTime: function(time, layout) {
267
     parseTime: function(time, layout) {
265
-      console.log(time);
268
+      // console.log(time);
266
       if (time == 0) {
269
       if (time == 0) {
267
         return "";
270
         return "";
268
       }
271
       }
285
             if (schedule.doctor_advice.length == 0) {
288
             if (schedule.doctor_advice.length == 0) {
286
               continue;
289
               continue;
287
             }
290
             }
288
-            if (scheduleMap[schedule.device_zone.name] == null) {
289
-              scheduleMap[schedule.device_zone.name] = [];
291
+            if (scheduleMap[schedule.device_number.zone.name] == null) {
292
+              scheduleMap[schedule.device_number.zone.name] = [];
290
             }
293
             }
291
-            scheduleMap[schedule.device_zone.name].push(schedule);
292
-            if (zoneMap[schedule.device_zone.name] == null) {
293
-              zoneMap[schedule.device_zone.name] = schedule.device_zone;
294
+            scheduleMap[schedule.device_number.zone.name].push(schedule);
295
+            if (zoneMap[schedule.device_number.zone.name] == null) {
296
+              zoneMap[schedule.device_number.zone.name] = schedule.device_number.zone;
294
             }
297
             }
295
           }
298
           }
296
 
299
 
365
 }
368
 }
366
 .choice {
369
 .choice {
367
   border-bottom: 1px #e5e5e5 solid;
370
   border-bottom: 1px #e5e5e5 solid;
371
+  position: fixed;
372
+  top: 63px;
373
+  right: 0;
374
+  z-index: 66;
375
+  left: 1.58rem;
376
+  background: #fff;
368
   ul {
377
   ul {
369
     @include display-flex;
378
     @include display-flex;
370
     @include align-items-center;
379
     @include align-items-center;
394
     }
403
     }
395
   }
404
   }
396
 }
405
 }
397
-
406
+.DialysisAdvice{
407
+  padding-top:115px; 
408
+  background: #fff;
409
+  min-height: calc(100vh - 2px);
410
+}
398
 </style>
411
 </style>

+ 83 - 66
src/pages/advice/NormalAdviceTable.vue View File

45
       </ul>
45
       </ul>
46
     </div>
46
     </div>
47
 
47
 
48
-    <div class="blueBorder"></div>
49
-    <div style="width:100%;overflow:hildden;overflow-x:auto;">
48
+    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="NormalAdvice">
49
+      <div class="blueBorder"></div>      
50
       <table class="table">
50
       <table class="table">
51
         <tr>
51
         <tr>
52
           <th width="50px">机号</th>
52
           <th width="50px">机号</th>
129
   import SideBar from "@/pages/layout/SideBar";
129
   import SideBar from "@/pages/layout/SideBar";
130
   import { parseTime } from "@/utils";
130
   import { parseTime } from "@/utils";
131
   import { getSchedualDoctors } from "@/api/advice";
131
   import { getSchedualDoctors } from "@/api/advice";
132
-
133
   export default {
132
   export default {
134
     name: "DialysisAdviceTable",
133
     name: "DialysisAdviceTable",
135
     components: {
134
     components: {
213
     },
212
     },
214
     methods: {
213
     methods: {
215
       clickfunction: function(val) {
214
       clickfunction: function(val) {
216
-        console.log(val);
215
+        // console.log(val);
217
         this.$router.push({
216
         this.$router.push({
218
           path: "/details",
217
           path: "/details",
219
           query: {
218
           query: {
230
       },
229
       },
231
       openPicker() {
230
       openPicker() {
232
         this.$refs.picker.open();
231
         this.$refs.picker.open();
233
-      },getAdaviceType(type){
234
-        if(type == 1){
235
-          return "长嘱"
236
-        }else if(type == 2){
237
-          return "临嘱"
238
-        }else if(type == 3){
239
-          return "临嘱"
232
+      },  getAdaviceType(type,parent_id) {
233
+        if(parent_id == 0) {
234
+          if (type == 1) {
235
+            return "长嘱";
236
+          } else if (type == 2) {
237
+            return "临嘱";
238
+          } else if (type == 3) {
239
+            return "临嘱";
240
+          }
240
         }
241
         }
241
       },getName(val){
242
       },getName(val){
242
         for(let i = 0; i < this.admin_user.length; i++){
243
         for(let i = 0; i < this.admin_user.length; i++){
243
-          if(this.admin_user[i].id = val){
244
+          if(this.admin_user[i].id == val){
244
             return this.admin_user[i].name
245
             return this.admin_user[i].name
245
           }
246
           }
246
         }
247
         }
281
               if (schedule.doctor_advice.length == 0) {
282
               if (schedule.doctor_advice.length == 0) {
282
                 continue;
283
                 continue;
283
               }
284
               }
284
-              if (scheduleMap[schedule.device_zone.name] == null) {
285
-                scheduleMap[schedule.device_zone.name] = [];
285
+              if (scheduleMap[schedule.device_number.zone.name] == null) {
286
+                scheduleMap[schedule.device_number.zone.name] = [];
286
               }
287
               }
287
-              scheduleMap[schedule.device_zone.name].push(schedule);
288
-              if (zoneMap[schedule.device_zone.name] == null) {
289
-                zoneMap[schedule.device_zone.name] = schedule.device_zone;
288
+              scheduleMap[schedule.device_number.zone.name].push(schedule);
289
+              if (zoneMap[schedule.device_number.zone.name] == null) {
290
+                zoneMap[schedule.device_number.zone.name] = schedule.device_number.zone;
290
               }
291
               }
291
             }
292
             }
292
 
293
 
315
 </script>
316
 </script>
316
 
317
 
317
 <style style="stylesheet/scss" lang="scss" scoped>
318
 <style style="stylesheet/scss" lang="scss" scoped>
318
-  .top {
319
+.top {
319
   .hospital {
320
   .hospital {
320
-  width: 2rem;
321
+    width: 2rem;
321
   }
322
   }
322
   .TopTitle {
323
   .TopTitle {
323
-  font-size: 0.36rem;
324
-  color: $title-color;
325
-  font-weight: normal;
324
+    font-size: 0.36rem;
325
+    color: $title-color;
326
+    font-weight: normal;
326
   }
327
   }
327
   padding: 0.3rem 0.3rem;
328
   padding: 0.3rem 0.3rem;
328
   @include display-flex;
329
   @include display-flex;
331
   @include justify-content-between;
332
   @include justify-content-between;
332
   border-bottom: 1px #e5e5e5 solid;
333
   border-bottom: 1px #e5e5e5 solid;
333
   .title {
334
   .title {
334
-  font-size: 0.3rem;
335
-  font-weight: bold;
336
-  color: $pgh-color;
335
+    font-size: 0.3rem;
336
+    font-weight: bold;
337
+    color: $pgh-color;
337
   }
338
   }
338
   .iconfont {
339
   .iconfont {
339
-  font-size: 0.4rem;
340
-  color: #a8b3ba;
340
+    font-size: 0.4rem;
341
+    color: #a8b3ba;
341
   }
342
   }
342
-  }
343
-  .search {
343
+}
344
+.search {
344
   background: #ebf1f7;
345
   background: #ebf1f7;
345
   border-radius: 30px;
346
   border-radius: 30px;
346
   padding: 0 0.3rem;
347
   padding: 0 0.3rem;
349
   color: #a8b3ba;
350
   color: #a8b3ba;
350
 
351
 
351
   .iconfont {
352
   .iconfont {
352
-  color: #a8b3ba;
353
-  font-size: 0.28rem;
353
+    color: #a8b3ba;
354
+    font-size: 0.28rem;
354
   }
355
   }
355
   .searchInput {
356
   .searchInput {
356
-  font-size: 0.28rem;
357
-  border: none;
358
-  outline: none;
359
-  background: #ebf1f7;
357
+    font-size: 0.28rem;
358
+    border: none;
359
+    outline: none;
360
+    background: #ebf1f7;
360
   }
361
   }
361
-  }
362
-  .choice {
362
+}
363
+.choice {
363
   border-bottom: 1px #e5e5e5 solid;
364
   border-bottom: 1px #e5e5e5 solid;
365
+   position: fixed;
366
+    top: 63px;
367
+    right: 0;
368
+    z-index: 66;
369
+    left: 1.58rem;
370
+    background: #fff;
364
   ul {
371
   ul {
365
-  @include display-flex;
366
-  @include align-items-center;
367
-  @include text-align;
368
-  @include justify-content-between;
369
-  width: 70%;
370
-  margin: 0 auto;
371
-  font-size: 0.32rem;
372
-  color: $pgh-color;
373
-  li {
374
-  @include display-flex;
375
-  @include align-items-center;
376
-  @include text-align;
377
-  @include justify-content-between;
378
-  padding: 0.3rem 0;
379
-  font-size: 0.32rem;
380
-  .iconfont {
381
-  margin: 0 0.1rem;
382
-  }
383
-  .line {
384
-  background: #a8b3ba;
385
-  width: 0.2rem;
386
-  height: 1px;
387
-  margin: 0 0.2rem;
388
-  display: inline-block;
389
-  }
390
-  }
391
-  }
392
-  }
393
-  .table {
372
+    @include display-flex;
373
+    @include align-items-center;
374
+    @include text-align;
375
+    @include justify-content-between;
376
+    width: 70%;
377
+    margin: 0 auto;
378
+    font-size: 0.32rem;
379
+    color: $pgh-color;
380
+    li {
381
+      @include display-flex;
382
+      @include align-items-center;
383
+      @include text-align;
384
+      @include justify-content-between;
385
+      padding: 0.3rem 0;
386
+      font-size: 0.32rem;
387
+      .iconfont {
388
+        margin: 0 0.1rem;
389
+      }
390
+      .line {
391
+        background: #a8b3ba;
392
+        width: 0.2rem;
393
+        height: 1px;
394
+        margin: 0 0.2rem;
395
+        display: inline-block;
396
+      }
397
+    }
394
   }
398
   }
399
+}
400
+.table {
401
+}
402
+.area{
403
+  padding-top:52px; 
404
+  background: #fff;
405
+  min-height: calc(100vh - 2px);
406
+}
407
+.NormalAdvice{
408
+  padding-top:115px; 
409
+  background: #fff;
410
+  min-height: calc(100vh - 2px);
411
+}
395
 </style>
412
 </style>

+ 0 - 1
src/pages/advice/index.vue View File

28
 .mainBox {
28
 .mainBox {
29
   height: 100%;
29
   height: 100%;
30
   font-size: 0.3rem;
30
   font-size: 0.3rem;
31
-  background: #fff;
32
   .sideColumn {
31
   .sideColumn {
33
     .column {
32
     .column {
34
       .head {
33
       .head {

+ 1 - 0
src/pages/main/DetailsPage.vue View File

171
   }
171
   }
172
   .Tab {
172
   .Tab {
173
     padding-top: 63px;
173
     padding-top: 63px;
174
+    padding-bottom: 0.25rem;
174
   }
175
   }
175
 }
176
 }
176
 </style>
177
 </style>

+ 15 - 9
src/pages/main/DialysisArea.vue View File

140
           const schedule = originSchedules[s_i];
140
           const schedule = originSchedules[s_i];
141
           if (
141
           if (
142
             zone_name.length == 0 ||
142
             zone_name.length == 0 ||
143
-            (zone_name.length > 0 && zone_name == schedule.device_zone.name)
143
+            (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)
144
           ) {
144
           ) {
145
             if (
145
             if (
146
               timetype_selected == 0 ||
146
               timetype_selected == 0 ||
209
               if (schedual.dialysis_order == null) {
209
               if (schedual.dialysis_order == null) {
210
                 continue;
210
                 continue;
211
               }
211
               }
212
-              if (schedualMap[schedual.device_zone.name] == null) {
213
-                schedualMap[schedual.device_zone.name] = [];
212
+              if (schedualMap[schedual.device_number.zone.name] == null) {
213
+                schedualMap[schedual.device_number.zone.name] = [];
214
               }
214
               }
215
-              schedualMap[schedual.device_zone.name].push(schedual);
216
-              if (zoneMap[schedual.device_zone.name] == null) {
217
-                zoneMap[schedual.device_zone.name] = schedual.device_zone;
215
+              schedualMap[schedual.device_number.zone.name].push(schedual);
216
+              if (zoneMap[schedual.device_number.zone.name] == null) {
217
+                zoneMap[schedual.device_number.zone.name] = schedual.device_number.zone;
218
               }
218
               }
219
             }
219
             }
220
 
220
 
260
 <style style="stylesheet/scss" lang="scss" scoped>
260
 <style style="stylesheet/scss" lang="scss" scoped>
261
 .screening {
261
 .screening {
262
   border-bottom: 1px #e5e5e5 solid;
262
   border-bottom: 1px #e5e5e5 solid;
263
+  position: fixed;
264
+    top: 63px;
265
+    right: 0;
266
+    z-index: 66;
267
+    left: 1.58rem;
268
+    background: #fff;
263
   ul {
269
   ul {
264
     @include display-flex;
270
     @include display-flex;
265
     @include align-items-center;
271
     @include align-items-center;
280
   }
286
   }
281
 }
287
 }
282
 .stateBox {
288
 .stateBox {
283
-  padding: 0.26rem 0 0 0.6rem;
284
-  background: #fff;
289
+  // padding: 0.26rem 0 0 0.6rem;
290
+  // background: #fff;
285
   .title {
291
   .title {
286
     font-size: 0.34rem;
292
     font-size: 0.34rem;
287
     font-weight: 600;
293
     font-weight: 600;
288
     color: $title-color;
294
     color: $title-color;
289
-    height: 0.8rem;
295
+    height:1rem;
290
     line-height: 0.8rem;
296
     line-height: 0.8rem;
291
     display: inline-block;
297
     display: inline-block;
292
   }
298
   }

+ 0 - 1
src/pages/main/PrintIndex.vue View File

2356
 .mainBox {
2356
 .mainBox {
2357
   height: 100%;
2357
   height: 100%;
2358
   font-size: 0.3rem;
2358
   font-size: 0.3rem;
2359
-  background: #fff;
2360
   .sideColumn {
2359
   .sideColumn {
2361
     float: left;
2360
     float: left;
2362
     width: 1.58rem;
2361
     width: 1.58rem;

+ 16 - 10
src/pages/main/WaitingArea.vue View File

165
       var zoneMap = {};
165
       var zoneMap = {};
166
       for (let index = 0; index < scheduals.length; index++) {
166
       for (let index = 0; index < scheduals.length; index++) {
167
         const schedual = scheduals[index];
167
         const schedual = scheduals[index];
168
-        if (zoneMap[schedual.device_zone.id] == null) {
169
-          zoneMap[schedual.device_zone.id] = schedual.device_zone;
168
+        if (zoneMap[schedual.device_number.zone.id] == null) {
169
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
170
         }
170
         }
171
       }
171
       }
172
 
172
 
186
       var schedualMap = {};
186
       var schedualMap = {};
187
       for (let index = 0; index < scheduals.length; index++) {
187
       for (let index = 0; index < scheduals.length; index++) {
188
         const schedual = scheduals[index];
188
         const schedual = scheduals[index];
189
-        if (schedualMap[schedual.device_zone.id] == null) {
190
-          schedualMap[schedual.device_zone.id] = [];
189
+        if (schedualMap[schedual.device_number.zone.id] == null) {
190
+          schedualMap[schedual.device_number.zone.id] = [];
191
         }
191
         }
192
-        schedualMap[schedual.device_zone.id].push(schedual);
193
-        if (zoneMap[schedual.device_zone.id] == null) {
194
-          zoneMap[schedual.device_zone.id] = schedual.device_zone;
192
+        schedualMap[schedual.device_number.zone.id].push(schedual);
193
+        if (zoneMap[schedual.device_number.zone.id] == null) {
194
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
195
         }
195
         }
196
       }
196
       }
197
 
197
 
226
 <style style="stylesheet/scss" lang="scss" scoped>
226
 <style style="stylesheet/scss" lang="scss" scoped>
227
 .screening {
227
 .screening {
228
   border-bottom: 1px #e5e5e5 solid;
228
   border-bottom: 1px #e5e5e5 solid;
229
+  position: fixed;
230
+  top: 63px;
231
+  right: 0;
232
+  z-index: 66;
233
+  left: 1.58rem;
234
+  background: #fff;
229
   ul {
235
   ul {
230
     @include display-flex;
236
     @include display-flex;
231
     @include align-items-center;
237
     @include align-items-center;
258
   }
264
   }
259
 }
265
 }
260
 .stateBox {
266
 .stateBox {
261
-  padding: 0.5rem 0 0 0.6rem;
267
+  // padding: 0.5rem 0 0 0.6rem;
262
   .title {
268
   .title {
263
     font-size: 0.34rem;
269
     font-size: 0.34rem;
264
     color: #34495e;
270
     color: #34495e;
265
     font-weight: 600;
271
     font-weight: 600;
266
-    height: 0.9rem;
267
-    line-height: 0.9rem;
272
+    height: 1rem;
273
+    line-height: 1rem;
268
     display: inline-block;
274
     display: inline-block;
269
   }
275
   }
270
 }
276
 }

+ 6 - 2
src/pages/main/dialysis/AdviceTable.vue View File

1
 <template>
1
 <template>
2
-  <div>
2
+  <div class="fixedTop">
3
     <div class="choice">
3
     <div class="choice">
4
       <ul>
4
       <ul>
5
         <li>
5
         <li>
1380
 </script>
1380
 </script>
1381
 
1381
 
1382
 <style style="stylesheet/scss" lang="scss"  scoped>
1382
 <style style="stylesheet/scss" lang="scss"  scoped>
1383
+
1383
 .choice {
1384
 .choice {
1384
   border-bottom: 1px #e5e5e5 solid;
1385
   border-bottom: 1px #e5e5e5 solid;
1385
   ul {
1386
   ul {
1391
     margin: 0 auto;
1392
     margin: 0 auto;
1392
     font-size: 0.32rem;
1393
     font-size: 0.32rem;
1393
     color: $pgh-color;
1394
     color: $pgh-color;
1394
-    padding: 0.3rem 0;
1395
     li {
1395
     li {
1396
       @include display-flex;
1396
       @include display-flex;
1397
       @include align-items-center;
1397
       @include align-items-center;
1398
       @include text-align;
1398
       @include text-align;
1399
       @include justify-content-between;
1399
       @include justify-content-between;
1400
+      padding: 0.3rem 0;
1401
+    
1400
       .iconfont {
1402
       .iconfont {
1401
         margin: 0 0.1rem;
1403
         margin: 0 0.1rem;
1402
       }
1404
       }
1519
     }
1521
     }
1520
   }
1522
   }
1521
 }
1523
 }
1524
+
1525
+
1522
 </style>
1526
 </style>
1523
 
1527
 

+ 32 - 30
src/pages/main/dialysis/CheckTab.vue View File

1
 <template>
1
 <template>
2
-  <div>
2
+  <div class="fixedTop">
3
     <div class="nav">
3
     <div class="nav">
4
       <ul style="width: 90%">
4
       <ul style="width: 90%">
5
         <li  v-for="(item,i) in inspectionDate" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i,item)" >{{item.project_name}}</li>
5
         <li  v-for="(item,i) in inspectionDate" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i,item)" >{{item.project_name}}</li>
55
 </script>
55
 </script>
56
 
56
 
57
 <style style="stylesheet/scss" lang="scss" scoped>
57
 <style style="stylesheet/scss" lang="scss" scoped>
58
-.nav {
59
-  border-bottom: 1px #e5e5e5 solid;
60
-  ul {
61
-    width: 60%;
62
-    margin: 0 auto;
63
-    @include box-sizing;
64
-    @include display-flex;
65
-    @include align-items-center;
66
-    @include text-align;
67
-    @include justify-content-between;
68
-    li {
69
-      font-size: 0.32rem;
70
-      float: left;
71
-      color: $pgh-color;
72
-      padding: 0.3rem 0;
73
-      cursor: pointer;
74
-    }
75
-    .active {
76
-      position: relative;
77
-      &::before {
78
-        width: 100%;
79
-        height: 2px;
80
-        color: $main-color;
81
-        position: absolute;
82
-        bottom: 0;
83
-        left: 0;
84
-        content: "";
85
-        background: $main-color;
58
+  .nav {
59
+    border-bottom: 1px #e5e5e5 solid;
60
+    background: #fff;
61
+    ul {
62
+      width: 60%;
63
+      margin: 0 auto;
64
+      @include box-sizing;
65
+      @include display-flex;
66
+      @include align-items-center;
67
+      @include text-align;
68
+      @include justify-content-between;
69
+      li {
70
+        font-size: 0.32rem;
71
+        float: left;
72
+        color: $pgh-color;
73
+        padding: 0.3rem 0;
74
+        cursor: pointer;
75
+      }
76
+      .active {
77
+        position: relative;
78
+        &::before {
79
+          width: 100%;
80
+          height: 2px;
81
+          color: $main-color;
82
+          position: absolute;
83
+          bottom: 0;
84
+          left: 0;
85
+          content: "";
86
+          background: $main-color;
87
+        }
86
       }
88
       }
87
     }
89
     }
88
   }
90
   }
89
-}
91
+
90
 </style>
92
 </style>
91
 
93
 

+ 14 - 1
src/pages/main/dialysis/DialysisTab.vue View File

1
 <template>
1
 <template>
2
-    <div>
2
+    <div class="fixedBox">
3
         <div class="nav">
3
         <div class="nav">
4
             <ul>
4
             <ul>
5
                 <li v-for="(item,i) in ['长期透析处方','透析记录','医嘱信息','排班信息','宣教信息']" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i)" >{{item}}</li> 
5
                 <li v-for="(item,i) in ['长期透析处方','透析记录','医嘱信息','排班信息','宣教信息']" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i)" >{{item}}</li> 
45
 </script>
45
 </script>
46
 
46
 
47
 <style style="stylesheet/scss" lang="scss" scoped>
47
 <style style="stylesheet/scss" lang="scss" scoped>
48
+.fixedBox{
49
+ padding-top:53px; 
50
+  background: #fff;
51
+  min-height: calc(100vh - 64px);
48
 .nav {
52
 .nav {
49
   border-bottom: 1px #e5e5e5 solid;
53
   border-bottom: 1px #e5e5e5 solid;
54
+    position: fixed;
55
+  top: 63px;
56
+  right: 0;
57
+  z-index: 66;
58
+  left: 1.58rem;
59
+  background: #fff;
60
+    background: #fff;
50
   ul {
61
   ul {
51
     width: 60%;
62
     width: 60%;
52
     margin: 0 auto;
63
     margin: 0 auto;
77
     }
88
     }
78
   }
89
   }
79
 }
90
 }
91
+}
92
+
80
 </style>
93
 </style>
81
 
94
 

+ 2 - 1
src/pages/main/dialysis/InspectionItemTable.vue View File

243
     margin: 0 auto;
243
     margin: 0 auto;
244
     font-size: 0.28rem;
244
     font-size: 0.28rem;
245
     color: #7b8a97;
245
     color: #7b8a97;
246
-    padding: 0.16rem 0;
247
     li {
246
     li {
248
       @include display-flex;
247
       @include display-flex;
249
       @include align-items-center;
248
       @include align-items-center;
250
       @include text-align;
249
       @include text-align;
251
       @include justify-content-between;
250
       @include justify-content-between;
251
+    padding: 0.16rem 0;
252
+      
252
       .iconfont {
253
       .iconfont {
253
         margin: 0 0.1rem;
254
         margin: 0 0.1rem;
254
       }
255
       }

+ 2 - 1
src/pages/main/dialysis/MissionTable.vue View File

197
     margin: 0 auto;
197
     margin: 0 auto;
198
     font-size: 0.32rem;
198
     font-size: 0.32rem;
199
     color: $pgh-color;
199
     color: $pgh-color;
200
-    padding: 0.3rem 0;
201
     li {
200
     li {
202
       @include display-flex;
201
       @include display-flex;
203
       @include align-items-center;
202
       @include align-items-center;
204
       @include text-align;
203
       @include text-align;
205
       @include justify-content-between;
204
       @include justify-content-between;
205
+    padding: 0.3rem 0;
206
+      
206
       .iconfont {
207
       .iconfont {
207
         margin: 0 0.1rem;
208
         margin: 0 0.1rem;
208
       }
209
       }

+ 9 - 13
src/pages/main/dialysis/RecordTable.vue View File

122
     }
122
     }
123
     var nowDate = year + "-" + month + "-" + day;
123
     var nowDate = year + "-" + month + "-" + day;
124
 
124
 
125
-    this.startTime = new Date(nowDate)
126
-
127
-
125
+    this.startTime = new Date(nowDate);
128
 
126
 
129
     this.modeOptions = this.$store.getters.treatment_mode;
127
     this.modeOptions = this.$store.getters.treatment_mode;
130
 
128
 
136
     // console.log(this.modeOptions);
134
     // console.log(this.modeOptions);
137
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
135
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
138
     this.queryParams.start_time = this.parseTime(
136
     this.queryParams.start_time = this.parseTime(
139
-      this.startTime .getTime() / 1000,
137
+      this.startTime.getTime() / 1000,
140
       "{y}-{m}-{d}"
138
       "{y}-{m}-{d}"
141
     );
139
     );
142
     this.queryParams.end_time = this.parseTime(
140
     this.queryParams.end_time = this.parseTime(
386
       this.queryParams.page = 1;
384
       this.queryParams.page = 1;
387
       this.queryParams.limit = 15;
385
       this.queryParams.limit = 15;
388
       this.getRecordList(this.queryParams);
386
       this.getRecordList(this.queryParams);
389
-    },jump:function (val) {
390
-      this.$emit("record",val);
391
-
392
-
387
+    },
388
+    jump: function(val) {
389
+      this.$emit("record", val);
393
 
390
 
394
       this.$router.push({
391
       this.$router.push({
395
         path: "/details",
392
         path: "/details",
396
         query: {
393
         query: {
397
           patient_id: val.patient_id,
394
           patient_id: val.patient_id,
398
-          date: val.dialysis_date,
395
+          date: val.dialysis_date
399
         }
396
         }
400
       });
397
       });
401
-
402
     }
398
     }
403
   },
399
   },
404
   components: {
400
   components: {
415
     @include align-items-center;
411
     @include align-items-center;
416
     @include text-align;
412
     @include text-align;
417
     @include justify-content-between;
413
     @include justify-content-between;
418
-    width:70%;
414
+    width: 70%;
419
     margin: 0 auto;
415
     margin: 0 auto;
420
     font-size: 0.32rem;
416
     font-size: 0.32rem;
421
     color: $pgh-color;
417
     color: $pgh-color;
422
-    padding: 0.3rem 0;
423
     li {
418
     li {
424
       @include display-flex;
419
       @include display-flex;
425
       @include align-items-center;
420
       @include align-items-center;
426
       @include text-align;
421
       @include text-align;
422
+      padding: 0.3rem 0;
427
       .iconfont {
423
       .iconfont {
428
         margin: 0 0.1rem;
424
         margin: 0 0.1rem;
429
       }
425
       }
430
-      .line{
426
+      .line {
431
         background: #a8b3ba;
427
         background: #a8b3ba;
432
         width: 0.2rem;
428
         width: 0.2rem;
433
         height: 1px;
429
         height: 1px;

+ 0 - 1
src/pages/main/index.vue View File

29
 .mainBox {
29
 .mainBox {
30
   height: 100%;
30
   height: 100%;
31
   font-size:0.3rem;
31
   font-size:0.3rem;
32
-  background: #fff;
33
   .sideColumn {
32
   .sideColumn {
34
     .column {
33
     .column {
35
       .head {
34
       .head {

+ 7 - 0
src/pages/main/records/CaseHistory.vue View File

65
 <style style="stylesheet/scss" lang="scss" scoped>
65
 <style style="stylesheet/scss" lang="scss" scoped>
66
 .nav {
66
 .nav {
67
   border-bottom: 1px #e5e5e5 solid;
67
   border-bottom: 1px #e5e5e5 solid;
68
+    position: fixed;
69
+  top: 63px;
70
+  right: 0;
71
+  z-index: 66;
72
+  left: 1.58rem;
73
+  background: #fff;
74
+    background: #fff;
68
   ul {
75
   ul {
69
     width: 60%;
76
     width: 60%;
70
     margin: 0 auto;
77
     margin: 0 auto;

+ 2 - 2
src/pages/main/records/RecordsTab.vue View File

336
   border-top: none;
336
   border-top: none;
337
 }
337
 }
338
 .data-bg {
338
 .data-bg {
339
-  background: #ebf1f7;
340
   width: 100%;
339
   width: 100%;
341
-  padding: 0.3rem 0;
340
+  padding-top:62px; 
341
+  min-height: calc(100vh - 130px);
342
   .data {
342
   .data {
343
     width: 11rem;
343
     width: 11rem;
344
     margin: 0 auto;
344
     margin: 0 auto;

+ 2 - 0
src/pages/main/today/TodayTab.vue View File

925
   position: relative;
925
   position: relative;
926
   .grid {
926
   .grid {
927
     padding: 0.1rem 0 0.25rem 0;
927
     padding: 0.1rem 0 0.25rem 0;
928
+    margin: 0.2rem 0.2rem 0 0.2rem;
929
+    background: #fff;
928
     .list {
930
     .list {
929
       ul {
931
       ul {
930
         @include display-flex;
932
         @include display-flex;

+ 1 - 0
src/pages/main/today/detailsInfo.vue View File

143
 <style rel="stylesheet/scss" lang="scss" scoped>
143
 <style rel="stylesheet/scss" lang="scss" scoped>
144
 .info {
144
 .info {
145
   background: $text-color;
145
   background: $text-color;
146
+  margin: 0 0.2rem;
146
   ul {
147
   ul {
147
     padding: 0.4rem 0.8rem;
148
     padding: 0.4rem 0.8rem;
148
     li {
149
     li {

+ 14 - 3
src/pages/monitoring/index.vue View File

25
             trigger="click">
25
             trigger="click">
26
             <li slot="reference">{{partitionName(partition)}}<span class="iconfont">&#xe74a;</span></li>
26
             <li slot="reference">{{partitionName(partition)}}<span class="iconfont">&#xe74a;</span></li>
27
             <div class="popover-demo-content">
27
             <div class="popover-demo-content">
28
-
29
               <ul >
28
               <ul >
30
                 <li v-for="item in partitionArr" :key="item.id" @click="itemClick(item.id)" :class="partition == item.id ? 'tick' : ''">{{item.name}}</li>
29
                 <li v-for="item in partitionArr" :key="item.id" @click="itemClick(item.id)" :class="partition == item.id ? 'tick' : ''">{{item.name}}</li>
31
               </ul>
30
               </ul>
35
             class="iconfont">&#xe74a;</span></li>
34
             class="iconfont">&#xe74a;</span></li>
36
         </ul>
35
         </ul>
37
       </div>
36
       </div>
38
-      <div class="blueBorder"></div>
39
       <van-list
37
       <van-list
40
         v-model="loading"
38
         v-model="loading"
41
         :finished="finished"
39
         :finished="finished"
42
         finished-text="没有更多了"
40
         finished-text="没有更多了"
43
         @load="onLoad"
41
         @load="onLoad"
44
       >
42
       >
43
+      <div class="blueBorder"></div>      
45
         <table class="table">
44
         <table class="table">
46
           <tr>
45
           <tr>
47
             <th width="8%">机号</th>
46
             <th width="8%">机号</th>
355
 }
354
 }
356
 .choice {
355
 .choice {
357
   border-bottom: 1px #e5e5e5 solid;
356
   border-bottom: 1px #e5e5e5 solid;
357
+  position: fixed;
358
+  top: 63px;
359
+  right: 0;
360
+  z-index: 66;
361
+  left: 1.58rem;
362
+  background: #fff;
358
   ul {
363
   ul {
359
     @include display-flex;
364
     @include display-flex;
360
     @include align-items-center;
365
     @include align-items-center;
364
     margin: 0 auto;
369
     margin: 0 auto;
365
     font-size: 0.32rem;
370
     font-size: 0.32rem;
366
     color: $pgh-color;
371
     color: $pgh-color;
367
-    padding: 0.3rem 0;
368
     li {
372
     li {
369
       @include display-flex;
373
       @include display-flex;
370
       @include align-items-center;
374
       @include align-items-center;
371
       @include text-align;
375
       @include text-align;
372
       @include justify-content-between;
376
       @include justify-content-between;
377
+      padding: 0.3rem 0;
378
+      
373
       .iconfont {
379
       .iconfont {
374
         margin: 0 0.1rem;
380
         margin: 0 0.1rem;
375
       }
381
       }
386
 .table {
392
 .table {
387
   width: 100%;
393
   width: 100%;
388
 }
394
 }
395
+.van-list{
396
+  padding-top:115px; 
397
+  background: #fff;
398
+  min-height: calc(100vh - 1px);
399
+}
389
 </style>
400
 </style>

+ 1 - 1
src/pages/personal/EditPersonal.vue View File

95
     @include display-flex;
95
     @include display-flex;
96
     @include justify-content-between;
96
     @include justify-content-between;
97
     @include text-align;
97
     @include text-align;
98
+    background: #fff;
98
     .GoBack {
99
     .GoBack {
99
       color: $main-color;
100
       color: $main-color;
100
       font-size: 0.36rem;
101
       font-size: 0.36rem;
108
   .information {
109
   .information {
109
     width: 100%;
110
     width: 100%;
110
     margin: 0 auto;
111
     margin: 0 auto;
111
-    background: #ebf1f7;
112
     .name {
112
     .name {
113
       background: #fff;
113
       background: #fff;
114
       width: 70%;
114
       width: 70%;

+ 1 - 1
src/pages/personal/ElectronicSignature.vue View File

385
     @include display-flex;
385
     @include display-flex;
386
     @include justify-content-between;
386
     @include justify-content-between;
387
     @include text-align;
387
     @include text-align;
388
+    background: #fff;
388
     .GoBack {
389
     .GoBack {
389
       color: $main-color;
390
       color: $main-color;
390
       font-size: 0.36rem;
391
       font-size: 0.36rem;
398
   .information {
399
   .information {
399
     width: 100%;
400
     width: 100%;
400
     margin: 0 auto;
401
     margin: 0 auto;
401
-    background: #ebf1f7;
402
     .imagename{
402
     .imagename{
403
         width: 600px;
403
         width: 600px;
404
         margin: 0 auto;
404
         margin: 0 auto;

+ 8 - 1
src/pages/personal/index.vue View File

122
     padding: 0.30rem 0;
122
     padding: 0.30rem 0;
123
     color: $title-color;
123
     color: $title-color;
124
     text-align: center;
124
     text-align: center;
125
+    position: fixed;
126
+    top: 0;
127
+    left: 1.58rem;
128
+    right: 0;
129
+    z-index: 1000;
130
+    background: #fff;
125
   }
131
   }
126
   .information {
132
   .information {
127
     width: 100%;
133
     width: 100%;
128
     margin: 0 auto;
134
     margin: 0 auto;
129
-    background: #ebf1f7;
135
+    padding-top:63px; 
136
+    min-height: calc(100vh - 2px);
130
     .name {
137
     .name {
131
       background: #fff;
138
       background: #fff;
132
       width: 70%;
139
       width: 70%;

+ 2 - 0
src/pages/waitingRoom/components/patientInfo.vue View File

365
   padding: 0.25rem 0.28rem;
365
   padding: 0.25rem 0.28rem;
366
   font-size: 14px;
366
   font-size: 14px;
367
   font-weight: 400;
367
   font-weight: 400;
368
+  margin: 0 0.2rem;
369
+  
368
   .dataTitle{
370
   .dataTitle{
369
         color: #409eff;
371
         color: #409eff;
370
         font-size: 16px;
372
         font-size: 16px;

+ 1 - 1
src/styles/reset.scss View File

30
 }
30
 }
31
 
31
 
32
 body {
32
 body {
33
-  background-color: #ebf1f7;
33
+  background-color: $base-color;
34
   color: $pgh-color;
34
   color: $pgh-color;
35
   font-family: "Microsoft YaHei";
35
   font-family: "Microsoft YaHei";
36
 }
36
 }

+ 39 - 7
src/styles/style.scss View File

1
 .body {
1
 .body {
2
-  background: $base-color;
2
+  // background: $base-color;
3
 }
3
 }
4
 
4
 
5
 #app {
5
 #app {
12
 }
12
 }
13
 
13
 
14
 .mainBox {
14
 .mainBox {
15
-  background: #fff;
16
   font-size: 0.3rem;
15
   font-size: 0.3rem;
17
 }
16
 }
18
 
17
 
41
 .blueBorder {
40
 .blueBorder {
42
   height: 0.2rem;
41
   height: 0.2rem;
43
   line-height: 0.2rem;
42
   line-height: 0.2rem;
44
-  background: #ebf1f7;
43
+  background: #f6f8f9;
45
 }
44
 }
46
 
45
 
47
 // 数据详情
46
 // 数据详情
48
 .plate-box {
47
 .plate-box {
49
   background: $text-color;
48
   background: $text-color;
50
   padding: 0 0 0.3rem 0;
49
   padding: 0 0 0.3rem 0;
50
+  margin:  0 0.2rem;
51
   .title {
51
   .title {
52
     border-bottom: 1px $border-color solid;
52
     border-bottom: 1px $border-color solid;
53
     line-height: 1rem;
53
     line-height: 1rem;
564
 }
564
 }
565
 
565
 
566
 .NoData {
566
 .NoData {
567
-  width: 200px;
567
+  width: 100%;
568
   text-align: center;
568
   text-align: center;
569
   background: #fff;
569
   background: #fff;
570
-  margin: 0 auto;
571
   padding:0.3rem 0; 
570
   padding:0.3rem 0; 
571
+  display:flex;
572
+  align-items: center;
573
+  justify-content: center;
574
+  text-align: center;
572
   img {
575
   img {
573
-    width: 100%;
576
+    width: 180px;
574
   }
577
   }
575
 }
578
 }
579
+.el-popper{
580
+  margin-top: 0!important;
581
+}
576
 
582
 
577
 .CheckBox,
583
 .CheckBox,
578
 .DialogContent,
584
 .DialogContent,
705
 .el-collapse-item__content{
711
 .el-collapse-item__content{
706
   height: 7.4rem!important;
712
   height: 7.4rem!important;
707
     overflow-y: auto!important;
713
     overflow-y: auto!important;
708
-}
714
+}
715
+
716
+// 顶部导航固定
717
+.top,
718
+.top_row{
719
+  position: fixed!important;
720
+    top: 0;
721
+    left: 1.58rem;
722
+    right: 0;
723
+    z-index: 1000;
724
+    background: #fff;
725
+}
726
+// .choice,
727
+// .screening{
728
+//   position: fixed;
729
+//   top: 63px;
730
+//   right: 0;
731
+//   z-index: 66;
732
+//   left: 1.58rem;
733
+//   background: #fff;
734
+// }
735
+.stateBox{
736
+  padding-top:115px; 
737
+  background: #fff;
738
+  min-height: calc(100vh - 2px);
739
+  padding-left: 0.45rem;
740
+}

+ 1 - 1
src/styles/variables.scss View File

1
 $main-color:#409eff;
1
 $main-color:#409eff;
2
-$base-color:#ebf1f7;
2
+$base-color:#f6f8f9;
3
 $text-color:#fff;
3
 $text-color:#fff;
4
 $white-bg:#fff;
4
 $white-bg:#fff;
5
 $border-color:#e5e5e5;
5
 $border-color:#e5e5e5;