柳香萍 преди 5 години
родител
ревизия
36af79f265

+ 31 - 18
src/pages/advice/DialysisAdviceTable.vue Целия файл

@@ -45,8 +45,8 @@
45 45
       </ul>
46 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 50
      <table class="table">
51 51
       <tr>
52 52
         <th width="50px">机号</th>
@@ -213,7 +213,7 @@ export default {
213 213
   },
214 214
   methods: {
215 215
     clickfunction: function(val) {
216
-      console.log(val);
216
+      // console.log(val);
217 217
       this.$router.push({
218 218
         path: "/details",
219 219
         query: {
@@ -231,19 +231,22 @@ export default {
231 231
     openPicker() {
232 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 245
     getName(val) {
246
+      console.log(this.admin_user)
244 247
 
245 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 250
           return this.admin_user[i].name;
248 251
         }
249 252
       }
@@ -262,7 +265,7 @@ export default {
262 265
       this.show_zone_selector = false;
263 266
     },
264 267
     parseTime: function(time, layout) {
265
-      console.log(time);
268
+      // console.log(time);
266 269
       if (time == 0) {
267 270
         return "";
268 271
       }
@@ -285,12 +288,12 @@ export default {
285 288
             if (schedule.doctor_advice.length == 0) {
286 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,6 +368,12 @@ export default {
365 368
 }
366 369
 .choice {
367 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 377
   ul {
369 378
     @include display-flex;
370 379
     @include align-items-center;
@@ -394,5 +403,9 @@ export default {
394 403
     }
395 404
   }
396 405
 }
397
-
406
+.DialysisAdvice{
407
+  padding-top:115px; 
408
+  background: #fff;
409
+  min-height: calc(100vh - 2px);
410
+}
398 411
 </style>

+ 83 - 66
src/pages/advice/NormalAdviceTable.vue Целия файл

@@ -45,8 +45,8 @@
45 45
       </ul>
46 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 50
       <table class="table">
51 51
         <tr>
52 52
           <th width="50px">机号</th>
@@ -129,7 +129,6 @@
129 129
   import SideBar from "@/pages/layout/SideBar";
130 130
   import { parseTime } from "@/utils";
131 131
   import { getSchedualDoctors } from "@/api/advice";
132
-
133 132
   export default {
134 133
     name: "DialysisAdviceTable",
135 134
     components: {
@@ -213,7 +212,7 @@
213 212
     },
214 213
     methods: {
215 214
       clickfunction: function(val) {
216
-        console.log(val);
215
+        // console.log(val);
217 216
         this.$router.push({
218 217
           path: "/details",
219 218
           query: {
@@ -230,17 +229,19 @@
230 229
       },
231 230
       openPicker() {
232 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 242
       },getName(val){
242 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 245
             return this.admin_user[i].name
245 246
           }
246 247
         }
@@ -281,12 +282,12 @@
281 282
               if (schedule.doctor_advice.length == 0) {
282 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,14 +316,14 @@
315 316
 </script>
316 317
 
317 318
 <style style="stylesheet/scss" lang="scss" scoped>
318
-  .top {
319
+.top {
319 320
   .hospital {
320
-  width: 2rem;
321
+    width: 2rem;
321 322
   }
322 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 328
   padding: 0.3rem 0.3rem;
328 329
   @include display-flex;
@@ -331,16 +332,16 @@
331 332
   @include justify-content-between;
332 333
   border-bottom: 1px #e5e5e5 solid;
333 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 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 345
   background: #ebf1f7;
345 346
   border-radius: 30px;
346 347
   padding: 0 0.3rem;
@@ -349,47 +350,63 @@
349 350
   color: #a8b3ba;
350 351
 
351 352
   .iconfont {
352
-  color: #a8b3ba;
353
-  font-size: 0.28rem;
353
+    color: #a8b3ba;
354
+    font-size: 0.28rem;
354 355
   }
355 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 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 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 412
 </style>

+ 0 - 1
src/pages/advice/index.vue Целия файл

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

+ 1 - 0
src/pages/main/DetailsPage.vue Целия файл

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

+ 15 - 9
src/pages/main/DialysisArea.vue Целия файл

@@ -140,7 +140,7 @@ export default {
140 140
           const schedule = originSchedules[s_i];
141 141
           if (
142 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 145
             if (
146 146
               timetype_selected == 0 ||
@@ -209,12 +209,12 @@ export default {
209 209
               if (schedual.dialysis_order == null) {
210 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,6 +260,12 @@ export default {
260 260
 <style style="stylesheet/scss" lang="scss" scoped>
261 261
 .screening {
262 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 269
   ul {
264 270
     @include display-flex;
265 271
     @include align-items-center;
@@ -280,13 +286,13 @@ export default {
280 286
   }
281 287
 }
282 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 291
   .title {
286 292
     font-size: 0.34rem;
287 293
     font-weight: 600;
288 294
     color: $title-color;
289
-    height: 0.8rem;
295
+    height:1rem;
290 296
     line-height: 0.8rem;
291 297
     display: inline-block;
292 298
   }

+ 0 - 1
src/pages/main/PrintIndex.vue Целия файл

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

+ 16 - 10
src/pages/main/WaitingArea.vue Целия файл

@@ -165,8 +165,8 @@ export default {
165 165
       var zoneMap = {};
166 166
       for (let index = 0; index < scheduals.length; index++) {
167 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,12 +186,12 @@ export default {
186 186
       var schedualMap = {};
187 187
       for (let index = 0; index < scheduals.length; index++) {
188 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,6 +226,12 @@ export default {
226 226
 <style style="stylesheet/scss" lang="scss" scoped>
227 227
 .screening {
228 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 235
   ul {
230 236
     @include display-flex;
231 237
     @include align-items-center;
@@ -258,13 +264,13 @@ export default {
258 264
   }
259 265
 }
260 266
 .stateBox {
261
-  padding: 0.5rem 0 0 0.6rem;
267
+  // padding: 0.5rem 0 0 0.6rem;
262 268
   .title {
263 269
     font-size: 0.34rem;
264 270
     color: #34495e;
265 271
     font-weight: 600;
266
-    height: 0.9rem;
267
-    line-height: 0.9rem;
272
+    height: 1rem;
273
+    line-height: 1rem;
268 274
     display: inline-block;
269 275
   }
270 276
 }

+ 6 - 2
src/pages/main/dialysis/AdviceTable.vue Целия файл

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

+ 32 - 30
src/pages/main/dialysis/CheckTab.vue Целия файл

@@ -1,5 +1,5 @@
1 1
 <template>
2
-  <div>
2
+  <div class="fixedTop">
3 3
     <div class="nav">
4 4
       <ul style="width: 90%">
5 5
         <li  v-for="(item,i) in inspectionDate" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i,item)" >{{item.project_name}}</li>
@@ -55,37 +55,39 @@ export default {
55 55
 </script>
56 56
 
57 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 92
 </style>
91 93
 

+ 14 - 1
src/pages/main/dialysis/DialysisTab.vue Целия файл

@@ -1,5 +1,5 @@
1 1
 <template>
2
-    <div>
2
+    <div class="fixedBox">
3 3
         <div class="nav">
4 4
             <ul>
5 5
                 <li v-for="(item,i) in ['长期透析处方','透析记录','医嘱信息','排班信息','宣教信息']" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i)" >{{item}}</li> 
@@ -45,8 +45,19 @@ export default {
45 45
 </script>
46 46
 
47 47
 <style style="stylesheet/scss" lang="scss" scoped>
48
+.fixedBox{
49
+ padding-top:53px; 
50
+  background: #fff;
51
+  min-height: calc(100vh - 64px);
48 52
 .nav {
49 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 61
   ul {
51 62
     width: 60%;
52 63
     margin: 0 auto;
@@ -77,5 +88,7 @@ export default {
77 88
     }
78 89
   }
79 90
 }
91
+}
92
+
80 93
 </style>
81 94
 

+ 2 - 1
src/pages/main/dialysis/InspectionItemTable.vue Целия файл

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

+ 2 - 1
src/pages/main/dialysis/MissionTable.vue Целия файл

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

+ 9 - 13
src/pages/main/dialysis/RecordTable.vue Целия файл

@@ -122,9 +122,7 @@ export default {
122 122
     }
123 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 127
     this.modeOptions = this.$store.getters.treatment_mode;
130 128
 
@@ -136,7 +134,7 @@ export default {
136 134
     // console.log(this.modeOptions);
137 135
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
138 136
     this.queryParams.start_time = this.parseTime(
139
-      this.startTime .getTime() / 1000,
137
+      this.startTime.getTime() / 1000,
140 138
       "{y}-{m}-{d}"
141 139
     );
142 140
     this.queryParams.end_time = this.parseTime(
@@ -386,19 +384,17 @@ export default {
386 384
       this.queryParams.page = 1;
387 385
       this.queryParams.limit = 15;
388 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 391
       this.$router.push({
395 392
         path: "/details",
396 393
         query: {
397 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 400
   components: {
@@ -415,19 +411,19 @@ export default {
415 411
     @include align-items-center;
416 412
     @include text-align;
417 413
     @include justify-content-between;
418
-    width:70%;
414
+    width: 70%;
419 415
     margin: 0 auto;
420 416
     font-size: 0.32rem;
421 417
     color: $pgh-color;
422
-    padding: 0.3rem 0;
423 418
     li {
424 419
       @include display-flex;
425 420
       @include align-items-center;
426 421
       @include text-align;
422
+      padding: 0.3rem 0;
427 423
       .iconfont {
428 424
         margin: 0 0.1rem;
429 425
       }
430
-      .line{
426
+      .line {
431 427
         background: #a8b3ba;
432 428
         width: 0.2rem;
433 429
         height: 1px;

+ 0 - 1
src/pages/main/index.vue Целия файл

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

+ 7 - 0
src/pages/main/records/CaseHistory.vue Целия файл

@@ -65,6 +65,13 @@ export default {
65 65
 <style style="stylesheet/scss" lang="scss" scoped>
66 66
 .nav {
67 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 75
   ul {
69 76
     width: 60%;
70 77
     margin: 0 auto;

+ 2 - 2
src/pages/main/records/RecordsTab.vue Целия файл

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

+ 2 - 0
src/pages/main/today/TodayTab.vue Целия файл

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

+ 1 - 0
src/pages/main/today/detailsInfo.vue Целия файл

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

+ 14 - 3
src/pages/monitoring/index.vue Целия файл

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

+ 1 - 1
src/pages/personal/EditPersonal.vue Целия файл

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

+ 1 - 1
src/pages/personal/ElectronicSignature.vue Целия файл

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

+ 8 - 1
src/pages/personal/index.vue Целия файл

@@ -122,11 +122,18 @@ export default {
122 122
     padding: 0.30rem 0;
123 123
     color: $title-color;
124 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 132
   .information {
127 133
     width: 100%;
128 134
     margin: 0 auto;
129
-    background: #ebf1f7;
135
+    padding-top:63px; 
136
+    min-height: calc(100vh - 2px);
130 137
     .name {
131 138
       background: #fff;
132 139
       width: 70%;

+ 2 - 0
src/pages/waitingRoom/components/patientInfo.vue Целия файл

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

+ 1 - 1
src/styles/reset.scss Целия файл

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

+ 39 - 7
src/styles/style.scss Целия файл

@@ -1,5 +1,5 @@
1 1
 .body {
2
-  background: $base-color;
2
+  // background: $base-color;
3 3
 }
4 4
 
5 5
 #app {
@@ -12,7 +12,6 @@
12 12
 }
13 13
 
14 14
 .mainBox {
15
-  background: #fff;
16 15
   font-size: 0.3rem;
17 16
 }
18 17
 
@@ -41,13 +40,14 @@
41 40
 .blueBorder {
42 41
   height: 0.2rem;
43 42
   line-height: 0.2rem;
44
-  background: #ebf1f7;
43
+  background: #f6f8f9;
45 44
 }
46 45
 
47 46
 // 数据详情
48 47
 .plate-box {
49 48
   background: $text-color;
50 49
   padding: 0 0 0.3rem 0;
50
+  margin:  0 0.2rem;
51 51
   .title {
52 52
     border-bottom: 1px $border-color solid;
53 53
     line-height: 1rem;
@@ -564,15 +564,21 @@
564 564
 }
565 565
 
566 566
 .NoData {
567
-  width: 200px;
567
+  width: 100%;
568 568
   text-align: center;
569 569
   background: #fff;
570
-  margin: 0 auto;
571 570
   padding:0.3rem 0; 
571
+  display:flex;
572
+  align-items: center;
573
+  justify-content: center;
574
+  text-align: center;
572 575
   img {
573
-    width: 100%;
576
+    width: 180px;
574 577
   }
575 578
 }
579
+.el-popper{
580
+  margin-top: 0!important;
581
+}
576 582
 
577 583
 .CheckBox,
578 584
 .DialogContent,
@@ -705,4 +711,30 @@
705 711
 .el-collapse-item__content{
706 712
   height: 7.4rem!important;
707 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 Целия файл

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