表格修改

src/pages/advice/AdvicePage.vue

@@ -174,10 +174,20 @@ export default {
     border-radius: 30px;
     border: none;
     font-size: 0.45rem;
+    @media only screen and (min-width: 768px) {
+      padding-left: 0.9rem;
+    }
   }
   .el-input__icon {
     line-height: 1rem;
     font-size: 0.45rem;
+    margin-top: 0.02rem;
+    padding-left: 0.1rem;
+  }
+  .el-input__prefix {
+    @media only screen and (min-width: 768px) {
+      left: 10px;
+    }
   }
 }
 </style>

src/pages/advice/DialysisAdviceTable.vue

@@ -71,7 +71,7 @@
 
     <div style="width:100%;overflow:hildden;overflow-x:auto;" class="DialysisAdvice">
       <div class="blueBorder"></div>
-<!--
+      <!--
       <table class="table">
       <tr>
         <th width="50px">姓名</th>
@@ -156,16 +156,22 @@
           </template>
         </template>
       </template>
-      </table> -->
+      </table>-->
 
       <div class="NoData" v-show="zones.length <= 1">
         <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
       </div>
       <el-table :data="date" border style="width: 100%">
         <el-table-column fixed prop="date" label="姓名" width="100" align="center">
+<<<<<<< .mine
             <template slot-scope="scope">
                {{ scope.row.advice_name }}
             </template>
+=======
+          <template slot-scope="scope"></template>
+
+
+>>>>>>> .theirs
         </el-table-column>
         <el-table-column prop="name" label="透析号" width="100" align="center"></el-table-column>
         <el-table-column prop="province" label="期效" width="100" align="center"></el-table-column>
@@ -193,16 +199,16 @@
 </template>
 
 <script>
