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

config/dev.env.js

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://api.xt.kuyicloud.com"',
+  BASE_API: '"http://localhost:9529"',
    //http://api.xt.test.sgjyun.com http://localhost:9529
   // BASE_API: '"http://localhost:9529"'
 })

config/prod.env.js

@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.kuyicloud.com"'
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

package-lock.json

@@ -6153,9 +6153,9 @@
       }
     },
     "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -8427,12 +8427,6 @@
       "integrity": "sha1-dRqnbBuWSwR+dtFPxyoJP8teLdA=",
       "dev": true
     },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
     "lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
@@ -9088,8 +9082,13 @@
     "nan": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
+<<<<<<< .mine
+      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
+      "optional": true
+=======
       "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
       "dev": true
+>>>>>>> .theirs
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -9327,9 +9326,15 @@
       }
     },
     "node-sass": {
+<<<<<<< .mine
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
+      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
+=======
       "version": "4.11.0",
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
       "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+>>>>>>> .theirs
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -9339,12 +9344,10 @@
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
         "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
+        "lodash": "^4.17.11",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
+        "nan": "^2.13.2",
         "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
@@ -9382,6 +9385,33 @@
             "which": "^1.2.9"
           }
         },
+<<<<<<< .mine
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "dev": true
+        },
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+          "dev": true
+        },
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -14411,13 +14441,13 @@
       "dev": true
     },
     "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
         "block-stream": "*",
-        "fstream": "^1.0.2",
+        "fstream": "^1.0.12",
         "inherits": "2"
       }
     },

package.json

@@ -74,7 +74,7 @@
     "less-loader": "^4.1.0",
     "nightwatch": "^0.9.12",
     "node-notifier": "^5.1.2",
-    "node-sass": "^4.11.0",
+    "node-sass": "^4.12.0",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "portfinder": "^1.0.13",

src/pages/advice/DialysisAdviceTable.vue

@@ -45,8 +45,8 @@
       </ul>
     </div>
 
-    <div class="blueBorder"></div>
-    <div style="width:100%;overflow:hildden;overflow-x:auto;">
+    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="DialysisAdvice">
+     <div class="blueBorder"></div>
      <table class="table">
       <tr>
         <th width="50px">机号</th>
@@ -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>
@@ -368,6 +366,12 @@ export default {
 }
 .choice {
   border-bottom: 1px #e5e5e5 solid;
+  position: fixed;
+  top: 63px;
+  right: 0;
+  z-index: 66;
+  left: 1.58rem;
+  background: #fff;
   ul {
     @include display-flex;
     @include align-items-center;
@@ -397,5 +401,9 @@ export default {
     }
   }
 }
-
+.DialysisAdvice{
+  padding-top:115px; 
+  background: #fff;
+  min-height: calc(100vh - 2px);
+}
 </style>

src/pages/advice/NormalAdviceTable.vue

@@ -45,8 +45,8 @@
       </ul>
     </div>
 
-    <div class="blueBorder"></div>
-    <div style="width:100%;overflow:hildden;overflow-x:auto;">
+    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="NormalAdvice">
+      <div class="blueBorder"></div>      
       <table class="table">
         <tr>
           <th width="50px">机号</th>
@@ -109,9 +109,10 @@
           </template>
         </template>
       </table>
+      <div class="NoData" v-show="zones.length  <= 1"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
+      
     </div>
     <!--<div class="NoData" v-show="zones.length <= 1"><img src="@/assets/login/data.jpg" alt=""></div>-->
-    <div class="NoData" v-show="zones.length  <= 1"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
 
     <mt-datetime-picker
       v-model="selected_date"
@@ -129,7 +130,6 @@
   import SideBar from "@/pages/layout/SideBar";
   import { parseTime } from "@/utils";
   import { getSchedualDoctors } from "@/api/advice";
