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

src/pages/main/add_urgent_schedule.vue

                     <van-col :span="9">
                         <span class="title">日期：</span>
                         <div class="field_panel">
-                            <van-field v-model="date" disabled class="field"></van-field>
+                            <van-field v-model="date"  class="field"></van-field>
                         </div>
                     </van-col>
                 </van-row>
                     <van-col :span="24">
                         <span class="title">&nbsp;</span>
                         <div class="field_panel">
-                            <van-button type="info" @click="submitAction">立即排班</van-button>
+                            <van-button type="info" size="normal" @click="submitAction">立即排班</van-button>
                         </div>
                     </van-col>
                 </van-row>
         background: #fff;
         min-height: calc(100vh - 2px);
         padding-top:55px; 
+        padding-left: 20px;
         .row {
             padding: 5px 0;
             .title {

src/pages/main/dialysis/AdviceTable.vue

 .AdviceTable{
   padding-top:0; 
   background: #fff;
-  min-height: calc(100vh - 180px);
+  min-height: calc(100vh - 230px);
 }
 }
 

src/pages/main/dialysis/CheckTab.vue

     border-bottom: 1px #e5e5e5 solid;
     background: #fff;
      position: fixed;
-    top: 115px;
+    top: 116px;
     right: 0;
-    z-index: 66;
+    z-index: 55;
     left: 1.58rem;
     background: #fff;
     ul {

src/pages/main/dialysis/InspectionItemTable.vue

 <style style="stylesheet/scss" lang="scss" scoped>
 .top {
   padding: 0.28rem 0.3rem;
-  // @include display-flex;
-  // @include align-items-center;
   @include text-align;
-  // @include justify-content-between;
   font-size: 0.3rem;
   border-bottom: 1px #e5e5e5 solid;
   position: relative;
-
   .title {
     font-size: 0.3rem;
     font-weight: bold;

src/pages/main/dialysis/RecordTable.vue

   background: #fff;
   min-height: calc(100vh - 180px);
 }
+.popover-demo-content{
+  max-height: 400px;
+  overflow-y: scroll;
+}
 </style>
 

src/pages/main/today/TodayTab.vue

 <template>
-  <div v-loading="loading">
+  <div v-loading="loading" id="today_panel">
 
     <div class="grid">
       <div class="list">
     <dialysis-prescription id="prescription" :prescription="prescription" :solution="solution" title="透析处方"
                            :device_number_map="device_map"></dialysis-prescription>
 
-    <!-- <div class="blueBorder"></div>
-    <past-data class="往期数据"></past-data> -->
-
     <div class="blueBorder"></div>
     <accepts-assessment id="accepts_assessment" :record="receiver_treatment_access" title="接诊评估"></accepts-assessment>
 
                         @close="closeTreatmentOf" ref="treatment_dialog"></treatment-dialog>
     </van-popup>
 
-    <div class="fixedNav" ref="fixed_nav" v-show="show_fixed_nav">
+    <!-- <div class="fixedNav" ref="fixed_nav" v-show="show_fixed_nav">
       <ul>
         <li @click="menuClick(1)">透析处方</li>
         <li @click="menuClick(2)">接诊评估</li>
         <li @click="menuClick(8)">透后评估</li>
         <li @click="menuClick(9)">治疗小结</li>
       </ul>
-    </div>
+    </div> -->
+ 
+   <el-button class="goTop" v-show="goTopShow" @click="goTop"  type="primary" icon="el-icon-arrow-up" circle style="position:fixed;right:20px;bottom:20px;"></el-button>
 
-  </div>
+   </div>
 </template>
 
 <script>
 
 import { dialysisGlobalConfig, getDialysisRecord } from "@/api/dialysis";
 import { parseTime } from "@/utils";
-import Vue from 'vue'
 
 export default {
   name: "TodayTab",
   data() {
     return {
       loading: true,
-      show_fixed_nav: false,
+      // show_fixed_nav: false,
       patient_id: 0,
       date: 0,
       menuList: [
       monitor_records: [], // 透析监测
       last_monitor_record: {
         id: 0,
-        operate_time: (new Date()).getTime(),
+        operate_time: new Date().getTime(),
         sodium_concentration: "",
         dialysate_temperature: ""
       }, // 上一次透析的监测记录
       admin_users: [], //系统用户列表
       devices: [], //设备
       device_numbers: [], // 床位号
-
       admin_user_map: {}, // {user_id: admin_user object}
       device_map: {}, // {device_id: device}
-      device_number_map: {} // {device_number_id: device_number}
+      device_number_map: {}, // {device_number_id: device_number}
+      scrollTop: "",
+      goTopShow: false
     };
   },
   computed: {
     },
 
     $route: "requestDialysisRecord"
-
   },
   methods: {
-    handleScroll: function() {
-      var scrollTop =
-        window.pageYOffset ||
-        document.documentElement.scrollTop ||
-        document.body.scrollTop;
-      this.show_fixed_nav = scrollTop > 160;
-    },
+    // handleScroll: function() {
+    //   var scrollTop =
+    //     window.pageYOffset ||
+    //     document.documentElement.scrollTop ||
+    //     document.body.scrollTop;
+    //   this.show_fixed_nav = scrollTop > 160;
+    // },
 
     didAddMonitor(monitor) {
-      this.monitor_records.push(monitor)
+      this.monitor_records.push(monitor);
 
-      this.monitor_records.sort((a,b)=>b.operate_time-a.operate_time)
+      this.monitor_records.sort((a, b) => b.operate_time - a.operate_time);
 
       // for (let index = 0; index < this.monitor_records.length; index++) {
       //   const record = this.monitor_records[index];
       //   }
       // }
       this.monitor_records.reverse();
-      this.last_monitor_record = monitor
-
+      this.last_monitor_record = monitor;
     },
 
     didEditMonitor(monitor) {
         }
       }
 
-      console.log(monitor)
-      console.log(this.monitor_records[monitor_index])
-
-
-      this.monitor_records[monitor_index].arterial_pressure = monitor.arterial_pressure
-      this.monitor_records[monitor_index].blood_flow_volume = monitor.blood_flow_volume
-      this.monitor_records[monitor_index].breathing_rate = monitor.breathing_rate
-      this.monitor_records[monitor_index].dialysate_temperature = monitor.dialysate_temperature
-      this.monitor_records[monitor_index].diastolic_bp = monitor.diastolic_bp
-      this.monitor_records[monitor_index].displacement_quantity = monitor.displacement_quantity
-      this.monitor_records[monitor_index].dispose = monitor.dispose
-      this.monitor_records[monitor_index].ktv = monitor.ktv
-      this.monitor_records[monitor_index].monitor_date = monitor.monitor_date
-      this.monitor_records[monitor_index].monitoring_nurse = monitor.monitoring_nurse
-      this.monitor_records[monitor_index].operate_time = monitor.operate_time
-      this.monitor_records[monitor_index].pulse_frequency = monitor.pulse_frequency
-      this.monitor_records[monitor_index].replacement_rate = monitor.replacement_rate
-      this.monitor_records[monitor_index].result = monitor.result
-      this.monitor_records[monitor_index].sodium_concentration = monitor.sodium_concentration
-      this.monitor_records[monitor_index].symptom = monitor.symptom
-      this.monitor_records[monitor_index].systolic_bp = monitor.systolic_bp
-      this.monitor_records[monitor_index].transmembrane_pressure = monitor.transmembrane_pressure
-      this.monitor_records[monitor_index].ultrafiltration_rate = monitor.ultrafiltration_rate
-      this.monitor_records[monitor_index].ultrafiltration_volume = monitor.ultrafiltration_volume
-      this.monitor_records[monitor_index].venous_pressure = monitor.venous_pressure
-      this.monitor_records[monitor_index].diastolic_blood_pressure = monitor.diastolic_blood_pressure
-      this.monitor_records[monitor_index].systolic_blood_pressure = monitor.systolic_blood_pressure
-
-      this.monitor_records.sort((a,b)=>b.operate_time-a.operate_time)
+      console.log(monitor);
+      console.log(this.monitor_records[monitor_index]);
+
+      this.monitor_records[monitor_index].arterial_pressure =
+        monitor.arterial_pressure;
+      this.monitor_records[monitor_index].blood_flow_volume =
+        monitor.blood_flow_volume;
+      this.monitor_records[monitor_index].breathing_rate =
+        monitor.breathing_rate;
+      this.monitor_records[monitor_index].dialysate_temperature =
+        monitor.dialysate_temperature;
+      this.monitor_records[monitor_index].diastolic_bp = monitor.diastolic_bp;
+      this.monitor_records[monitor_index].displacement_quantity =
+        monitor.displacement_quantity;
+      this.monitor_records[monitor_index].dispose = monitor.dispose;
+      this.monitor_records[monitor_index].ktv = monitor.ktv;
+      this.monitor_records[monitor_index].monitor_date = monitor.monitor_date;
+      this.monitor_records[monitor_index].monitoring_nurse =
+        monitor.monitoring_nurse;
+      this.monitor_records[monitor_index].operate_time = monitor.operate_time;
+      this.monitor_records[monitor_index].pulse_frequency =
+        monitor.pulse_frequency;
+      this.monitor_records[monitor_index].replacement_rate =
+        monitor.replacement_rate;
+      this.monitor_records[monitor_index].result = monitor.result;
+      this.monitor_records[monitor_index].sodium_concentration =
+        monitor.sodium_concentration;
+      this.monitor_records[monitor_index].symptom = monitor.symptom;
+      this.monitor_records[monitor_index].systolic_bp = monitor.systolic_bp;
+      this.monitor_records[monitor_index].transmembrane_pressure =
+        monitor.transmembrane_pressure;
+      this.monitor_records[monitor_index].ultrafiltration_rate =
+        monitor.ultrafiltration_rate;
+      this.monitor_records[monitor_index].ultrafiltration_volume =
+        monitor.ultrafiltration_volume;
+      this.monitor_records[monitor_index].venous_pressure =
+        monitor.venous_pressure;
+      this.monitor_records[monitor_index].diastolic_blood_pressure =
+        monitor.diastolic_blood_pressure;
+      this.monitor_records[monitor_index].systolic_blood_pressure =
+        monitor.systolic_blood_pressure;
+
+      this.monitor_records.sort((a, b) => b.operate_time - a.operate_time);
 
       // if (monitor_index >= 0) {
       //   var record = this.monitor_records[monitor_index]
     closeDialog(index) {
       this.index = -1;
       this.menuList[index].showPopup = false;
-    },refresh(){
-
-
-
+    },
+    refresh() {
       var dateStr = parseTime(this.$route.query.date, "{y}-{m}-{d}");
       var params = {
         patient_id: this.$route.query.patient_id,
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
           if (this.doctor_advices.length > 0) {
-            var group = this.newAdviceGroupObject()
+            var group = this.newAdviceGroupObject();
             var initGroupBlock = function(group, advice) {
-              group.group_no = advice.groupno
+              group.group_no = advice.groupno;
               // group.start_time = advice.start_time
               // group.advice_doctor = advice.advice_doctor
               // group.exec_staff = advice.execution_staff
               // group.exec_time = advice.execution_time
               // group.checker = advice.checker
-            }
+            };
             for (let index = 0; index < this.doctor_advices.length; index++) {
               const advice = this.doctor_advices[index];
-              if (advice.groupno == 0) { // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
+              if (advice.groupno == 0) {
+                // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
                 if (advice.parent_id > 0) {
                   if (this.advice_groups.length > 0) {
-                    var parent_group = this.advice_groups[this.advice_groups.length - 1]
+                    var parent_group = this.advice_groups[
+                      this.advice_groups.length - 1
+                    ];
                     if (parent_group.advices.length > 0) {
                       if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice)
+                        parent_group.advices.push(advice);
                       }
                     }
                   }
-                  continue
-
+                  continue;
                 } else {
                   if (group.group_no > 0) {
-                    this.advice_groups.push(group)
-                    group = this.newAdviceGroupObject()
+                    this.advice_groups.push(group);
+                    group = this.newAdviceGroupObject();
                   }
 
-                  initGroupBlock(group, advice)
-                  group.advices.push(advice)
-                  this.advice_groups.push(group)
-                  group = this.newAdviceGroupObject()
-                  continue
+                  initGroupBlock(group, advice);
+                  group.advices.push(advice);
+                  this.advice_groups.push(group);
+                  group = this.newAdviceGroupObject();
+                  continue;
                 }
               }
 
               if (group.group_no > 0 && group.group_no != advice.groupno) {
-                this.advice_groups.push(group)
-                group = this.newAdviceGroupObject()
+                this.advice_groups.push(group);
+                group = this.newAdviceGroupObject();
               }
               if (group.group_no == 0) {
-                initGroupBlock(group, advice)
+                initGroupBlock(group, advice);
               }
               if (group.group_no == advice.groupno) {
-                group.advices.push(advice)
+                group.advices.push(advice);
               }
             }
-            if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              this.advice_groups.push(group)
+            if (group.group_no > 0) {
+              // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
+              this.advice_groups.push(group);
             }
 
             // console.log(this.advice_groups)
           this.loading = false;
         }
       });
-
     },
 
     requestDialysisRecord() {
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
           if (this.doctor_advices.length > 0) {
-            var group = this.newAdviceGroupObject()
+            var group = this.newAdviceGroupObject();
             var initGroupBlock = function(group, advice) {
-              group.group_no = advice.groupno
+              group.group_no = advice.groupno;
               // group.start_time = advice.start_time
               // group.advice_doctor = advice.advice_doctor
               // group.exec_staff = advice.execution_staff
               // group.exec_time = advice.execution_time
               // group.checker = advice.checker
-            }
+            };
             for (let index = 0; index < this.doctor_advices.length; index++) {
               const advice = this.doctor_advices[index];
-              if (advice.groupno == 0) { // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
+              if (advice.groupno == 0) {
+                // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
                 if (advice.parent_id > 0) {
                   if (this.advice_groups.length > 0) {
-                    var parent_group = this.advice_groups[this.advice_groups.length - 1]
+                    var parent_group = this.advice_groups[
+                      this.advice_groups.length - 1
+                    ];
                     if (parent_group.advices.length > 0) {
                       if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice)
+                        parent_group.advices.push(advice);
                       }
                     }
                   }
-                  continue
-
+                  continue;
                 } else {
                   if (group.group_no > 0) {
-                    this.advice_groups.push(group)
-                    group = this.newAdviceGroupObject()
+                    this.advice_groups.push(group);
+                    group = this.newAdviceGroupObject();
                   }
-                    
-                  initGroupBlock(group, advice)
-                  group.advices.push(advice)
-                  this.advice_groups.push(group)
-                  group = this.newAdviceGroupObject()
-                  continue
+
+                  initGroupBlock(group, advice);
+                  group.advices.push(advice);
+                  this.advice_groups.push(group);
+                  group = this.newAdviceGroupObject();
+                  continue;
                 }
               }
 
               if (group.group_no > 0 && group.group_no != advice.groupno) {
-                this.advice_groups.push(group)
-                group = this.newAdviceGroupObject()
+                this.advice_groups.push(group);
+                group = this.newAdviceGroupObject();
               }
               if (group.group_no == 0) {
-                initGroupBlock(group, advice)
+                initGroupBlock(group, advice);
               }
               if (group.group_no == advice.groupno) {
-                group.advices.push(advice)
+                group.advices.push(advice);
               }
             }
-            if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              this.advice_groups.push(group)
+            if (group.group_no > 0) {
+              // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
+              this.advice_groups.push(group);
             }
-            
+
             // console.log(this.advice_groups)
           }
 
       });
     },
     newAdviceGroupObject: function() {
-      return Object.assign({}, {
-        group_no: 0,
-        // advice_doctor: 0,
-        // start_time: 0,
-        advices: [],
-        // exec_staff: 0,
-        // exec_time: 0,
-        // checker: 0,
-      })
+      return Object.assign(
+        {},
+        {
+          group_no: 0,
+          // advice_doctor: 0,
+          // start_time: 0,
+          advices: []
+          // exec_staff: 0,
+          // exec_time: 0,
+          // checker: 0,
+        }
+      );
     },
 
     closePrescriptionDialog: function() {
         document.querySelector("#" + id).offsetTop - 100;
       document.documentElement.scrollTop =
         document.querySelector("#" + id).offsetTop - 100;
+    },
+    handleScroll() {
+      this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+      if (this.scrollTop > 50) {
+        this.goTopShow = true;
+      }else{
+        this.goTopShow = false;
+      }
+    },
+    goTop() {
+      let timer = null,
+        _that = this;
+    cancelAnimationFrame(timer);
+      timer = requestAnimationFrame(function fn() {
+        if (_that.scrollTop > 0) {
+          _that.scrollTop -= 50;
+          document.body.scrollTop = document.documentElement.scrollTop =
+            _that.scrollTop;
+          timer = requestAnimationFrame(fn);
+        } else {
+          cancelAnimationFrame(timer);
+          _that.goTopShow = false;
+        }
+      });
+    },
+    destroyed() {
+      window.removeEventListener("scroll", this.handleScroll);
     }
   }
 };
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
+.today_panel {
+  height: calc(100% - 63px);
+}
+
 .mainContent {
   position: relative;
   .grid {
     padding: 0.1rem 0 0.25rem 0;
-    margin: 0.2rem 0.2rem 0 0.2rem;
+    margin: 0.2rem 0 0 0;
     background: #fff;
     .list {
       ul {
         li {
           font-size: 0.24rem;
           color: #5d6b7a;
-          margin-top:0.35rem;
+          margin-top: 0.35rem;
           p {
             line-height: 0.6rem;
             color: #34495e;
       }
     }
   }
-  .fixedNav {
-    position: fixed;
-    right: 0;
-    top: 0;
-    left: 1.58rem;
-    background: #f18f68;
-    color: #fff;
-    font-size: 0.24rem;
-    z-index: 99;
-    padding: 0 0.1rem;
-    margin-top: 1.17rem;
-    ul {
-      @include display-flex;
-      @include align-items-center;
-      @include text-align;
-      @include box-sizing;
-      @include justify-content-between;
-      margin: 0.3rem 0;
-      li {
-        height: 0.6rem;
-        line-height: 0.6rem;
-        padding: 0 0.2rem;
-        border-radius: 30px;
-        font-size: 0.32rem;
-        cursor: pointer;
-        background: #f4aa8c;
-        &.active {
-          background: #f4aa8c;
-        }
-      }
-    }
-  }
 }
 </style>
 

src/pages/main/today/detailsInfo.vue

 <style rel="stylesheet/scss" lang="scss" scoped>
 .info {
   background: $text-color;
-  margin: 0 0.2rem;
   ul {
     padding: 0.4rem 0.8rem;
     li {

src/styles/style.scss

 .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;
   box-shadow: 0 0 15px #eee;
   .popover-demo-content {
     ul {
-      width: 6.4rem;
+      // width: 6.4rem;
       padding: 0.28rem;
       li {
         font-size: 0.32rem;
   min-height: calc(100vh - 2px);
   padding-left: 0.45rem;
 }
+
+