-import SideBar from '@/pages/layout/SideBar'
-import { parseTime } from '@/utils'
-import { getSchedualDoctors } from '@/api/advice'
+import SideBar from "@/pages/layout/SideBar";
+import { parseTime } from "@/utils";
+import { getSchedualDoctors } from "@/api/advice";
 
 export default {
-  name: 'DialysisAdviceTable',
+  name: "DialysisAdviceTable",
   components: {
     SideBar
   },
-  data () {
+  data() {
     return {
       selected_date: new Date(),
       admin_user: [],
@@ -210,154 +216,153 @@ export default {
       show_sch_type_selector: false,
       schedule_type_selected: 0,
       schedule_types: [
-        { value: 0, text: '全部班次' },
-        { value: 1, text: '上午' },
-        { value: 2, text: '下午' },
-        { value: 3, text: '晚上' }
+        { value: 0, text: "全部班次" },
+        { value: 1, text: "上午" },
+        { value: 2, text: "下午" },
+        { value: 3, text: "晚上" }
       ],
 
       show_zone_selector: false,
       zone_selected: 0,
       show_patient_type_selector: false,
-      zones: [{ value: 0, text: '全部分区', select: true }],
+      zones: [{ value: 0, text: "全部分区", select: true }],
 
       show_advice_type_selector: false,
       advice_type_selected: 0,
       advice_types: [
-        { value: 0, text: '全部医嘱' },
-        { value: 1, text: '长期医嘱' },
-        { value: 3, text: '临时医嘱' }
+        { value: 0, text: "全部医嘱" },
+        { value: 1, text: "长期医嘱" },
+        { value: 3, text: "临时医嘱" }
       ],
 
       patient_types: [
-        { value: 0, text: '全部病人' },
-        { value: 1, text: '我的病人' },
-        { value: 2, text: '未执行病人' }
+        { value: 0, text: "全部病人" },
+        { value: 1, text: "我的病人" },
+        { value: 2, text: "未执行病人" }
       ],
       patient_selected: 0,
 
       scheduleMap: {},
       tableData: []
-
-    }
+    };
   },
   computed: {
-    selected_date_str: function () {
-      return parseTime(this.selected_date, '{y}-{m}-{d}')
+    selected_date_str: function() {
+      return parseTime(this.selected_date, "{y}-{m}-{d}");
     },
-    filtedScheduals: function () {
-      var scheduleMap = new Object()
+    filtedScheduals: function() {
+      var scheduleMap = new Object();
       if (this.zone_selected == 0) {
         for (const key in this.scheduleMap) {
-          scheduleMap[key] = this.scheduleMap[key]
+          scheduleMap[key] = this.scheduleMap[key];
         }
       } else {
-        var zone_name = this.zones[this.zone_selected].text
-        scheduleMap[zone_name] = this.scheduleMap[zone_name]
+        var zone_name = this.zones[this.zone_selected].text;
+        scheduleMap[zone_name] = this.scheduleMap[zone_name];
       }
 
       if (this.schedule_type_selected != 0) {
-        var _scheduleMap = {}
+        var _scheduleMap = {};
         for (const key in scheduleMap) {
-          var origin_schedules = scheduleMap[key]
-          var schedules = []
+          var origin_schedules = scheduleMap[key];
+          var schedules = [];
           for (let index = 0; index < origin_schedules.length; index++) {
-            const schedule = origin_schedules[index]
+            const schedule = origin_schedules[index];
             if (schedule.schedule_type == this.schedule_type_selected) {
-              schedules.push(schedule)
+              schedules.push(schedule);
             }
           }
           if (schedules.length > 0) {
-            _scheduleMap[key] = schedules
+            _scheduleMap[key] = schedules;
           }
         }
 
-        scheduleMap = _scheduleMap
+        scheduleMap = _scheduleMap;
       }
       for (var key in scheduleMap) {
-        let mapArr = scheduleMap[key]
+        let mapArr = scheduleMap[key];
         for (let i = 0; i < mapArr.length; i++) {
-          mapArr[i]['new_advice'] = []
+          mapArr[i]["new_advice"] = [];
         }
       }
 
       for (var key in scheduleMap) {
-        let mapArr = scheduleMap[key]
+        let mapArr = scheduleMap[key];
         for (let i = 0; i < mapArr.length; i++) {
-          var maps = mapArr[i]
-          var resp_advices = maps.doctor_advice
+          var maps = mapArr[i];
+          var resp_advices = maps.doctor_advice;
           if (resp_advices.length > 0) {
-            var newGroupObject = function () {
+            var newGroupObject = function() {
               return Object.assign(
                 {},
                 {
                   group_no: 0,
                   advices: []
                 }
-              )
-            }
-            var initGroupBlock = function (group, advice) {
-              group.group_no = advice.groupno
-            }
+              );
+            };
+            var initGroupBlock = function(group, advice) {
+              group.group_no = advice.groupno;
+            };
 
-            var advice_groups = []
-            var group = newGroupObject()
+            var advice_groups = [];
+            var group = newGroupObject();
             for (let index = 0; index < resp_advices.length; index++) {
-              const advice = resp_advices[index]
+              const advice = resp_advices[index];
               if (advice.groupno == 0) {
                 // 老版本的医嘱
                 if (advice.parent_id > 0) {
                   if (advice_groups.length > 0) {
-                    var parent_group = advice_groups[advice_groups.length - 1]
+                    var parent_group = advice_groups[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) {
-                    advice_groups.push(group)
-                    group = newGroupObject()
+                    advice_groups.push(group);
+                    group = newGroupObject();
                   }
 
-                  initGroupBlock(group, advice)
-                  group.advices.push(advice)
-                  advice_groups.push(group)
-                  group = newGroupObject()
-                  continue
+                  initGroupBlock(group, advice);
+                  group.advices.push(advice);
+                  advice_groups.push(group);
+                  group = newGroupObject();
+                  continue;
                 }
               } else {
                 if (group.group_no > 0 && group.group_no != advice.groupno) {
-                  advice_groups.push(group)
-                  group = newGroupObject()
+                  advice_groups.push(group);
+                  group = newGroupObject();
                 }
                 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，这里要手动加上
-              advice_groups.push(group)
+              advice_groups.push(group);
             }
-            advice_groups = advice_groups
+            advice_groups = advice_groups;
           } else {
-            advice_groups = []
+            advice_groups = [];
           }
-          maps.new_advice = advice_groups
+          maps.new_advice = advice_groups;
         }
       }
 
-      return scheduleMap
+      return scheduleMap;
     }
   },
-  created () {
-    this.requestSchedualDoctors()
+  created() {
+    this.requestSchedualDoctors();
   },
   methods: {
     // getNumber: function (advice,schedule) {
@@ -371,115 +376,115 @@ export default {
     //   }
     //
     // },
-    clickfunction: function (val) {
+    clickfunction: function(val) {
       // console.log(val);
       this.$router.push({
-        path: '/details',
+        path: "/details",
         query: {
           patient_id: val.patient.id,
           date: this.selected_date.getTime() / 1000,
           patient_name: val.patient.name
         }
-      })
+      });
     },
-    handlePaitentType: function (index) {
-      this.patient_selected = index
-      this.show_patient_type_selector = false
-      this.requestSchedualDoctors()
+    handlePaitentType: function(index) {
+      this.patient_selected = index;
+      this.show_patient_type_selector = false;
+      this.requestSchedualDoctors();
     },
-    openPicker () {
-      this.$refs.picker.open()
+    openPicker() {
+      this.$refs.picker.open();
     },
-    getAdaviceType (type, parent_id) {
+    getAdaviceType(type, parent_id) {
       if (parent_id == 0) {
         if (type == 1) {
-          return '长嘱'
+          return "长嘱";
         } else if (type == 2) {
-          return '临嘱'
+          return "临嘱";
         } else if (type == 3) {
-          return '临嘱'
+          return "临嘱";
         }
       }
     },
-    getName (val) {
-      console.log(this.admin_user)
+    getName(val) {
+      console.log(this.admin_user);
 
       for (let i = 0; i < this.admin_user.length; i++) {
         if (this.admin_user[i].id == val) {
-          return this.admin_user[i].name
+          return this.admin_user[i].name;
         }
       }
     },
-    handletimeType: function (index) {
-      this.schedule_type_selected = index
-      this.show_sch_type_selector = false
+    handletimeType: function(index) {
+      this.schedule_type_selected = index;
+      this.show_sch_type_selector = false;
     },
-    handleAdviceType: function (index) {
-      this.advice_type_selected = index
-      this.show_advice_type_selector = false
-      this.requestSchedualDoctors()
+    handleAdviceType: function(index) {
+      this.advice_type_selected = index;
+      this.show_advice_type_selector = false;
+      this.requestSchedualDoctors();
     },
-    handleZoneChange: function (index) {
-      this.zone_selected = index
-      this.show_zone_selector = false
+    handleZoneChange: function(index) {
+      this.zone_selected = index;
+      this.show_zone_selector = false;
     },
-    parseTime: function (time, layout) {
+    parseTime: function(time, layout) {
       // console.log(time);
       if (time == 0) {
-        return ''
+        return "";
       }
-      return parseTime(time, layout)
+      return parseTime(time, layout);
     },
-    requestSchedualDoctors () {
+    requestSchedualDoctors() {
       getSchedualDoctors({
         date: this.selected_date_str,
         patient_type: this.patient_selected,
         advice_type: 2
       }).then(rs => {
-        var resp = rs.data
+        var resp = rs.data;
         if (resp.state == 1) {
-          this.admin_user = resp.data.adminUser
-          var schedules = resp.data.scheduals
-          console.log('schedules', schedules)
-          var zoneMap = {}
-          var scheduleMap = {}
+          this.admin_user = resp.data.adminUser;
+          var schedules = resp.data.scheduals;
+          console.log("schedules", schedules);
+          var zoneMap = {};
+          var scheduleMap = {};
           for (let index = 0; index < schedules.length; index++) {
-            const schedule = schedules[index]
+            const schedule = schedules[index];
             if (schedule.doctor_advice.length == 0) {
-              continue
+              continue;
             }
             if (scheduleMap[schedule.device_number.zone.name] == null) {
-              scheduleMap[schedule.device_number.zone.name] = []
+              scheduleMap[schedule.device_number.zone.name] = [];
             }
-            scheduleMap[schedule.device_number.zone.name].push(schedule)
+            scheduleMap[schedule.device_number.zone.name].push(schedule);
             if (zoneMap[schedule.device_number.zone.name] == null) {
               zoneMap[schedule.device_number.zone.name] =
-                schedule.device_number.zone
+                schedule.device_number.zone;
             }
           }
 
-          var zones = []
-          zones.push({ value: 0, text: '全部分区' })
+          var zones = [];
+          zones.push({ value: 0, text: "全部分区" });
           for (var zoneName in zoneMap) {
-            zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+            zones.push({ value: zoneMap[zoneName].id, text: zoneName });
           }
 
-          zones = zones.sort(function (a, b) {
-            return a.value > b.value
-          })
-          this.zones = zones
+          zones = zones.sort(function(a, b) {
+            return a.value > b.value;
+          });
+          this.zones = zones;
 
-          this.scheduleMap = scheduleMap
+          this.scheduleMap = scheduleMap;
         } else {
           this.$toast({
             message: resp.msg
-          })
+          });
         }
-      })
+      });
     },
-    adviceDesc (advice) {}
+    adviceDesc(advice) {}
   }
-}
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/layout/SideBar.vue

@@ -56,17 +56,17 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .redpoint {
   display: inline-block;
-  height: 30px;
-  width: 30px;
-  line-height: 30px;
+  height: 26px;
+  width: 26px;
+  line-height: 26px;
   text-align: center;
-  font-size: 0.8em;
+  font-size: 0.34rem;
   border-radius: 20px;
   color: #fff;
   background: #f56c6c;
   position: absolute;
-  top: -1px;
-  right: -24px;
+  top: 3px;
+  right: -16px;
   @media only screen and (max-width: 767px) {
     height: 16px;
     width: 16px;
@@ -110,8 +110,10 @@ export default {
       flex-direction: row;
       justify-content: space-around;
       height: 50px;
-
       padding: 0;
+      @media only screen and (min-width: 768px) {
+        height: 70px;
+      }
       li {
         height: 100%;
         display: flex;
@@ -125,18 +127,19 @@ export default {
           @media only screen and (min-width: 768px) {
             display: flex;
             align-items: center;
+            margin-bottom: 20px;
           }
           p {
             font-size: 0.32rem;
             margin-top: 0.05rem;
             @media only screen and (max-width: 812px) {
-              font-size: 0.4rem;
+              font-size: 0.45rem;
             }
           }
           .iconfont {
             font-size: 0.52rem;
-            @media only screen and (max-width: 812px) {
-              font-size: 0.7rem;
+            @media only screen and (max-width: 768px) {
+              font-size: 0.8rem;
             }
             display: inline-block;
           }

src/pages/main/DetailsPage.vue

@@ -27,7 +27,7 @@
         <!-- <div class="time" style="width:1.49rem;">
                   <span class="iconfont">2018-01-01&#xe74a;</span>
         </div>-->
-        <div class="print" style="float: right; visibility: hidden;">
+        <div class="print" style="float: right; display:none">
           <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
         </div>
       </div>
@@ -174,13 +174,17 @@ export default {
       color: #fff;
     }
     .nav {
+      margin-right: 2.5rem;
+      @media only screen and (min-width: 768px) {
+        margin-right: 4rem;
+      }
       ul {
         li {
           float: left;
-          font-size: 0.36rem;
+          font-size: 0.45rem;
           margin: 0 0.2rem;
-          height: 0.64rem;
-          line-height: 0.64rem;
+          height: 0.7rem;
+          line-height: 0.7rem;
           padding: 0 0.3rem;
           cursor: pointer;
           color: #fff;

src/pages/main/DialysisArea.vue

@@ -475,19 +475,19 @@ export default {
     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width: 80%;
+    width: 90%;
     margin: 0 auto;
     li {
-      font-size: 0.32rem;
+      font-size: 0.45rem;
       padding: 0.3rem 0;
       cursor: pointer;
       .iconfont {
-        font-size: 0.32rem;
+        font-size: 0.45rem;
         color: #a8b3ba;
         margin-left: 0.1rem;
-        @media only screen and (max-width: 812px) {
-          font-size: 12px !important;
-        }
+        // @media only screen and (max-width: 768px) {
+        //   font-size: 0.45 !important;
+        // }
       }
     }
   }

src/pages/main/PatientBox.vue

@@ -356,8 +356,8 @@ export default {
         background: #c6cdd2;
         color: #fff;
         width: 1.45rem;
-        height: 0.65rem;
-        line-height: 0.65rem;
+        height: 0.8rem;
+        line-height: 0.8rem;
         border-radius: 4px;
         margin: 0 auto;
         font-size: 0.32rem;
@@ -417,7 +417,7 @@ export default {
 }
 .yztx {
   margin: 0 5px;
-  padding: 3px 10px;
+  padding: 5px 10px;
   background-color: #f56c6c;
   color: #fff;
   border-radius: 15px;

src/pages/main/RecordPage.vue

@@ -8,6 +8,9 @@
       </div>-->
       <div class="floatLeft">
         <span class="title">{{ $store.getters.user.org.org_short_name }}</span>
+        <router-link to="/add_urgent_schedule">
+          <p class="order">临时排班</p>
+        </router-link>
       </div>
       <!-- </van-col> -->
       <!-- <van-col :span="6">
@@ -123,11 +126,6 @@
         @clear_search_keyword="clearKeyword"
       ></dialysis-area>
     </div>
-    <router-link to="/add_urgent_schedule">
-      <div class="add">
-        <p>临时排班</p>
-      </div>
-    </router-link>
   </div>
 </template>
 
@@ -206,6 +204,12 @@ export default {
   .floatLeft {
     line-height: 1rem;
     height: 1rem;
+    margin-top: 0.1rem;
+    .order {
+      float: right;
+      font-size: 0.45rem;
+      color: #fff;
+    }
   }
   .search {
     float: right;
@@ -274,7 +278,7 @@ export default {
   @media only screen and (max-width: 767px) {
     height: 16px;
     width: 16px;
-    line-height: 14px;
+    line-height: 15px;
   }
 }
 .box {
@@ -311,32 +315,6 @@ export default {
     color: #258ffc;
   }
 }
-
-.add {
-  width: 1.8rem;
-  height: 1.8rem;
-  background: #f66c6c;
-  // box-shadow: 0px 3px 9px 0px rgba(7, 30, 102, 0.15);
-  border-radius: 50%;
-  position: fixed;
-  right: 0.6rem;
-  bottom: 2.25rem;
-  font-size: 0.45rem;
-  text-align: center;
-  p {
-    width: 30px;
-    text-align: center;
-    margin: 9px auto 0;
-    color: #fff;
-    // @media only screen and (min-width: 415px) and (max-width: 668px) {
-    //   width: 40px;
-    // }
-    @media only screen and (min-width: 768px) {
-      width: 50px;
-      margin: 14px auto 0;
-    }
-  }
-}
 </style>
 <style lang="scss">
 .newInput {
@@ -357,6 +335,8 @@ export default {
   .el-input__icon {
     line-height: 1rem;
     font-size: 0.45rem;
+    margin-top: 0.02rem;
+    padding-left: 0.1rem;
     @media only screen and (min-width: 768px) {
       margin-top: 1px;
     }

src/pages/main/WaitingArea.vue

@@ -650,14 +650,14 @@ export default {
     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width: 82%;
+    width: 96%;
     margin: 0 auto;
-    font-size: 0.32rem;
+    font-size: 0.45rem;
     color: $title-color;
     li {
       padding: 0.3rem 0;
       .iconfont {
-        font-size: 0.32rem;
+        font-size: 0.45rem;
         margin-left: 0.1rem;
       }
     }

src/pages/main/dialog/ComputerDialog.vue

@@ -1,15 +1,21 @@
 <template>
   <div>
-
     <div class="Dialog" v-show="!selecting">
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">透析上机</h1>
-        <span class="success" v-if="this.record.id == 0 || this.$store.getters.user.user.id != this.creator"></span>
-        <span class="success" @click="modify()" v-if="isPremission|| this.$store.getters.user.user.id == this.creator">修改</span>
+        <span
+          class="success"
+          v-if="this.record.id == 0 || this.$store.getters.user.user.id != this.creator"
+        ></span>
+        <span
+          class="success"
+          @click="modify()"
+          v-if="isPremission|| this.$store.getters.user.user.id == this.creator"
+        >修改</span>
       </div>
 
-      <div class="DialogContent ">
+      <div class="DialogContent">
         <div class="item" @click="select_bed">
           <h2 class="name">上机床位</h2>
           <div class="content">
@@ -28,7 +34,11 @@
         <div class="item" @click="select_puncture_nurse">
           <h2 class="name">穿刺者</h2>
           <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[puncture_nurse_id]">{{ admin_map[puncture_nurse_id].name}}</span>
+            <span
+              class="text"
+              style="width: 100px"
+              v-if="admin_map[puncture_nurse_id]"
+            >{{ admin_map[puncture_nurse_id].name}}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
@@ -36,21 +46,22 @@
         <div class="item" v-if="template_id == 6">
           <label class="name" for="xll">引血(ml/min)</label>
           <div class="content">
-            <input type="tel" @focus="inputFocus"  id="xll" v-model="blood_drawing"/>
+            <input type="tel" @focus="inputFocus" id="xll" v-model="blood_drawing" />
           </div>
         </div>
 
         <div class="item">
           <h2 class="name">上机时间</h2>
           <div class="content">
-            <span class="text" style="width: 100px" @click="selectStartTimeAction">{{ start_time_str }}</span>
+            <span
+              class="text"
+              style="width: 100px"
+              @click="selectStartTimeAction"
+            >{{ start_time_str }}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
 
-        
-
-
         <div class="perform">
           <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
           <button :disabled="true" style="background-color:lightgray;" v-else>已上机</button>
@@ -69,350 +80,410 @@
 </template>
 
 <script>
-  import {startDialysis,PostModifyStartDialysis} from '@/api/dialysis'
-  import {Toast} from 'vant'
-  import {parseTime} from '@/utils'
-
-  import TwoMenu from './TwoMenu'
-
-  export default {
-    name: 'ComputerDialog',
-    components: {
-      TwoMenu
+import { startDialysis, PostModifyStartDialysis } from "@/api/dialysis";
+import { Toast } from "vant";
+import { parseTime } from "@/utils";
+
+import TwoMenu from "./TwoMenu";
+
+export default {
+  name: "ComputerDialog",
+  components: {
+    TwoMenu
+  },
+  data() {
+    return {
+      start_time: new Date(),
+      selecting: false,
+      start_time_str: "",
+      bed_id: 0,
+      nurse_id: 0,
+      puncture_nurse_id: 0,
+      isPremission: false,
+      zone_beds: [], // 该排班的区里的床位
+      creator: 0,
+      template_id: 0,
+      blood_drawing: 100
+    };
+  },
+  props: {
+    schedule: {
+      type: Object
     },
-    data () {
-      return {
-        start_time: new Date(),
-        selecting: false,
-        start_time_str: '',
-        bed_id: 0,
-        nurse_id: 0,
-        puncture_nurse_id: 0,
-        isPremission: false,
-        zone_beds: [], // 该排班的区里的床位
-        creator: 0,
-        template_id: 0,
-        blood_drawing:100
-      }
+    patient_prop: {
+      type: Object
     },
-    props: {
-      schedule: {
-        type: Object,
-      },
-      patient_prop: {
-        type: Object,
-      },
-      record: {
-        type: Object,
-      },
-      admins: {
-        type: Array,
-      },
-      device_numbers: {
-        type: Array,
-      },
-      admin_map: {
-        type: Object,
-      },
-      device_number_map: {
-        type: Object,
-      },
-      special_premission: {
-        type: Array,
-      },
-    }, mounted () {
-
-      if (this.record.id == 0) {
-        this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+    record: {
+      type: Object
+    },
+    admins: {
+      type: Array
+    },
+    device_numbers: {
+      type: Array
+    },
+    admin_map: {
+      type: Object
+    },
+    device_number_map: {
+      type: Object
+    },
+    special_premission: {
+      type: Array
+    }
+  },
+  mounted() {
+    if (this.record.id == 0) {
+      this.start_time_str =
+        parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    } else {
+      if (this.record.start_time == 0) {
+        this.start_time_str =
+          parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
       } else {
-        if (this.record.start_time == 0) {
-          this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+        this.start_time_str =
+          parseTime(this.record.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+      }
+    }
+  },
+  created() {
+    this.template_id = this.$store.getters.user.template_info.template_id;
+    var date = this.$route.query && this.$route.query.date;
+    date *= 1000;
+    var newDate = new Date(date);
+    var y = newDate.getFullYear();
+    var m = newDate.getMonth() + 1;
+    var d = newDate.getDate();
+    if (isNaN(y) || isNaN(m) || isNaN(d)) {
+      newDate = new Date();
+      y = newDate.getFullYear();
+      m = newDate.getMonth() + 1;
+      d = newDate.getDate();
+    }
+    this.record_date =
+      y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
+
+    this.bed_id =
+      this.record == null || this.record.id == ""
+        ? this.schedule.bed_id
+        : this.record.bed_id;
+    this.nurse_id =
+      this.record == null || this.record.id == ""
+        ? this.$store.getters.user.user.id
+        : this.record.start_nurse;
+    this.puncture_nurse_id =
+      this.record == null || this.record.id == ""
+        ? this.$store.getters.user.user.id
+        : this.record.puncture_nurse;
+
+    if (this.puncture_nurse_id == 0) {
+      this.puncture_nurse_id = this.$store.getters.user.user.id;
+    }
 
-        } else {
-          this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+    // var beds = []
+    // for (let index = 0; index < this.device_numbers.length; index++) {
+    //   const device_number = this.device_numbers[index]
+    //   if (device_number.zone_id == this.schedule.partition_id) {
+    //     beds.push(device_number)
+    //   }
+    // }
+    // this.zone_beds = beds
+
+    for (let index = 0; index < this.device_numbers.length; index++) {
+      const device_number = this.device_numbers[index];
+      this.device_numbers[index]["number"] =
+        device_number["zone_name"] + "-" + device_number["number"];
+    }
+    this.zone_beds = this.device_numbers;
+
+    if (this.record.id > 0) {
+      for (let i = 0; i < this.special_premission.length; i++) {
+        if (
+          this.$store.getters.user.user.id ==
+          this.special_premission[i].admin_user_id
+        ) {
+          this.isPremission = true;
         }
       }
-    },
-    created () {
-    
-      this.template_id = this.$store.getters.user.template_info.template_id;
-      var date = this.$route.query && this.$route.query.date
-      date *= 1000
-      var newDate = new Date(date)
-      var y = newDate.getFullYear()
-      var m = newDate.getMonth() + 1
-      var d = newDate.getDate()
-      if (isNaN(y) || isNaN(m) || isNaN(d)) {
-        newDate = new Date()
-        y = newDate.getFullYear()
-        m = newDate.getMonth() + 1
-        d = newDate.getDate()
-      }
-      this.record_date = y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
-
-      this.bed_id = (this.record == null || this.record.id == '') ? this.schedule.bed_id : this.record.bed_id
-      this.nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.user.id : this.record.start_nurse
-      this.puncture_nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.user.id : this.record.puncture_nurse
+    }
 
-      if (this.puncture_nurse_id == 0) {
-        this.puncture_nurse_id = this.$store.getters.user.user.id
+    if (this.record.id > 0) {
+      if (this.record.creator == 0) {
+        this.creator = this.record.start_nurse;
+      } else {
+        this.creator = this.record.creator;
       }
-      
-      // var beds = []
-      // for (let index = 0; index < this.device_numbers.length; index++) {
-      //   const device_number = this.device_numbers[index]
-      //   if (device_number.zone_id == this.schedule.partition_id) {
-      //     beds.push(device_number)
-      //   }
-      // }
-      // this.zone_beds = beds
-
-      for (let index = 0; index < this.device_numbers.length; index++) {
-        const device_number = this.device_numbers[index]
-        this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+    }
+  },
+  methods: {
+    inputFocus: function(event) {
+      var input = event.target;
+      setTimeout(function() {
+        input.scrollIntoView();
+      }, 0);
+
+      if (input.setSelectionRange) {
+        setTimeout(function() {
+          input.setSelectionRange(0, input.value.length);
+        }, 0);
+      } else if (input.createTextRange) {
+        var rng = input.createTextRange();
+        rng.move("character", input.value.length);
+        rng.select();
       }
-      this.zone_beds = this.device_numbers
-
-      if (this.record.id > 0) {
-        for (let i = 0; i < this.special_premission.length; i++) {
-          if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-            this.isPremission = true
+    },
+    modify() {
+      let ParamsQuery = {};
+      ParamsQuery["id"] = this.record.id;
+      ParamsQuery["nurse"] = this.nurse_id;
+      ParamsQuery["bed"] = this.bed_id;
+      ParamsQuery["start_time"] = this.start_time_str;
+      ParamsQuery["puncture_nurse"] = this.puncture_nurse_id;
+      PostModifyStartDialysis(ParamsQuery).then(response => {
+        if (response.data.state == 0) {
+          Toast.fail(response.data.msg);
+          return false;
+        } else {
+          Toast.success("修改成功");
+          this.$emit("did_start", response.data.data.dialysis_order);
+          var record = this.record;
+          for (const key in response.data.data.dialysis_order) {
+            this.$set(record, key, response.data.data.dialysis_order[key]);
           }
         }
-      }
-
-      if (this.record.id > 0) {
+      });
+    },
+    didSelectStartTime: function(time) {
+      this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    },
+    selectStartTimeAction: function() {
+      if (this.record.id != 0) {
+        var creator = 0;
         if (this.record.creator == 0) {
-          this.creator = this.record.start_nurse
+          creator = this.record.start_nurse;
         } else {
-          this.creator = this.record.creator
+          creator = this.record.creator;
         }
-      }
 
-
-
-    },
-    methods: {
-      inputFocus: function (event) {
-        var input = event.target
-        setTimeout(function () {
-          input.scrollIntoView()
-        }, 0)
-
-        if (input.setSelectionRange) {
-          setTimeout(function () {
-            input.setSelectionRange(0, input.value.length)
-          }, 0)
-        } else if (input.createTextRange) {
-          var rng = input.createTextRange()
-          rng.move('character', input.value.length)
-          rng.select()
+        if (this.$store.getters.user.user.id == creator || this.isPremission) {
+          this.$refs.start_time_picker.open();
+        } else {
+          return;
         }
-      },
-      modify(){
-        let ParamsQuery = {}
-        ParamsQuery['id'] = this.record.id
-        ParamsQuery['nurse'] = this.nurse_id
-        ParamsQuery['bed'] = this.bed_id
-        ParamsQuery['start_time'] = this.start_time_str
-        ParamsQuery['puncture_nurse'] = this.puncture_nurse_id
-        PostModifyStartDialysis(ParamsQuery).then(response => {
-          if (response.data.state == 0) {
-            Toast.fail(response.data.msg)
-            return false
-          } else {
-            Toast.success('修改成功')
-            this.$emit('did_start', response.data.data.dialysis_order)
-            var record = this.record
-            for (const key in response.data.data.dialysis_order) {
-              this.$set(record, key, response.data.data.dialysis_order[key])
-            }
-          }
-        })
-      },
-      didSelectStartTime: function (time) {
-        this.start_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}') + ':00'
-      },
-      selectStartTimeAction: function () {
-        if (this.record.id != 0) {
-          var creator = 0
-          if (this.record.creator == 0) {
-            creator = this.record.start_nurse
-          } else {
-            creator = this.record.creator
-          }
-
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.$refs.start_time_picker.open()
-          } else {
-            return
+      }
+      this.$refs.start_time_picker.open();
+    },
+    commitInfo: function() {
+      Toast.loading({ forbidClick: true, duration: 0 });
+      let ParamsQuery = {};
+      ParamsQuery["patient_id"] = this.patient_prop.id;
+      ParamsQuery["record_date"] = this.record_date;
+      ParamsQuery["nurse"] = this.nurse_id;
+      ParamsQuery["bed"] = this.bed_id;
+      ParamsQuery["start_time"] = this.start_time_str;
+      ParamsQuery["puncture_nurse"] = this.puncture_nurse_id;
+      ParamsQuery["blood_drawing"] = this.blood_drawing;
+
+      startDialysis(ParamsQuery).then(response => {
+        if (response.data.state == 0) {
+          Toast.fail(response.data.msg);
+          return false;
+        } else {
+          Toast.success("上机成功");
+          var monitor = response.data.data.monitor;
+          this.$emit("did_add_monitor", monitor);
+          this.$emit("did_start", response.data.data.dialysis_order);
+          var record = this.record;
+          for (const key in response.data.data.dialysis_order) {
+            this.$set(record, key, response.data.data.dialysis_order[key]);
+            // this.record[key] = response.data.data.dialysis_order[key]
           }
         }
-        this.$refs.start_time_picker.open()
-      },
-      commitInfo: function () {
-        Toast.loading({forbidClick: true, duration: 0})
-        let ParamsQuery = {}
-        ParamsQuery['patient_id'] = this.patient_prop.id
-        ParamsQuery['record_date'] = this.record_date
-        ParamsQuery['nurse'] = this.nurse_id
-        ParamsQuery['bed'] = this.bed_id
-        ParamsQuery['start_time'] = this.start_time_str
-        ParamsQuery['puncture_nurse'] = this.puncture_nurse_id
-        ParamsQuery['blood_drawing'] = this.blood_drawing
+      });
+    },
+    close: function() {
+      this.$emit("close");
+    },
+    select_bed: function() {
+      if (this.record.id != 0) {
+        var creator = 0;
+        if (this.record.creator == 0) {
+          creator = this.record.start_nurse;
+        } else {
+          creator = this.record.creator;
+        }
 
-        startDialysis(ParamsQuery).then(response => {
-          if (response.data.state == 0) {
-            Toast.fail(response.data.msg)
-            return false
-          } else {
-            Toast.success('上机成功')
-            var monitor = response.data.data.monitor
-            this.$emit('did_add_monitor', monitor)
-            this.$emit('did_start', response.data.data.dialysis_order)
-            var record = this.record
-            for (const key in response.data.data.dialysis_order) {
-              this.$set(record, key, response.data.data.dialysis_order[key])
-              // this.record[key] = response.data.data.dialysis_order[key]
+        if (this.$store.getters.user.user.id == creator || this.isPremission) {
+          this.selecting = true;
+          var t = this;
+          this.$refs.selector.showSingleSelect(
+            this.zone_beds,
+            this.bed_id,
+            "选择床位号",
+            "number",
+            "id",
+            function(select_id) {
+              t.bed_id = select_id;
+            },
+            function() {
+              t.selecting = false;
             }
-          }
-        })
-      },
-      close: function () {
-        this.$emit('close')
-      },
-      select_bed: function () {
-        if (this.record.id != 0) {
-          var creator = 0
-          if (this.record.creator == 0) {
-            creator = this.record.start_nurse
-          } else {
-            creator = this.record.creator
-          }
-
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.selecting = true
-            var t = this
-            this.$refs.selector.showSingleSelect(this.zone_beds, this.bed_id, '选择床位号', 'number', 'id', function (select_id) {
-              t.bed_id = select_id
-            }, function () {
-              t.selecting = false
-            })
-          } else {
-            return
-          }
+          );
+        } else {
+          return;
         }
+      }
 
-        this.selecting = true
-        var t = this
-        this.$refs.selector.showSingleSelect(this.zone_beds, this.bed_id, '选择床位号', 'number', 'id', function (select_id) {
-          t.bed_id = select_id
-        }, function () {
-          t.selecting = false
-        })
-      },
-      select_nurse: function () {
-        if (this.record.id != 0) {
-          var creator = 0
-          if (this.record.creator == 0) {
-            creator = this.record.start_nurse
-          } else {
-            creator = this.record.creator
-          }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.selecting = true
-            var t = this
-            this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择上机护士', 'name', 'id', function (select_id) {
-              t.nurse_id = select_id
-            }, function () {
-              t.selecting = false
-            })
-          } else {
-            return
-          }
+      this.selecting = true;
+      var t = this;
+      this.$refs.selector.showSingleSelect(
+        this.zone_beds,
+        this.bed_id,
+        "选择床位号",
+        "number",
+        "id",
+        function(select_id) {
+          t.bed_id = select_id;
+        },
+        function() {
+          t.selecting = false;
         }
-        this.selecting = true
-        var t = this
-        this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择上机护士', 'name', 'id', function (select_id) {
-          t.nurse_id = select_id
-        }, function () {
-          t.selecting = false
-        })
-      }, select_puncture_nurse: function () {
-        if (this.record.id != 0) {
-          var creator = 0
-          if (this.record.creator == 0) {
-            creator = this.record.start_nurse
-          } else {
-            creator = this.record.creator
-          }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.selecting = true
-            var t = this
-            this.$refs.selector.showSingleSelect(this.admins, this.puncture_nurse_id, '选择穿刺护士', 'name', 'id', function (select_id) {
-              t.puncture_nurse_id = select_id
-            }, function () {
-              t.selecting = false
-            })
-          } else {
-            return
-          }
+      );
+    },
+    select_nurse: function() {
+      if (this.record.id != 0) {
+        var creator = 0;
+        if (this.record.creator == 0) {
+          creator = this.record.start_nurse;
+        } else {
+          creator = this.record.creator;
+        }
+        if (this.$store.getters.user.user.id == creator || this.isPremission) {
+          this.selecting = true;
+          var t = this;
+          this.$refs.selector.showSingleSelect(
+            this.admins,
+            this.nurse_id,
+            "选择上机护士",
+            "name",
+            "id",
+            function(select_id) {
+              t.nurse_id = select_id;
+            },
+            function() {
+              t.selecting = false;
+            }
+          );
+        } else {
+          return;
         }
-        this.selecting = true
-        var t = this
-        this.$refs.selector.showSingleSelect(this.admins, this.puncture_nurse_id, '选择穿刺护士', 'name', 'id', function (select_id) {
-          t.puncture_nurse_id = select_id
-        }, function () {
-          t.selecting = false
-        })
-      },
-      open: function () {
-        this.selecting = false
-        this.$refs.selector.hide()
       }
-    }, watch: {
-      'record.id': function (val) {
-        if (val > 0) {
-          for (let i = 0; i < this.special_premission.length; i++) {
-            if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-              this.isPremission = true
+      this.selecting = true;
+      var t = this;
+      this.$refs.selector.showSingleSelect(
+        this.admins,
+        this.nurse_id,
+        "选择上机护士",
+        "name",
+        "id",
+        function(select_id) {
+          t.nurse_id = select_id;
+        },
+        function() {
+          t.selecting = false;
+        }
+      );
+    },
+    select_puncture_nurse: function() {
+      if (this.record.id != 0) {
+        var creator = 0;
+        if (this.record.creator == 0) {
+          creator = this.record.start_nurse;
+        } else {
+          creator = this.record.creator;
+        }
+        if (this.$store.getters.user.user.id == creator || this.isPremission) {
+          this.selecting = true;
+          var t = this;
+          this.$refs.selector.showSingleSelect(
+            this.admins,
+            this.puncture_nurse_id,
+            "选择穿刺护士",
+            "name",
+            "id",
+            function(select_id) {
+              t.puncture_nurse_id = select_id;
+            },
+            function() {
+              t.selecting = false;
             }
+          );
+        } else {
+          return;
+        }
+      }
+      this.selecting = true;
+      var t = this;
+      this.$refs.selector.showSingleSelect(
+        this.admins,
+        this.puncture_nurse_id,
+        "选择穿刺护士",
+        "name",
+        "id",
+        function(select_id) {
+          t.puncture_nurse_id = select_id;
+        },
+        function() {
+          t.selecting = false;
+        }
+      );
+    },
+    open: function() {
+      this.selecting = false;
+      this.$refs.selector.hide();
+    }
+  },
+  watch: {
+    "record.id": function(val) {
+      if (val > 0) {
+        for (let i = 0; i < this.special_premission.length; i++) {
+          if (
+            this.$store.getters.user.user.id ==
+            this.special_premission[i].admin_user_id
+          ) {
+            this.isPremission = true;
           }
-          if (this.record.creator == 0) {
-            this.creator = this.record.start_nurse
-          } else {
-            this.creator = this.record.creator
-          }
-
-
+        }
+        if (this.record.creator == 0) {
+          this.creator = this.record.start_nurse;
+        } else {
+          this.creator = this.record.creator;
         }
       }
-
     }
-
   }
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-
-  .perform{
+.perform {
   text-align: center;
   font-size: 0.3rem;
   padding-top: 2rem;
-  .crew{
-  color: $pgh-color;
-  }
-  button{
-  background:$main-color;
-  color: #fff;
-  font-size: 0.3rem;
-  text-align:center;
-  width: 3rem;
-  height: 0.7rem;
-  line-height: 0.7rem;
-  border-radius:4px;
-  margin-top:10px;
+  .crew {
+    color: $pgh-color;
   }
+  button {
+    background: $main-color;
+    color: #fff;
+    font-size: 0.45rem;
+    text-align: center;
+    width: 3rem;
+    height: 1.2rem;
+    line-height: 1.2rem;
+    border-radius: 4px;
+    margin-top: 10px;
   }
+}
 </style>
 

src/pages/main/dialog/PlaneDialog.vue

@@ -1,58 +1,79 @@
 <template>
- <div>
+  <div>
     <div class="Dialog" v-show="!selecting">
-        <div class="DialogTit">
-            <span @click="close()" class="iconfont">&#xe6e9;</span>
-            <h1 class="name">透析下机</h1>
-            <span class="success" v-if="this.record.state == 1 || this.$store.getters.user.user.id != this.creator"></span>
-            <span class="success" @click="modify()" v-if="isPremission|| this.$store.getters.user.user.id == this.creator">修改</span>
+      <div class="DialogTit">
+        <span @click="close()" class="iconfont">&#xe6e9;</span>
+        <h1 class="name">透析下机</h1>
+        <span
+          class="success"
+          v-if="this.record.state == 1 || this.$store.getters.user.user.id != this.creator"
+        ></span>
+        <span
+          class="success"
+          @click="modify()"
+          v-if="isPremission|| this.$store.getters.user.user.id == this.creator"
+        >修改</span>
+      </div>
 
-        </div>
-
-        <div class="DialogContent ">
-          <div class="item" @click="select_nurse">
-            <h2 class="name">下机护士</h2>
-            <div class="content">
-              <span class="text" style="width: 100px">{{ nurse_id == 0 ? '' : admin_map[nurse_id].name }}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
+      <div class="DialogContent">
+        <div class="item" @click="select_nurse">
+          <h2 class="name">下机护士</h2>
+          <div class="content">
+            <span
+              class="text"
+              style="width: 100px"
+            >{{ nurse_id == 0 ? '' : admin_map[nurse_id].name }}</span>
+            <span class="iconfont">&#xe6f9;</span>
           </div>
+        </div>
 
-
-          <div class="item">
-            <h2 class="name">下机时间</h2>
-            <div class="content">
-              <span class="text" style="width: 100px"  @click="selectStartTimeAction">{{ end_time_str }}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
+        <div class="item">
+          <h2 class="name">下机时间</h2>
+          <div class="content">
+            <span
+              class="text"
+              style="width: 100px"
+              @click="selectStartTimeAction"
+            >{{ end_time_str }}</span>
+            <span class="iconfont">&#xe6f9;</span>
           </div>
+        </div>
 
-          <div class="perform">
-            <button @click="commitInfo" v-show="(record != null && record.id != '' && record.stage == 1)">执行下机</button>
-            <button :disabled="true" style="background-color:lightgray;" v-show="(record != null && record.id != '' && record.stage == 2)">已下机</button>
-            <button :disabled="true" style="background-color:lightgray;" v-show="record == null || record.id == ''">未上机</button>
-          </div>
+        <div class="perform">
+          <button
+            @click="commitInfo"
+            v-show="(record != null && record.id != '' && record.stage == 1)"
+          >执行下机</button>
+          <button
+            :disabled="true"
+            style="background-color:lightgray;"
+            v-show="(record != null && record.id != '' && record.stage == 2)"
+          >已下机</button>
+          <button
+            :disabled="true"
+            style="background-color:lightgray;"
+            v-show="record == null || record.id == ''"
+          >未上机</button>
         </div>
+      </div>
     </div>
     <two-menu ref="selector"></two-menu>
-   <mt-datetime-picker
-     ref="start_time_picker"
-     type="datetime"
-     @confirm="didSelectStartTime"
-     v-model="end_time"
-   ></mt-datetime-picker>
+    <mt-datetime-picker
+      ref="start_time_picker"
+      type="datetime"
+      @confirm="didSelectStartTime"
+      v-model="end_time"
+    ></mt-datetime-picker>
   </div>
 </template>
 
 <script>
-  import {
-    finish,PostModifyEndDialysis
-  } from "@/api/dialysis";
-  import { Toast } from 'vant';
-  import TwoMenu from './TwoMenu'
-  import { parseTime } from "@/utils";
+import { finish, PostModifyEndDialysis } from "@/api/dialysis";
+import { Toast } from "vant";
+import TwoMenu from "./TwoMenu";
+import { parseTime } from "@/utils";
 
-  export default {
+export default {
   name: "PlaneDialog",
   components: {
     TwoMenu
@@ -61,39 +82,45 @@
     return {
       selecting: false,
       end_time_str: "",
-      end_time:new Date(),
+      end_time: new Date(),
       nurse_id: 0,
-      isPremission:false,
-      creator:0,
-    }
+      isPremission: false,
+      creator: 0
+    };
   },
-  props:{
+  props: {
     patient_prop: {
-      type: Object,
+      type: Object
     },
     record: {
-      type: Object,
+      type: Object
     },
     admins: {
-      type: Array,
+      type: Array
     },
     admin_map: {
-      type: Object,
+      type: Object
     },
     special_premission: {
-      type: Array,
+      type: Array
     },
     last_monitor_record: {
-      type: Object,
+      type: Object
     }
-  },mounted() {
-      if(this.last_monitor_record.id == 0){
-        this.end_time_str = parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-      }else{
-        this.end_time_str = parseTime(this.last_monitor_record.operate_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-      }
-    },
-  created(){
+  },
+  mounted() {
+    if (this.last_monitor_record.id == 0) {
+      this.end_time_str =
+        parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    } else {
+      this.end_time_str =
+        parseTime(
+          this.last_monitor_record.operate_time,
+          "{y}-{m}-{d} {h}:{i}"
+        ) + ":00";
+    }
+  },
+  created() {
     var date = this.$route.query && this.$route.query.date;
     date *= 1000;
     var newDate = new Date(date);
@@ -106,92 +133,100 @@
       m = newDate.getMonth() + 1;
       d = newDate.getDate();
     }
-    this.record_date = y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
+    this.record_date =
+      y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
 
-    if (this.record == null || this.record.id == '') {
-      this.nurse_id = 0
+    if (this.record == null || this.record.id == "") {
+      this.nurse_id = 0;
     } else if (this.record.stage == 1) {
-      this.nurse_id = this.$store.getters.user.user.id
+      this.nurse_id = this.$store.getters.user.user.id;
     } else {
-      this.nurse_id = this.record.finish_nurse
+      this.nurse_id = this.record.finish_nurse;
     }
 
-    console.log("下机:"+this.nurse_id)
+    console.log("下机:" + this.nurse_id);
 
     if (this.record.id > 0) {
       for (let i = 0; i < this.special_premission.length; i++) {
-        if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-          this.isPremission = true
+        if (
+          this.$store.getters.user.user.id ==
+          this.special_premission[i].admin_user_id
+        ) {
+          this.isPremission = true;
         }
       }
     }
 
     if (this.record.id > 0) {
       if (this.record.finish_creator == 0) {
-        this.creator = this.record.finish_nurse
+        this.creator = this.record.finish_nurse;
       } else {
-        this.creator = this.record.finish_creator
+        this.creator = this.record.finish_creator;
       }
     }
-
-
   },
   methods: {
     set_last_monitor_record(monitor) {
-      this.last_monitor_record = monitor
-      this.end_time_str = parseTime(this.last_monitor_record.operate_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+      this.last_monitor_record = monitor;
+      this.end_time_str =
+        parseTime(
+          this.last_monitor_record.operate_time,
+          "{y}-{m}-{d} {h}:{i}"
+        ) + ":00";
     },
-    modify(){
-      let ParamsQuery = {}
-      ParamsQuery['id'] = this.record.id
-      ParamsQuery["nurse"] = this.nurse_id
-      ParamsQuery["end_time"] = this.end_time_str
+    modify() {
+      let ParamsQuery = {};
+      ParamsQuery["id"] = this.record.id;
+      ParamsQuery["nurse"] = this.nurse_id;
+      ParamsQuery["end_time"] = this.end_time_str;
       PostModifyEndDialysis(ParamsQuery).then(response => {
         if (response.data.state == 0) {
-          Toast.fail(response.data.msg)
-          return false
+          Toast.fail(response.data.msg);
+          return false;
         } else {
-          Toast.success('修改成功')
-          this.$emit('did_off', response.data.data.dialysis_order)
-          var record = this.record
+          Toast.success("修改成功");
+          this.$emit("did_off", response.data.data.dialysis_order);
+          var record = this.record;
           for (const key in response.data.data.dialysis_order) {
-            this.$set(record, key, response.data.data.dialysis_order[key])
+            this.$set(record, key, response.data.data.dialysis_order[key]);
           }
         }
-      })
+      });
     },
     didSelectStartTime: function(time) {
       this.end_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
     },
     selectStartTimeAction: function() {
       if (this.record.id != 0) {
-        if(this.record.end_time > 0){
-          var creator = 0
+        if (this.record.end_time > 0) {
+          var creator = 0;
           if (this.record.finish_creator == 0) {
-            creator = this.record.finish_nurse
+            creator = this.record.finish_nurse;
           } else {
-            creator = this.record.finish_creator
+            creator = this.record.finish_creator;
           }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.$refs.start_time_picker.open()
+          if (
+            this.$store.getters.user.user.id == creator ||
+            this.isPremission
+          ) {
+            this.$refs.start_time_picker.open();
           } else {
-            return
+            return;
           }
-        }else{
+        } else {
           this.$refs.start_time_picker.open();
         }
-      }else{
+      } else {
         this.$refs.start_time_picker.open();
       }
-
     },
-    commitInfo: function () {
-      Toast.loading({forbidClick: true, duration: 0})
-      let ParamsQuery = {}
-      ParamsQuery['patient'] = this.patient_prop.id
-      ParamsQuery['record_date'] = this.record_date
-      ParamsQuery["nurse"] = this.nurse_id
-      ParamsQuery["end_time"] = this.end_time_str
+    commitInfo: function() {
+      Toast.loading({ forbidClick: true, duration: 0 });
+      let ParamsQuery = {};
+      ParamsQuery["patient"] = this.patient_prop.id;
+      ParamsQuery["record_date"] = this.record_date;
+      ParamsQuery["nurse"] = this.nurse_id;
+      ParamsQuery["end_time"] = this.end_time_str;
 
       finish(ParamsQuery).then(response => {
         if (response.data.state == 0) {
@@ -199,10 +234,10 @@
           return false;
         } else {
           Toast.success("下机成功");
-          this.$emit('did_off', response.data.data.assessmentAfterDislysis);
-          var record = this.record
+          this.$emit("did_off", response.data.data.assessmentAfterDislysis);
+          var record = this.record;
           for (const key in response.data.data.dialysisOrder) {
-            this.$set(record, key, response.data.data.dialysisOrder[key])
+            this.$set(record, key, response.data.data.dialysisOrder[key]);
             // record[key] = response.data.data.dialysisOrder[key]
           }
           // console.log(this.record)
@@ -210,90 +245,108 @@
       });
     },
     close: function() {
-      this.$emit('close')
+      this.$emit("close");
     },
     select_nurse: function() {
-      if (this.record != null && this.record.id != '') {
-        if(this.record.stage == 1){
-          this.selecting = true
-          var t = this
-          this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, "选择下机护士", "name", "id", function(select_id) {
-            console.log("nurse id: ", select_id)
-            t.nurse_id = select_id
-          }, function() {
-            t.selecting = false
-          })
-        }else{
-          var creator = 0
+      if (this.record != null && this.record.id != "") {
+        if (this.record.stage == 1) {
+          this.selecting = true;
+          var t = this;
+          this.$refs.selector.showSingleSelect(
+            this.admins,
+            this.nurse_id,
+            "选择下机护士",
+            "name",
+            "id",
+            function(select_id) {
+              console.log("nurse id: ", select_id);
+              t.nurse_id = select_id;
+            },
+            function() {
+              t.selecting = false;
+            }
+          );
+        } else {
+          var creator = 0;
           if (this.record.finish_creator == 0) {
-            creator = this.record.finish_nurse
+            creator = this.record.finish_nurse;
           } else {
-            creator = this.record.finish_creator
+            creator = this.record.finish_creator;
           }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.selecting = true
-            var t = this
-            this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, "选择下机护士", "name", "id", function(select_id) {
-              console.log("nurse id: ", select_id)
-              t.nurse_id = select_id
-            }, function() {
-              t.selecting = false
-            })
+          if (
+            this.$store.getters.user.user.id == creator ||
+            this.isPremission
+          ) {
+            this.selecting = true;
+            var t = this;
+            this.$refs.selector.showSingleSelect(
+              this.admins,
+              this.nurse_id,
+              "选择下机护士",
+              "name",
+              "id",
+              function(select_id) {
+                console.log("nurse id: ", select_id);
+                t.nurse_id = select_id;
+              },
+              function() {
+                t.selecting = false;
+              }
+            );
           } else {
-            return
+            return;
           }
         }
-
       }
     },
-    open:function(){
+    open: function() {
       this.selecting = false;
       this.$refs.selector.hide();
     }
-  }, watch: {
-      'record.stage': function (val) {
-        if (val == 2) {
-          for (let i = 0; i < this.special_premission.length; i++) {
-            if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-              this.isPremission = true
-            }
-          }
-          if (this.record.finish_nurse == 0) {
-            this.creator = this.record.finish_nurse
-          } else {
-            this.creator = this.record.finish_creator
+  },
+  watch: {
+    "record.stage": function(val) {
+      if (val == 2) {
+        for (let i = 0; i < this.special_premission.length; i++) {
+          if (
+            this.$store.getters.user.user.id ==
+            this.special_premission[i].admin_user_id
+          ) {
+            this.isPremission = true;
           }
         }
-
-        console.log(this.creator)
-        console.log(this.$store.getters.user.user.id)
-
-
+        if (this.record.finish_nurse == 0) {
+          this.creator = this.record.finish_nurse;
+        } else {
+          this.creator = this.record.finish_creator;
+        }
       }
 
+      console.log(this.creator);
+      console.log(this.$store.getters.user.user.id);
     }
+  }
 };
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-
-.perform{
+.perform {
   text-align: center;
   font-size: 0.3rem;
   padding-top: 2rem;
-  .crew{
+  .crew {
     color: $pgh-color;
   }
-  button{
-    background:$main-color;
+  button {
+    background: $main-color;
     color: #fff;
-    font-size: 0.3rem;
-    text-align:center;
+    font-size: 0.45rem;
+    text-align: center;
     width: 3rem;
-    height: 0.7rem;
-    line-height: 0.7rem;
-    border-radius:4px;
-    margin-top:10px;
+    height: 1.2rem;
+    line-height: 1.2rem;
+    border-radius: 4px;
+    margin-top: 10px;
   }
 }
 </style>

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1897,7 +1897,7 @@
     line-height: 0.85rem;
     border-radius:5px; 
     color: #fff;
-    margin-right: -3rem;
+    margin-right: -3.5rem;
   }
   .newName{
     margin-right: -3rem;

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -34,7 +34,7 @@
               <label>开嘱时间 {{record_date_str}}</label>
             </div>
           </div>
-          <table class="table">
+          <!-- <table class="table">
             <tr>
               <th width="26%">医嘱内容</th>
               <th width="20%">药品规格</th>
@@ -82,12 +82,20 @@
                     v-if="subdrug.single_dose"
                   >{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span>
                 </td>
-                <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
+                
                 <td></td>
                 <td></td>
               </tr>
             </template>
-          </table>
+          </table>-->
+          <el-table :data="tableData" border style="width: 100%" @row-click="click">
+            <el-table-column fixed prop="date" label="医嘱内容" width="150"></el-table-column>
+            <el-table-column prop="name" label="药品规格" width="120"></el-table-column>
+            <el-table-column prop="province" label="开药数量" width="120"></el-table-column>
+            <el-table-column prop="city" label="单次用量" width="120"></el-table-column>
+            <el-table-column prop="address" label="给药途径" width="300"></el-table-column>
+            <el-table-column prop="zip" label="执行频率" width="120"></el-table-column>
+          </el-table>
         </div>
       </div>
     </div>
@@ -204,7 +212,41 @@ export default {
 
       selecting_advice_index: -1,
       selecting_subdrug_index: -1,
-      advices: []
+      advices: [],
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "123",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "456",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "789",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "565345",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        }
+      ]
     };
   },
   mounted() {
@@ -213,6 +255,11 @@ export default {
       parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
   },
   methods: {
+    click(row, column, event) {
+      console.log(row);
+      console.log(column);
+      console.log(event);
+    },
     backAction: function() {
       this.$emit("back-action");
     },

src/pages/main/dialysis/DialysisTab.vue

@@ -57,7 +57,7 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .fixedBox {
   padding-top: 38px;
-  background: #fff;
+  // background: #fff;
   min-height: calc(100vh - 64px);
   // @media only screen and (min-width: 376px) and (max-width: 737px) {
   //   padding-top: 46px;
@@ -71,7 +71,7 @@ export default {
   .nav {
     border-bottom: 1px #e5e5e5 solid;
     position: fixed;
-    top: 45px;
+    top: 40px;
     @media only screen and (min-width: 768px) {
       top: 63px;
     }
@@ -85,9 +85,8 @@ export default {
     z-index: 66;
     left: 0;
     background: #fff;
-    background: #fff;
     ul {
-      width: 60%;
+      width: 80%;
       margin: 0 auto;
       @include box-sizing;
       @include display-flex;
@@ -95,7 +94,7 @@ export default {
       @include text-align;
       @include justify-content-between;
       li {
-        font-size: 0.32rem;
+        font-size: 0.45rem;
         float: left;
         color: $pgh-color;
         padding: 0.3rem 0;

src/pages/main/dialysis/InspectionItemTable.vue

@@ -300,7 +300,7 @@ export default {
 .van-list {
   background: #fff;
   min-height: calc(100vh - 178px);
-  margin-top: 66px;
+  margin-top: 62px;
   // @media only screen and (min-width: 376px) and (max-width: 668px) {
   //   margin-top: 84px;
   // }

src/pages/main/dialysis/MissionTable.vue

@@ -210,9 +210,9 @@ export default {
     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width: 58%;
+    width: 80%;
     margin: 0 auto;
-    font-size: 0.32rem;
+    font-size: 0.45rem;
     color: $pgh-color;
     li {
       @include display-flex;

src/pages/main/dialysis/RecordTable.vue

@@ -91,74 +91,60 @@
       </div>-->
       <el-table :data="tableDate" border style="width: 100%">
         <el-table-column fixed prop="date" label="透析日期" width="100" align="center">
-             <template slot-scope="scope">
-                {{parseTime(scope.row.dialysis_date, "{y}-{m}-{d}")}}
-             </template>
+          <template slot-scope="scope">{{parseTime(scope.row.dialysis_date, "{y}-{m}-{d}")}}</template>
         </el-table-column>
         <el-table-column prop="name" label="班次" width="100" align="center">
-          <template slot-scope="scope">
-            {{scheduleType(scope.row.schedule_type)}}
-          </template>
+          <template slot-scope="scope">{{scheduleType(scope.row.schedule_type)}}</template>
         </el-table-column>
         <el-table-column prop="province" label="分区-机号" width="120" align="center">
-            <template slot-scope="scope">
-               {{scope.row.partition_name}} - {{scope.row.device_number}}
-            </template>
+          <template slot-scope="scope">{{scope.row.partition_name}} - {{scope.row.device_number}}</template>
         </el-table-column>
         <el-table-column prop="city" label="透析模式" width="120" align="center">
-            <template slot-scope="scope">
-              {{modeName(scope.row.prescription.mode_id)}}
-            </template>
+          <template slot-scope="scope">{{modeName(scope.row.prescription.mode_id)}}</template>
         </el-table-column>
         <el-table-column prop="address" label="透析时长(h)" width="100" align="center">
-            <template slot-scope="scope">
-                 {{scope.row.prescription.dialysis_duration?scope.row.prescription.dialysis_duration:""}}
-            </template>
+          <template
+            slot-scope="scope"
+          >{{scope.row.prescription.dialysis_duration?scope.row.prescription.dialysis_duration:""}}</template>
         </el-table-column>
         <el-table-column prop="date" label="干体重(kg)" width="100" align="center">
-          <template slot-scope="scope">
-              {{scope.row.prescription.dry_weight?scope.row.prescription.dry_weight:""}}
-          </template>
+          <template
+            slot-scope="scope"
+          >{{scope.row.prescription.dry_weight?scope.row.prescription.dry_weight:""}}</template>
         </el-table-column>
         <el-table-column prop="name" label="透前体重(kg)" width="100" align="center">
-          <template slot-scope="scope">
-              {{scope.row.predialysis_evaluation.weight_before?scope.row.predialysis_evaluation.weight_before:""}}
-          </template>
+          <template
+            slot-scope="scope"
+          >{{scope.row.predialysis_evaluation.weight_before?scope.row.predialysis_evaluation.weight_before:""}}</template>
         </el-table-column>
         <el-table-column prop="province" label="透后体重(kg)" width="120" align="center">
-          <template slot-scope="scope">
-               {{scope.row.assessment_after_dislysis.systolic_blood_pressure?scope.row.assessment_after_dislysis.systolic_blood_pressure:""}}
-          </template>
+          <template
+            slot-scope="scope"
+          >{{scope.row.assessment_after_dislysis.systolic_blood_pressure?scope.row.assessment_after_dislysis.systolic_blood_pressure:""}}</template>
         </el-table-column>
         <el-table-column prop="city" label="透前血压(mmHg)" width="120" align="center">
-          <template slot-scope="scope">
-           {{scope.row.predialysis_evaluation.systolic_blood_pressure?scope.row.predialysis_evaluation.systolic_blood_pressure:""}}
-          </template>
+          <template
+            slot-scope="scope"
+          >{{scope.row.predialysis_evaluation.systolic_blood_pressure?scope.row.predialysis_evaluation.systolic_blood_pressure:""}}</template>
         </el-table-column>
         <el-table-column prop="address" label="透后血压(mmHg)" width="100" align="center">
-            <template slot-scope="scope">
-              {{scope.row.assessment_after_dislysis.systolic_blood_pressure?scope.row.assessment_after_dislysis.systolic_blood_pressure:""}}
-            </template>
+          <template
+            slot-scope="scope"
+          >{{scope.row.assessment_after_dislysis.systolic_blood_pressure?scope.row.assessment_after_dislysis.systolic_blood_pressure:""}}</template>
         </el-table-column>
         <el-table-column prop="date" label="超滤总量(L)" width="100" align="center">
-          <template slot-scope="scope">
-             {{scope.row.predialysis_evaluation.ultrafiltration_amount?scope.row.predialysis_evaluation.ultrafiltration_amount:""}}
-          </template>
+          <template
+            slot-scope="scope"
+          >{{scope.row.predialysis_evaluation.ultrafiltration_amount?scope.row.predialysis_evaluation.ultrafiltration_amount:""}}</template>
         </el-table-column>
         <el-table-column prop="name" label="抗凝剂种类 首剂/维持/总量" width="100" align="center">
-           <template slot-scope="scope">
-              {{setAnticoagulantsConfit(scope.row.prescription)}}
-           </template>
+          <template slot-scope="scope">{{setAnticoagulantsConfit(scope.row.prescription)}}</template>
         </el-table-column>
         <el-table-column prop="province" label="治疗护士" width="120" align="center">
-             <template slot-scope="scope">
-               {{getName(scope.row.treatment_summary.zl_nurse)}}
-             </template>
+          <template slot-scope="scope">{{getName(scope.row.treatment_summary.zl_nurse)}}</template>
         </el-table-column>
         <el-table-column prop="city" label="治疗医生" width="120" align="center">
-            <template slot-scope="scope">
-              {{getName(scope.row.treatment_summary.zl_doctor)}}
-            </template>
+          <template slot-scope="scope">{{getName(scope.row.treatment_summary.zl_doctor)}}</template>
         </el-table-column>
       </el-table>
     </van-list>
@@ -182,69 +168,69 @@
 </template>
 
 <script>
-import { Popover } from 'vux'
-import { parseTime } from '@/utils'
-import { getRecordList } from '@/api/patient'
-import { fetchAllDoctorAndNurse, fetchAllAdminUsers } from '@/api/doctor'
+import { Popover } from "vux";
+import { parseTime } from "@/utils";
+import { getRecordList } from "@/api/patient";
+import { fetchAllDoctorAndNurse, fetchAllAdminUsers } from "@/api/doctor";
 
 export default {
-  name: 'LongTable',
-  created () {
-    var date = new Date()
-    var year = date.getFullYear()
-    var month = date.getMonth()
-    var day = date.getDate()
+  name: "LongTable",
+  created() {
+    var date = new Date();
+    var year = date.getFullYear();
+    var month = date.getMonth();
+    var day = date.getDate();
     if (month < 10) {
-      month = '0' + month
+      month = "0" + month;
     }
     if (day < 10) {
-      day = '0' + day
+      day = "0" + day;
     }
-    var nowDate = year + '-' + month + '-' + day
+    var nowDate = year + "-" + month + "-" + day;
 
-    this.startTime = new Date(nowDate)
+    this.startTime = new Date(nowDate);
 
-    this.modeOptions = this.$store.getters.treatment_mode
+    this.modeOptions = this.$store.getters.treatment_mode;
 
-    this.modeOptions['0'] = {
+    this.modeOptions["0"] = {
       id: 0,
-      name: '全部'
-    }
+      name: "全部"
+    };
 
     // console.log(this.modeOptions);
-    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
     this.queryParams.start_time = this.parseTime(
       this.startTime.getTime() / 1000,
-      '{y}-{m}-{d}'
-    )
+      "{y}-{m}-{d}"
+    );
     this.queryParams.end_time = this.parseTime(
       new Date().getTime() / 1000,
-      '{y}-{m}-{d}'
-    )
-    this.queryParams.patient_id = this.$route.query.patient_id
-    this.queryParams.page = this.queryParams.page + 1
-    this.queryParams.limit = 15
-    this.tableDate = []
+      "{y}-{m}-{d}"
+    );
+    this.queryParams.patient_id = this.$route.query.patient_id;
+    this.queryParams.page = this.queryParams.page + 1;
+    this.queryParams.limit = 15;
+    this.tableDate = [];
     // console.log(this.queryParams);
 
     getRecordList(this.queryParams).then(response => {
       if (response.data.state == 0) {
-        return false
+        return false;
       } else {
         if (response.data.data.records.length == 0) {
         } else {
           for (let i = 0; i < response.data.data.records.length; i++) {
-            this.tableDate.push(response.data.data.records[i])
+            this.tableDate.push(response.data.data.records[i]);
           }
         }
       }
-    })
-    this.fetchAllAdminUsers()
-    this.fetchAllDoctorAndNurse()
+    });
+    this.fetchAllAdminUsers();
+    this.fetchAllDoctorAndNurse();
   },
-  data () {
+  data() {
     return {
-      mode_id: '',
+      mode_id: "",
       loading: false,
       finished: false,
       startTime: new Date(),
@@ -257,230 +243,230 @@ export default {
       adminUserOptions: null,
 
       queryParams: {
-        mode_id: '',
-        start_time: '',
-        end_time: '',
+        mode_id: "",
+        start_time: "",
+        end_time: "",
         page: 0,
         patient_id: 0,
         limit: 15
       },
 
       tableDate: []
-    }
+    };
   },
   methods: {
-    modeName (mode_id) {
-      return typeof this.modeOptions[mode_id] !== 'undefined' &&
-        typeof this.modeOptions[mode_id].name !== 'undefined'
+    modeName(mode_id) {
+      return typeof this.modeOptions[mode_id] !== "undefined" &&
+        typeof this.modeOptions[mode_id].name !== "undefined"
         ? this.modeOptions[mode_id].name
-        : ''
+        : "";
     },
-    modeNameOther (mode_id) {
-      return typeof this.modeOptions[mode_id] !== 'undefined' &&
-        typeof this.modeOptions[mode_id].name !== 'undefined'
+    modeNameOther(mode_id) {
+      return typeof this.modeOptions[mode_id] !== "undefined" &&
+        typeof this.modeOptions[mode_id].name !== "undefined"
         ? this.modeOptions[mode_id].name
-        : '全部'
+        : "全部";
     },
 
-    parseTime (time, layout) {
-      return parseTime(time, layout)
+    parseTime(time, layout) {
+      return parseTime(time, layout);
     },
-    openStartPicker: function () {
-      this.$refs.start_date_picker.open()
+    openStartPicker: function() {
+      this.$refs.start_date_picker.open();
     },
-    openEndPicker: function () {
-      this.$refs.end_date_picker.open()
+    openEndPicker: function() {
+      this.$refs.end_date_picker.open();
     },
-    handleStartDateConfirm: function (val) {
+    handleStartDateConfirm: function(val) {
       this.queryParams.start_time = this.parseTime(
         this.startTime / 1000,
-        '{y}-{m}-{d}'
-      )
+        "{y}-{m}-{d}"
+      );
       this.queryParams.end_time = this.parseTime(
         this.endTime / 1000,
-        '{y}-{m}-{d}'
-      )
-      this.queryParams.page = 1
-      this.queryParams.limit = 15
+        "{y}-{m}-{d}"
+      );
+      this.queryParams.page = 1;
+      this.queryParams.limit = 15;
 
-      this.getRecordList(this.queryParams)
+      this.getRecordList(this.queryParams);
     },
-    handleEndDateConfirm: function (val) {
+    handleEndDateConfirm: function(val) {
       this.queryParams.start_time = this.parseTime(
         this.startTime / 1000,
-        '{y}-{m}-{d}'
-      )
+        "{y}-{m}-{d}"
+      );
       this.queryParams.end_time = this.parseTime(
         this.endTime / 1000,
-        '{y}-{m}-{d}'
-      )
-      this.queryParams.page = 1
-      this.queryParams.limit = 15
-      this.getRecordList(this.queryParams)
+        "{y}-{m}-{d}"
+      );
+      this.queryParams.page = 1;
+      this.queryParams.limit = 15;
+      this.getRecordList(this.queryParams);
     },
-    getRecordList: function (val) {
-      this.tableDate = []
+    getRecordList: function(val) {
+      this.tableDate = [];
       getRecordList(val).then(response => {
         if (response.data.state == 0) {
-          return false
+          return false;
         } else {
           if (response.data.data.records.length == 0) {
           } else {
             for (let i = 0; i < response.data.data.records.length; i++) {
-              this.tableDate.push(response.data.data.records[i])
+              this.tableDate.push(response.data.data.records[i]);
             }
           }
         }
-      })
+      });
     },
-    onLoad () {
+    onLoad() {
       this.queryParams.start_time = this.parseTime(
         this.startTime.getTime() / 1000,
-        '{y}-{m}-{d}'
-      )
+        "{y}-{m}-{d}"
+      );
       this.queryParams.end_time = this.parseTime(
         this.endTime.getTime() / 1000,
-        '{y}-{m}-{d}'
-      )
-      this.queryParams.patient_id = this.$route.query.patient_id
-      this.queryParams.page = this.queryParams.page + 1
-      this.queryParams.limit = 15
+        "{y}-{m}-{d}"
+      );
+      this.queryParams.patient_id = this.$route.query.patient_id;
+      this.queryParams.page = this.queryParams.page + 1;
+      this.queryParams.limit = 15;
 
       getRecordList(this.queryParams).then(response => {
         if (response.data.state == 0) {
-          this.finished = true
-          this.loading = false
-          return false
+          this.finished = true;
+          this.loading = false;
+          return false;
         } else {
           if (response.data.data.records.length == 0) {
-            this.finished = true
-            this.loading = false
+            this.finished = true;
+            this.loading = false;
           } else {
             for (let i = 0; i < response.data.data.records.length; i++) {
-              this.tableDate.push(response.data.data.records[i])
+              this.tableDate.push(response.data.data.records[i]);
             }
-            this.loading = false
+            this.loading = false;
           }
         }
-      })
+      });
     },
-    scheduleType (scheduleType) {
-      var typeName = ''
+    scheduleType(scheduleType) {
+      var typeName = "";
       switch (scheduleType) {
         case 1:
-          typeName = '上午'
-          break
+          typeName = "上午";
+          break;
         case 2:
-          typeName = '下午'
-          break
+          typeName = "下午";
+          break;
         case 3:
-          typeName = '晚上'
-          break
+          typeName = "晚上";
+          break;
         default:
-          break
+          break;
       }
-      return typeName
+      return typeName;
     },
-    setAnticoagulantsConfit: function (prescription) {
+    setAnticoagulantsConfit: function(prescription) {
       if (
         typeof this.anticoagulantsConfit[prescription.anticoagulant] ===
-        'undefined'
+        "undefined"
       ) {
-        return ''
+        return "";
       } else {
         if (this.anticoagulantsConfit[prescription.anticoagulant].shouji != 1) {
-          return this.anticoagulantsConfit[prescription.anticoagulant].name
+          return this.anticoagulantsConfit[prescription.anticoagulant].name;
         } else {
           return (
             this.anticoagulantsConfit[prescription.anticoagulant].name +
-            '/' +
+            "/" +
             prescription.anticoagulant_shouji +
-            '/' +
+            "/" +
             prescription.anticoagulant_weichi +
-            '/' +
+            "/" +
             prescription.anticoagulant_zongliang
-          )
+          );
         }
       }
     },
-    getName: function (id) {
+    getName: function(id) {
       if (id <= 0) {
-        return ''
+        return "";
       }
-      var name = ''
+      var name = "";
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === 'undefined'
+        typeof this.adminUserOptions.length === "undefined"
       ) {
-        return name
+        return name;
       }
-      var leng = this.adminUserOptions.length
+      var leng = this.adminUserOptions.length;
       if (leng == 0) {
-        return name
+        return name;
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name
-          break
+          name = this.adminUserOptions[index].name;
+          break;
         }
       }
-      return name
+      return name;
     },
-    fetchAllAdminUsers () {
+    fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users
-          var alen = this.adminUserOptions.length
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
-              this.doctorOptions.push(this.adminUserOptions[index])
+              this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      })
+      });
     },
-    fetchAllDoctorAndNurse () {
+    fetchAllDoctorAndNurse() {
       fetchAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
-          this.doctorOptions = response.data.data.doctors
+          this.doctorOptions = response.data.data.doctors;
         }
-      })
+      });
     },
-    itemClick: function (val) {
-      if (val == '0') {
-        this.mode_id = '0'
+    itemClick: function(val) {
+      if (val == "0") {
+        this.mode_id = "0";
       } else {
-        this.mode_id = val
+        this.mode_id = val;
       }
-      this.queryParams.mode_id = val
+      this.queryParams.mode_id = val;
       this.queryParams.start_time = this.parseTime(
         this.startTime / 1000,
-        '{y}-{m}-{d}'
-      )
+        "{y}-{m}-{d}"
+      );
       this.queryParams.end_time = this.parseTime(
         this.endTime / 1000,
-        '{y}-{m}-{d}'
-      )
-      this.queryParams.page = 1
-      this.queryParams.limit = 15
-      this.getRecordList(this.queryParams)
+        "{y}-{m}-{d}"
+      );
+      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',
+        path: "/details",
         query: {
           patient_id: val.patient_id,
           date: val.dialysis_date
         }
-      })
+      });
     }
   },
   components: {
     Popover
   }
-}
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
@@ -491,9 +477,9 @@ export default {
     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width: 88%;
+    width: 98%;
     margin: 0 auto;
-    font-size: 0.32rem;
+    font-size: 0.4rem;
     color: $pgh-color;
     li {
       @include display-flex;

src/pages/main/records/CaseHistory.vue

@@ -77,7 +77,7 @@ export default {
   background: #fff;
   background: #fff;
   @media only screen and (max-width: 767px) {
-    top: 45px !important;
+    top: 40px !important;
   }
   // @media only screen and (min-width: 376px) and (max-width: 668px) {
   //   top: 50px !important;
@@ -100,7 +100,7 @@ export default {
     @include text-align;
     @include justify-content-between;
     li {
-      font-size: 0.32rem;
+      font-size: 0.45rem;
       float: left;
       color: $pgh-color;
       padding: 0.3rem 0;

src/pages/main/today/TodayTab.vue

@@ -1591,7 +1591,7 @@ export default {
   width: 20px;
   line-height: 18px;
   text-align: center;
-  font-size: 0.8em;
+  font-size: 0.45rem;
   border-radius: 20px;
   color: #fff;
   background: #f56c6c;
@@ -1605,7 +1605,7 @@ export default {
 }
 </style>
 <style lang="scss">
-.el-table::before{
+.el-table::before {
   z-index: 0;
 }
 </style>

src/pages/monitoring/index.vue

@@ -633,6 +633,13 @@ export default {
   .el-input__icon {
     line-height: 1rem;
     font-size: 0.45rem;
+    margin-top: 0.02rem;
+    padding-left: 0.1rem;
+  }
+  .el-input__prefix {
+    @media only screen and (min-width: 768px) {
+      left: 10px;
+    }
   }
 }
 

src/pages/personal/index.vue

@@ -67,7 +67,7 @@
           <span class="out" @click="logout">退出登录</span>
         </div>
       </div>-->
-      <div class="myTitle">我的</div>
+      <!-- <div class="myTitle">我的</div> -->
       <div class="mybanner">
         <img class="bannerOne" src="../../assets/my/myBanner.png" alt />
         <div class="avatar">
@@ -277,7 +277,6 @@ export default {
   }
   .mybanner {
     height: 30%;
-    margin-top: -1px;
     position: relative;
     .bannerOne {
       position: absolute;

src/styles/style.scss

@@ -86,7 +86,7 @@ body {
         font-size: 0.34rem;
         line-height: 0.62rem;
         float: left;
-        width: 5.2rem;
+        width: 5rem;
         @media only screen and (min-width: 376px) and (max-width: 413px) {
           width: 4.2rem;
         }
@@ -208,16 +208,16 @@ body {
   @include justify-content-around;
   background: #fff;
   span {
-    height: 0.6rem;
-    line-height: 0.6rem;
+    height: 0.8rem;
+    line-height: 0.8rem;
     background: #fff;
-    border-radius: 50px;
+    border-radius: 5px;
     border: 1px $border-color solid;
     display: inline-block;
     @include text-align;
     margin: 0.25rem 0;
     color: #34495e;
-    font-size: 0.34rem;
+    font-size: 0.36rem;
     padding: 0 0.3rem;
   }
   .forbid {
@@ -432,7 +432,7 @@ body {
         // }
       }
       .back {
-        font-size: 0.36rem;
+        font-size: 0.45rem;
         color: $main-color;
         @include display-flex;
         @include align-items-center;
@@ -441,6 +441,7 @@ body {
           font-size: 0.5rem;
           font-weight: 700;
           color: $main-color;
+          margin-top: 0.06rem;
         }
       }
       .name {
@@ -628,7 +629,7 @@ body {
 }
 
 .mint-datetime-action {
-  font-size: 0.36rem;
+  font-size: 0.45rem;
 }
 
 .picker-item {
@@ -816,11 +817,11 @@ body {
   @include display-flex;
   @include align-items-center;
   @include text-align;
-  font-size: 0.36rem;
+  font-size: 0.45rem;
   .back {
     // color: $main-color;
     color: #fff;
-    margin-right: 0.87rem;
+    margin-right: 0.4rem;
     .iconfont {
       // color: $main-color;
       color: #fff;