-
   export default {
     name: "DialysisAdviceTable",
     components: {
@@ -317,14 +317,14 @@
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-  .top {
+.top {
   .hospital {
-  width: 2rem;
+    width: 2rem;
   }
   .TopTitle {
-  font-size: 0.36rem;
-  color: $title-color;
-  font-weight: normal;
+    font-size: 0.36rem;
+    color: $title-color;
+    font-weight: normal;
   }
   padding: 0.3rem 0.3rem;
   @include display-flex;
@@ -333,16 +333,16 @@
   @include justify-content-between;
   border-bottom: 1px #e5e5e5 solid;
   .title {
-  font-size: 0.3rem;
-  font-weight: bold;
-  color: $pgh-color;
+    font-size: 0.3rem;
+    font-weight: bold;
+    color: $pgh-color;
   }
   .iconfont {
-  font-size: 0.4rem;
-  color: #a8b3ba;
-  }
+    font-size: 0.4rem;
+    color: #a8b3ba;
   }
-  .search {
+}
+.search {
   background: #ebf1f7;
   border-radius: 30px;
   padding: 0 0.3rem;
@@ -351,47 +351,58 @@
   color: #a8b3ba;
 
   .iconfont {
-  color: #a8b3ba;
-  font-size: 0.28rem;
+    color: #a8b3ba;
+    font-size: 0.28rem;
   }
   .searchInput {
-  font-size: 0.28rem;
-  border: none;
-  outline: none;
-  background: #ebf1f7;
-  }
+    font-size: 0.28rem;
+    border: none;
+    outline: none;
+    background: #ebf1f7;
   }
-  .choice {
+}
+.choice {
   border-bottom: 1px #e5e5e5 solid;
+   position: fixed;
+    top: 63px;
+    right: 0;
+    z-index: 66;
+    left: 1.58rem;
+    background: #fff;
   ul {
-  @include display-flex;
-  @include align-items-center;
-  @include text-align;
-  @include justify-content-between;
-  width: 70%;
-  margin: 0 auto;
-  font-size: 0.32rem;
-  color: $pgh-color;
-  li {
-  @include display-flex;
-  @include align-items-center;
-  @include text-align;
-  @include justify-content-between;
-  padding: 0.3rem 0;
-  font-size: 0.32rem;
-  .iconfont {
-  margin: 0 0.1rem;
-  }
-  .line {
-  background: #a8b3ba;
-  width: 0.2rem;
-  height: 1px;
-  margin: 0 0.2rem;
-  display: inline-block;
-  }
-  }
-  }
-  }
-  .table {
+    @include display-flex;
+    @include align-items-center;
+    @include text-align;
+    @include justify-content-between;
+    width: 70%;
+    margin: 0 auto;
+    font-size: 0.32rem;
+    color: $pgh-color;
+    li {
+      @include display-flex;
+      @include align-items-center;
+      @include text-align;
+      @include justify-content-between;
+      padding: 0.3rem 0;
+      font-size: 0.32rem;
+      .iconfont {
+        margin: 0 0.1rem;
+      }
+      .line {
+        background: #a8b3ba;
+        width: 0.2rem;
+        height: 1px;
+        margin: 0 0.2rem;
+        display: inline-block;
+      }
+    }
   }
+}
+.table {
+}
+.NormalAdvice{
+  padding-top:115px; 
+  background: #fff;
+  min-height: calc(100vh - 2px);
+}
 </style>

src/pages/advice/index.vue

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

src/pages/main/DetailsPage.vue

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

src/pages/main/DialysisArea.vue

@@ -260,6 +260,12 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .screening {
   border-bottom: 1px #e5e5e5 solid;
+  position: fixed;
+    top: 63px;
+    right: 0;
+    z-index: 66;
+    left: 1.58rem;
+    background: #fff;
   ul {
     @include display-flex;
     @include align-items-center;
@@ -280,13 +286,13 @@ export default {
   }
 }
 .stateBox {
-  padding: 0.26rem 0 0 0.6rem;
-  background: #fff;
+  // padding: 0.26rem 0 0 0.6rem;
+  // background: #fff;
   .title {
     font-size: 0.34rem;
     font-weight: 600;
     color: $title-color;
-    height: 0.8rem;
+    height:1rem;
     line-height: 0.8rem;
     display: inline-block;
   }

src/pages/main/Print.vue

@@ -2461,4 +2461,4 @@
   .mainContent {
   margin: 0 0 0 1.58rem;
   }
-</style>
+</style>

src/pages/main/PrintIndex.vue

@@ -659,7 +659,7 @@
                         <label for="PredialysisEvaluation_catheter_bend_6" class="radio-lebel-box">
                                                         <span class="radio-inner">
                                                             <span class="radio-fang"
-                                                                  :class="{'is-checked-radio':predialysis.catheter_bend!=1?true:false}"></span>
+                                                                  :class="{'is-checked-radio':predialysis.catheter_bend == 2?true:false}"></span>
                                                             <input vt-model="predialysis.catheter_bend"
                                                                    id="PredialysisEvaluation_catheter_bend_6"
                                                                    name="catheter_bend" type="radio" class="radio-no"
@@ -1188,7 +1188,7 @@
                       <label for="afterdialysis_puncture_point_oozing_blood_2" class="radio-lebel-box">
                                                     <span class="radio-inner">
                                                         <span class="radio-fang"
-                                                              :class="{'is-checked-radio':afterdialysis.puncture_point_oozing_blood!=1?true:false}"></span>
+                                                              :class="{'is-checked-radio':afterdialysis.puncture_point_oozing_blood==2?true:false}"></span>
                                                         <input vt-model="afterdialysis.puncture_point_oozing_blood"
                                                                id="afterdialysis_puncture_point_oozing_blood_2"
                                                                name="afterdialysis_puncture_point_oozing_blood"
@@ -1215,7 +1215,7 @@
                       <label for="afterdialysis_puncture_point_haematoma_2" class="radio-lebel-box">
                                                     <span class="radio-inner">
                                                         <span class="radio-fang"
-                                                              :class="{'is-checked-radio':afterdialysis.puncture_point_haematoma!=1?true:false}"></span>
+                                                              :class="{'is-checked-radio':afterdialysis.puncture_point_haematoma==2?true:false}"></span>
                                                         <input vt-model="afterdialysis.puncture_point_haematoma"
                                                                id="afterdialysis_puncture_point_haematoma_2"
                                                                name="afterdialysis_puncture_point_haematoma"
@@ -2357,7 +2357,6 @@ body {
 .mainBox {
   height: 100%;
   font-size: 0.3rem;
-  background: #fff;
   .sideColumn {
     float: left;
     width: 1.58rem;

src/pages/main/WaitingArea.vue

@@ -226,6 +226,12 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .screening {
   border-bottom: 1px #e5e5e5 solid;
+  position: fixed;
+  top: 63px;
+  right: 0;
+  z-index: 66;
+  left: 1.58rem;
+  background: #fff;
   ul {
     @include display-flex;
     @include align-items-center;
@@ -258,13 +264,13 @@ export default {
   }
 }
 .stateBox {
-  padding: 0.5rem 0 0 0.6rem;
+  // padding: 0.5rem 0 0 0.6rem;
   .title {
     font-size: 0.34rem;
     color: #34495e;
     font-weight: 600;
-    height: 0.9rem;
-    line-height: 0.9rem;
+    height: 1rem;
+    line-height: 1rem;
     display: inline-block;
   }
 }

src/pages/main/add_urgent_schedule.vue

@@ -339,10 +339,10 @@ export default {
     .navigation {
         padding: 0.3rem 0.36rem;
         border-bottom: 1px #e5e5e5 solid;
-        // position: fixed;
-        // top: 0;
-        // left:1.58rem;
-        // right: 0;
+        position: fixed;
+        top: 0;
+        left:1.58rem;
+        right: 0;
         z-index: 100;
         background: #fff;
         .goBack {
@@ -362,7 +362,9 @@ export default {
     }
 
     .form {
-        padding: 10px 10px;
+        background: #fff;
+        min-height: calc(100vh - 2px);
+        padding-top:55px; 
         .row {
             padding: 5px 0;
             .title {

src/pages/main/dialog/PrescriptionDialog.vue

@@ -199,8 +199,8 @@
         <!--</div>-->
         <div class="PrescSubmit">
           <button v-if="isShowSign"  class="tj" @click="sign()">医生签名</button>
-          <button class="tjcq" @click="commitSolutionInfo">提交并设为长期处方</button>
-          <button class="tj" @click="commitInfo">提交</button>
+          <button class="tjcq" @click="commitSolutionInfo">保存并设为长期处方</button>
+          <button class="tj" @click="commitInfo">保存</button>
         </div>
       </div>
     </div>

src/pages/main/dialysis/AdviceTable.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div class="choice">
+  <div class="fixedTop">
+    <div class="choice" >
       <ul>
         <li>
           日期查询：
@@ -65,7 +65,7 @@
         </li>
       </ul>
     </div>
-    <div style="width:100%;overflow:hildden;overflow-x:auto;">
+    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="AdviceTable">
       <table class="table" style>
         <tr>
           <!-- <th width="150px">序号</th> -->
@@ -1351,17 +1351,19 @@ export default {
     this.patient_id = this.$route.query.patient_id;
 
     var date = new Date();
-    var year = date.getFullYear();
-    var month = date.getMonth();
-    var day = date.getDate();
-    if (month < 10) {
-      month = "0" + month;
-    }
-    if (day < 10) {
-      day = "0" + day;
-    }
-    var nowDate = year + "-" + month + "-" + day;
-    this.start_time = new Date(nowDate);
+    date.setMonth(date.getMonth() - 1);
+
+    // var year = date.getFullYear();
+    // var month = date.getMonth();
+    // var day = date.getDate();
+    // if (month < 10) {
+    //   month = "0" + month;
+    // }
+    // if (day < 10) {
+    //   day = "0" + day;
+    // }
+    // var nowDate = year + "-" + month + "-" + day;
+    this.start_time = date;
 
     this.startSearchTimeShow = parseTime(
       this.start_time.getTime(),
@@ -1383,8 +1385,13 @@ export default {
 </script>
 
 <style style="stylesheet/scss" lang="scss"  scoped>
+.fixedTop{
+  padding-top:52px; 
+  background: #fff;
+  min-height: calc(100vh - 200px);
 .choice {
   border-bottom: 1px #e5e5e5 solid;
+  
   ul {
     @include display-flex;
     @include align-items-center;
@@ -1394,12 +1401,13 @@ export default {
     margin: 0 auto;
     font-size: 0.32rem;
     color: $pgh-color;
-    padding: 0.3rem 0;
     li {
       @include display-flex;
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
+      padding: 0.3rem 0;
+    
       .iconfont {
         margin: 0 0.1rem;
       }
@@ -1417,7 +1425,7 @@ export default {
   width: 100%;
   margin: 0 auto;
   padding: 0.24rem 0;
-  background: #ebf1f7;
+  background: #f6f8f9;
   ul {
     width: 50%;
     background: #fff;
@@ -1522,5 +1530,12 @@ export default {
     }
   }
 }
+.AdviceTable{
+  padding-top:0; 
+  background: #fff;
+  min-height: calc(100vh - 180px);
+}
+}
+
 </style>
 

src/pages/main/dialysis/CheckTab.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="fixedTop">
     <div class="nav">
       <ul style="width: 90%">
         <li  v-for="(item,i) in inspectionDate" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i,item)" >{{item.project_name}}</li>
@@ -55,37 +55,45 @@ export default {
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.nav {
-  border-bottom: 1px #e5e5e5 solid;
-  ul {
-    width: 60%;
-    margin: 0 auto;
-    @include box-sizing;
-    @include display-flex;
-    @include align-items-center;
-    @include text-align;
-    @include justify-content-between;
-    li {
-      font-size: 0.32rem;
-      float: left;
-      color: $pgh-color;
-      padding: 0.3rem 0;
-      cursor: pointer;
-    }
-    .active {
-      position: relative;
-      &::before {
-        width: 100%;
-        height: 2px;
-        color: $main-color;
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        content: "";
-        background: $main-color;
+  .nav {
+    border-bottom: 1px #e5e5e5 solid;
+    background: #fff;
+     position: fixed;
+    top: 115px;
+    right: 0;
+    z-index: 66;
+    left: 1.58rem;
+    background: #fff;
+    ul {
+      width: 60%;
+      margin: 0 auto;
+      @include box-sizing;
+      @include display-flex;
+      @include align-items-center;
+      @include text-align;
+      @include justify-content-between;
+      li {
+        font-size: 0.32rem;
+        float: left;
+        color: $pgh-color;
+        padding: 0.3rem 0;
+        cursor: pointer;
+      }
+      .active {
+        position: relative;
+        &::before {
+          width: 100%;
+          height: 2px;
+          color: $main-color;
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          content: "";
+          background: $main-color;
+        }
       }
     }
   }
-}
+
 </style>
 

src/pages/main/dialysis/DialysisTab.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="fixedBox">
         <div class="nav">
             <ul>
                 <li v-for="(item,i) in ['长期透析处方','透析记录','排班信息','宣教信息']" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i)" >{{item}}</li>
@@ -45,8 +45,19 @@ export default {
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
+.fixedBox{
+ padding-top:53px; 
+  background: #fff;
+  min-height: calc(100vh - 64px);
 .nav {
   border-bottom: 1px #e5e5e5 solid;
+    position: fixed;
+  top: 63px;
+  right: 0;
+  z-index: 66;
+  left: 1.58rem;
+  background: #fff;
+    background: #fff;
   ul {
     width: 60%;
     margin: 0 auto;
@@ -77,5 +88,7 @@ export default {
     }
   }
 }
+}
+
 </style>
 

src/pages/main/dialysis/InspectionItemTable.vue

@@ -8,7 +8,6 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-
       <table class="table">
         <tr>
           <th width="20%">检查项目</th>
@@ -41,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>
@@ -243,12 +242,13 @@ export default {
     margin: 0 auto;
     font-size: 0.28rem;
     color: #7b8a97;
-    padding: 0.16rem 0;
     li {
       @include display-flex;
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
+    padding: 0.16rem 0;
+      
       .iconfont {
         margin: 0 0.1rem;
       }
@@ -283,7 +283,6 @@ export default {
       font-weight: normal;
     }
     td {
-      background: #fafafa;
       border: none;
       span {
         background: #ff7979;
@@ -299,5 +298,10 @@ export default {
     }
   }
 }
+.van-list{
+  background: #fff;
+  min-height: calc(100vh - 178px);
+  margin-top: 105px; 
+}
 </style>
 

src/pages/main/dialysis/LongTable.vue

@@ -622,7 +622,7 @@ export default {
     @include justify-content-center;
     li {
       @include flex;
-      border-right: 0.01rem $border-color solid;
+      border-right: 2px #fff solid;
       font-size: 0.3rem;
       height: 0.88rem;
       line-height: 0.88rem;
@@ -647,8 +647,12 @@ export default {
       @include justify-content-center;
       span {
         @include flex;
-        border-right: 0.01rem $border-color solid;
-        border-bottom: 0.01rem $border-color solid;
+        border-right: 2px #fff solid;
+        border-bottom: 2px #fff solid;
+        background: #ecf5ff;
+        display: inline-block;
+        height: 0.88rem;
+        line-height: 0.88rem;
         &:last-child {
           color: $main-color;
         }

src/pages/main/dialysis/MissionTable.vue

@@ -197,12 +197,13 @@ export default {
     margin: 0 auto;
     font-size: 0.32rem;
     color: $pgh-color;
-    padding: 0.3rem 0;
     li {
       @include display-flex;
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
+    padding: 0.3rem 0;
+      
       .iconfont {
         margin: 0 0.1rem;
       }
@@ -226,7 +227,7 @@ export default {
     @include text-align;
     @include justify-content-center;
     li {
-      border-right: 0.01rem $border-color solid;
+       border-right: 2px #fff solid;
       font-size: 0.3rem;
       height: 0.88rem;
       line-height: 0.88rem;
@@ -237,7 +238,7 @@ export default {
   }
 }
 .tableDate {
-  background: $text-color;
+  background: #ecf5ff;
   color: $pgh-color;
   @include box-sizing;
   ul {
@@ -249,10 +250,15 @@ export default {
       font-size: 0.3rem;
       padding:0.16rem 0;
       line-height: 0.5rem;
+      border-right: 2px #fff solid;
       span {
         @include flex;
-        border-right: 0.01rem $border-color solid;
-        border-bottom: 0.01rem $border-color solid;
+        border-right: 2px #fff solid;
+        border-bottom: 2px #fff solid;
+        background: #ecf5ff;
+        display: inline-block;
+        height: 0.88rem;
+        line-height: 0.88rem;
         .iconfont {
           color: $main-color;
           font-size: 0.3rem;

src/pages/main/dialysis/RecordTable.vue

@@ -39,7 +39,7 @@
         </ul>
       </div>
       <div class="blueBorder"></div>
-      <div style="width:100%;overflow:hildden;overflow-x:auto;">
+      <div style="width:100%;overflow:hildden;overflow-x:auto;" class="RecordTable">
         <table class="table" style="">
           <tr>
             <th width="124px">透析日期</th>
@@ -122,9 +122,7 @@ export default {
     }
     var nowDate = year + "-" + month + "-" + day;
 
-    this.startTime = new Date(nowDate)
-
-
+    this.startTime = new Date(nowDate);
 
     this.modeOptions = this.$store.getters.treatment_mode;
 
@@ -136,7 +134,7 @@ export default {
     // console.log(this.modeOptions);
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
     this.queryParams.start_time = this.parseTime(
-      this.startTime .getTime() / 1000,
+      this.startTime.getTime() / 1000,
       "{y}-{m}-{d}"
     );
     this.queryParams.end_time = this.parseTime(
@@ -389,19 +387,17 @@ export default {
       this.queryParams.page = 1;
       this.queryParams.limit = 15;
       this.getRecordList(this.queryParams);
-    },jump:function (val) {
-      this.$emit("record",val);
-
-
+    },
+    jump: function(val) {
+      this.$emit("record", val);
 
       this.$router.push({
         path: "/details",
         query: {
           patient_id: val.patient_id,
-          date: val.dialysis_date,
+          date: val.dialysis_date
         }
       });
-
     }
   },
   components: {
@@ -418,19 +414,19 @@ export default {
     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width:70%;
+    width: 70%;
     margin: 0 auto;
     font-size: 0.32rem;
     color: $pgh-color;
-    padding: 0.3rem 0;
     li {
       @include display-flex;
       @include align-items-center;
       @include text-align;
+      padding: 0.3rem 0;
       .iconfont {
         margin: 0 0.1rem;
       }
-      .line{
+      .line {
         background: #a8b3ba;
         width: 0.2rem;
         height: 1px;
@@ -440,5 +436,10 @@ export default {
     }
   }
 }
+.RecordTable{
+  padding-top:0; 
+  background: #fff;
+  min-height: calc(100vh - 180px);
+}
 </style>
 

src/pages/main/dialysis/SchedulTable.vue

@@ -128,7 +128,7 @@ export default {
     @include justify-content-center;
     li {
       @include flex;
-      border-right: 0.01rem $border-color solid;
+      border-right: 2px #fff solid;
       font-size: 0.3rem;
       height: 0.88rem;
       line-height: 0.88rem;
@@ -153,8 +153,12 @@ export default {
       @include justify-content-center;
       span {
         @include flex;
-        border-right: 0.01rem $border-color solid;
-        border-bottom: 0.01rem $border-color solid;
+        border-right: 2px #fff solid;
+        border-bottom: 2px #fff solid;
+        background: #ecf5ff;
+        display: inline-block;
+        height: 0.88rem;
+        line-height: 0.88rem;
         .iconfont {
           color: $main-color;
           font-size: 0.3rem;

src/pages/main/index.vue

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

src/pages/main/records/CaseHistory.vue

@@ -65,6 +65,13 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .nav {
   border-bottom: 1px #e5e5e5 solid;
+    position: fixed;
+  top: 63px;
+  right: 0;
+  z-index: 66;
+  left: 1.58rem;
+  background: #fff;
+    background: #fff;
   ul {
     width: 60%;
     margin: 0 auto;

src/pages/main/records/RecordsTab.vue

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

src/pages/main/today/TodayTab.vue

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

src/pages/main/today/detailsInfo.vue

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

src/pages/main/today/pastData.vue

@@ -91,7 +91,7 @@ export default {
     @include justify-content-center;
     li {
       @include flex;
-      border-right: 0.01rem $border-color solid;
+      border-right: 2px #fff solid;
       font-size: 0.3rem;
       height: 0.88rem;
       line-height: 0.88rem;
@@ -116,8 +116,12 @@ export default {
       @include justify-content-center;
       span {
         @include flex;
-        border-right: 0.01rem $border-color solid;
-        border-bottom: 0.01rem $border-color solid;
+        border-right: 2px #fff solid;
+        border-bottom: 2px #fff solid;
+        background: #ecf5ff;
+        display: inline-block;
+        height: 0.88rem;
+        line-height: 0.88rem;
       }
     }
     &:last-child {

src/pages/monitoring/index.vue

@@ -25,7 +25,6 @@
             trigger="click">
             <li slot="reference">{{partitionName(partition)}}<span class="iconfont">&#xe74a;</span></li>
             <div class="popover-demo-content">
-
               <ul >
                 <li v-for="item in partitionArr" :key="item.id" @click="itemClick(item.id)" :class="partition == item.id ? 'tick' : ''">{{item.name}}</li>
               </ul>
@@ -35,14 +34,14 @@
             class="iconfont">&#xe74a;</span></li>
         </ul>
       </div>
-      <div class="blueBorder"></div>
       <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
         @load="onLoad"
       >
-        <table class="table">
+      <div class="blueBorder"></div>      
+        <table class="table"  >
           <tr>
             <th width="8%">机号</th>
             <th width="10%">姓名</th>
@@ -51,7 +50,7 @@
             <th width="10%">透析模式</th>
             <th width="9%">脱水量</th>
             <th width="14%">体重(透前/透后)</th>
-            <th width="27%">监控预警</th>
+            <th width="27%">监控预警(血压/心率)</th>
           </tr>
         </table>
         <table class="table" v-for="(items,index) in dialysis_scheduals" :key="index">
@@ -67,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>
@@ -77,10 +76,10 @@
             </td>
             <td width="27%">
               <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 1">低压</span>
-              <span style="background-color: dodgerblue" v-if="monitorBloodPressureStatus(item.monitoring_record) == 2">正常</span>
+              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 2">正常</span>
               <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 3">高压</span>
               <span v-if="monitorRateStatus(item.monitoring_record) == 1">心率过缓</span>
-              <span style="background-color: dodgerblue" v-if="monitorRateStatus(item.monitoring_record) == 2">正常</span>
+              <span v-if="monitorRateStatus(item.monitoring_record) == 2">正常</span>
               <span v-if="monitorRateStatus(item.monitoring_record) == 3">心率过高</span>
             </td>
           </tr>
@@ -238,28 +237,32 @@ export default {
     },
     monitorBloodPressureStatus: function(val) {
       let status = 0;
-
       if (val.length == 0) {
         return 0;
       }
       for (let i = 0; i < val.length; i++) {
         //舒张压（低压）(diastolic_blood_pressure)    收缩压(高压)(systolic_blood_pressure)
-        if (
-          val[i].diastolic_blood_pressure < 60 ||
-          val[i].systolic_blood_pressure < 90
-        ) {
+        if (val[i].systolic_blood_pressure >= 140 || val[i].diastolic_blood_pressure >= 90) {
+          status = 3;  //高压
+        } else if (val[i].diastolic_blood_pressure < 60 || val[i].systolic_blood_pressure < 90) {
           status = 1; //低压
-        } else if (
-          val[i].diastolic_blood_pressure >= 60 ||
-          val[i].systolic_blood_pressure < 140
-        ) {
+        } else if (val[i].diastolic_blood_pressure >= 60 || val[i].systolic_blood_pressure < 140) {
           status = 2; //正常
-        } else if (
-          val[i].diastolic_blood_pressure >= 90 ||
-          val[i].systolic_blood_pressure >= 140
-        ) {
-          status = 3; //高压
         }
+
+        // if ( val[i].diastolic_blood_pressure < 60 | val[i].systolic_blood_pressure < 90 ) {
+        //   status = 1; //低压
+        // } else if (
+        //   val[i].diastolic_blood_pressure >= 60 ||
+        //   val[i].systolic_blood_pressure < 140
+        // ) {
+        //   status = 2; //正常
+        // } else if (
+        //   val[i].diastolic_blood_pressure >= 90 ||
+        //   val[i].systolic_blood_pressure >= 140
+        // ) {
+        //   status = 3; //高压
+        // }
       }
 
       return status;
@@ -355,6 +358,12 @@ export default {
 }
 .choice {
   border-bottom: 1px #e5e5e5 solid;
+  position: fixed;
+  top: 63px;
+  right: 0;
+  z-index: 66;
+  left: 1.58rem;
+  background: #fff;
   ul {
     @include display-flex;
     @include align-items-center;
@@ -364,12 +373,13 @@ export default {
     margin: 0 auto;
     font-size: 0.32rem;
     color: $pgh-color;
-    padding: 0.3rem 0;
     li {
       @include display-flex;
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
+      padding: 0.3rem 0;
+      
       .iconfont {
         margin: 0 0.1rem;
       }
@@ -386,4 +396,9 @@ export default {
 .table {
   width: 100%;
 }
+.van-list{
+  padding-top:115px; 
+  background: #fff;
+  min-height: calc(100vh - 1px);
+}
 </style>

src/pages/personal/EditPersonal.vue

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

src/pages/personal/ElectronicSignature.vue

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

src/pages/personal/index.vue

@@ -122,11 +122,18 @@ export default {
     padding: 0.30rem 0;
     color: $title-color;
     text-align: center;
+    position: fixed;
+    top: 0;
+    left: 1.58rem;
+    right: 0;
+    z-index: 1000;
+    background: #fff;
   }
   .information {
     width: 100%;
     margin: 0 auto;
-    background: #ebf1f7;
+    padding-top:63px; 
+    min-height: calc(100vh - 2px);
     .name {
       background: #fff;
       width: 70%;

src/pages/waitingRoom/components/pastData.vue

@@ -91,7 +91,7 @@ export default {
     @include justify-content-center;
     li {
       @include flex;
-      border-right: 0.01rem $border-color solid;
+      border-right: 2px #fff solid;
       font-size: 0.3rem;
       height: 0.88rem;
       line-height: 0.88rem;
@@ -116,8 +116,12 @@ export default {
       @include justify-content-center;
       span {
         @include flex;
-        border-right: 0.01rem $border-color solid;
-        border-bottom: 0.01rem $border-color solid;
+        border-right: 2px #fff solid;
+        border-bottom: 2px #fff solid;
+        background: #ecf5ff;
+        display: inline-block;
+        height: 0.88rem;
+        line-height: 0.88rem;
       }
     }
     &:last-child {

src/pages/waitingRoom/components/patientInfo.vue

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

src/styles/reset.scss

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

src/styles/style.scss

@@ -1,5 +1,5 @@
 .body {
-  background: $base-color;
+  // background: $base-color;
 }
 
 #app {
@@ -12,7 +12,6 @@
 }
 
 .mainBox {
-  background: #fff;
   font-size: 0.3rem;
 }
 
@@ -41,13 +40,14 @@
 .blueBorder {
   height: 0.2rem;
   line-height: 0.2rem;
-  background: #ebf1f7;
+  background: #f6f8f9;
 }
 
 // 数据详情
 .plate-box {
   background: $text-color;
   padding: 0 0 0.3rem 0;
+  margin:  0 0.2rem;
   .title {
     border-bottom: 1px $border-color solid;
     line-height: 1rem;
@@ -504,6 +504,7 @@
   text-align: center;
   border: $border-color;
   padding-bottom: 0.02rem;
+  border: none;
   tr {
     padding: 0;
     margin: 0;
@@ -521,6 +522,7 @@
       background: #ecf5ff;
       border: none;
       padding: 0.18rem 0;
+      
       .xg {
         color: $main-color;
         font-size: 0.28rem;
@@ -564,15 +566,21 @@
 }
 
 .NoData {
-  width: 200px;
+  width: 100%;
   text-align: center;
   background: #fff;
-  margin: 0 auto;
   padding:0.3rem 0; 
+  display:flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
   img {
-    width: 100%;
+    width: 180px;
   }
 }
+.el-popper{
+  margin-top: 0!important;
+}
 
 .CheckBox,
 .DialogContent,
@@ -705,4 +713,30 @@
 .el-collapse-item__content{
   height: 7.4rem!important;
     overflow-y: auto!important;
-}
+}
+
+// 顶部导航固定
+.top,
+.top_row{
+  position: fixed!important;
+    top: 0;
+    left: 1.58rem;
+    right: 0;
+    z-index: 1000;
+    background: #fff;
+}
+// .choice,
+// .screening{
+//   position: fixed;
+//   top: 63px;
+//   right: 0;
+//   z-index: 66;
+//   left: 1.58rem;
+//   background: #fff;
+// }
+.stateBox{
+  padding-top:115px; 
+  background: #fff;
+  min-height: calc(100vh - 2px);
+  padding-left: 0.45rem;
+}

src/styles/variables.scss

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