样式更改

src/pages/advice/AdvicePage.vue

@@ -92,6 +92,7 @@ export default {
   // border-bottom: 1px #e5e5e5 solid;
   display: flex;
   align-items: center;
+  background: #258ffc;
 }
 .title {
   font-size: 0.34rem;

src/pages/advice/DialysisAdviceTable.vue

@@ -533,8 +533,11 @@ export default {
   // @media only screen and (max-width: 415px) {
   //   top: 38px !important;
   // }
-  @media only screen and (min-width: 376px) and (max-width: 812px) {
-    top: 38px !important;
+  // @media only screen and (min-width: 376px) and (max-width: 812px) {
+  //   top: 38px !important;
+  // }
+  @media only screen and (min-width: 768px) {
+    top: 80px !important;
   }
   ul {
     @include display-flex;
@@ -551,10 +554,11 @@ export default {
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
-      padding: 0.3rem 0;
+      padding: 0 0 0.3rem;
       font-size: 0.45rem;
       .iconfont {
         margin: 0 0.1rem;
+        color: #fff;
       }
       .line {
         background: #a8b3ba;
@@ -568,14 +572,17 @@ export default {
 }
 .DialysisAdvice {
   padding-top: 85px;
-  background: #fff;
+  // background: #fff;
   min-height: calc(100vh - 2px);
   // @media only screen and (max-width: 812px) {
   //   padding-top: 70px !important;
   // }
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
-    padding-top: 118px !important;
+  @media only screen and (min-width: 768px) {
+    padding-top: 130px !important;
   }
+  // @media only screen and (min-width: 813px) and (max-width: 1024px) {
+  //   padding-top: 118px !important;
+  // }
 }
 
 .advice_content {
@@ -592,9 +599,9 @@ export default {
 }
 </style>
 <style lang="scss">
-.el-table {
-  margin-top: 64px;
-}
+// .el-table {
+//   margin-top: 64px;
+// }
 .el-table td {
   padding: 0;
 }

src/pages/home/login.vue

@@ -26,7 +26,7 @@
             :class="loginDisable ? 'disableLoginBtn' : ''"
             :disabled="loginDisable"
           >登录</button>
-          <div class="newForget">忘记密码</div>
+          <div class="newForget" @click="to()">忘记密码</div>
           <!-- </router-link> -->
           <!-- <div class="forget">
           <a href="">免密码登录</a>
@@ -103,6 +103,9 @@ export default {
           });
         }
       });
+    },
+    to: function() {
+      this.$router.push({ path: "/forgetPassword" });
     }
   }
 };

src/pages/layout/SideBar.vue

@@ -56,18 +56,18 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .redpoint {
   display: inline-block;
-  height: 20px;
-  width: 20px;
-  line-height: 20px;
+  height: 30px;
+  width: 30px;
+  line-height: 30px;
   text-align: center;
-  font-size: 0.74em;
+  font-size: 0.8em;
   border-radius: 20px;
   color: #fff;
   background: #f56c6c;
   position: absolute;
-  top: -5px;
-  right: -15px;
-  @media only screen and (max-width: 812px) {
+  top: -1px;
+  right: -24px;
+  @media only screen and (max-width: 767px) {
     height: 16px;
     width: 16px;
     line-height: 16px;
@@ -122,8 +122,9 @@ export default {
           display: inline-block;
           padding: 0;
           margin: 0;
-          @media only screen and (min-width: 813px) {
+          @media only screen and (min-width: 768px) {
             display: flex;
+            align-items: center;
           }
           p {
             font-size: 0.32rem;

src/pages/main/DetailsPage.vue

@@ -220,6 +220,7 @@ export default {
   bottom: 2.25rem;
   font-size: 0.45rem;
   text-align: center;
+
   p {
     width: 30px;
     text-align: center;
@@ -229,9 +230,9 @@ export default {
     //   width: 40px !important;
     //   margin: 11px auto 0;
     // }
-    @media only screen and (min-width: 812px) {
-      width: 40px !important;
-      margin: 11px auto 0;
+    @media only screen and (min-width: 768px) {
+      width: 50px;
+      margin: 14px auto 0;
     }
   }
 }

src/pages/main/DialysisArea.vue

@@ -521,9 +521,9 @@ export default {
 }
 .mint-datetime-action {
   line-height: 60px;
-  font-size: 0.34rem;
+  font-size: 0.45rem;
   @media only screen and (max-width: 812px) {
-    line-height: 30px !important;
+    line-height: 40px !important;
   }
 }
 </style>

src/pages/main/PatientBox.vue

@@ -395,19 +395,19 @@ export default {
 }
 .redpoint {
   display: inline-block;
-  height: 20px;
-  width: 20px;
-  line-height: 18px;
+  height: 30px;
+  width: 30px;
+  line-height: 26px;
   text-align: center;
   font-size: 0.8em;
   border-radius: 20px;
   color: #fff;
   background: #f56c6c;
   position: absolute;
-  top: -8px;
-  left: 0.7rem;
+  top: -6px;
+  left: 0.6rem;
   border: 1px solid #fff;
-  @media only screen and (max-width: 812px) {
+  @media only screen and (max-width: 767px) {
     height: 16px;
     width: 16px;
     line-height: 15px;

src/pages/main/RecordPage.vue

@@ -54,6 +54,7 @@
           >搜索</van-button>
         </van-field>-->
         <el-input
+          class="newInput"
           prefix-icon="el-icon-search"
           v-model="search_input"
           ref="search_field"
@@ -190,7 +191,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .top_row {
   // height: 50px;
   font-size: 0.3rem;
@@ -203,8 +204,8 @@ export default {
   // align-items: center;
   background: #258ffc;
   .floatLeft {
-    line-height: 30px;
-    height: 30px;
+    line-height: 1rem;
+    height: 1rem;
   }
   .search {
     float: right;
@@ -258,27 +259,27 @@ export default {
 
 .redpoint {
   display: inline-block;
-  height: 20px;
-  width: 20px;
-  line-height: 18px;
+  height: 30px;
+  width: 30px;
+  line-height: 26px;
   text-align: center;
   font-size: 0.8em;
   border-radius: 20px;
   color: #fff;
   background: #f56c6c;
   position: absolute;
-  top: -8px;
+  top: -6px;
   right: -8px;
   border: 1px solid #fff;
-  @media only screen and (max-width: 812px) {
+  @media only screen and (max-width: 767px) {
     height: 16px;
     width: 16px;
     line-height: 14px;
   }
 }
 .box {
-  height: 30px;
-  margin-top: 8px;
+  height: 1rem;
+  margin-top: 0.26rem;
   background: #258ffc;
 }
 .head {
@@ -309,23 +310,7 @@ export default {
     color: #258ffc;
   }
 }
-.el-input {
-  height: 100%;
-  width: 85%;
-  float: left;
-}
-.el-input__inner {
-  height: 100%;
-  line-height: 1rem;
-  width: 100%;
-  border-radius: 30px;
-  border: none;
-  font-size: 0.45rem;
-}
-.el-input__icon {
-  line-height: 1rem;
-  font-size: 0.45rem;
-}
+
 .add {
   width: 1.8rem;
   height: 1.8rem;
@@ -345,9 +330,39 @@ export default {
     // @media only screen and (min-width: 415px) and (max-width: 668px) {
     //   width: 40px;
     // }
-    @media only screen and (min-width: 769px) and (max-width: 1024px) {
-      width: 40px;
-      margin: 10px auto 0;
+    @media only screen and (min-width: 768px) {
+      width: 50px;
+      margin: 14px auto 0;
+    }
+  }
+}
+</style>
+<style lang="scss">
+.newInput {
+  height: 100%;
+  width: 85%;
+  float: left;
+  .el-input__inner {
+    height: 100%;
+    line-height: 1rem;
+    width: 100%;
+    border-radius: 30px;
+    border: none;
+    font-size: 0.45rem;
+    @media only screen and (min-width: 768px) {
+      padding-left: 0.9rem !important;
+    }
+  }
+  .el-input__icon {
+    line-height: 1rem;
+    font-size: 0.45rem;
+    @media only screen and (min-width: 768px) {
+      margin-top: 1px;
+    }
+  }
+  .el-input__prefix {
+    @media only screen and (min-width: 768px) {
+      left: 10px;
     }
   }
 }

src/pages/main/WaitingArea.vue

@@ -635,8 +635,8 @@ export default {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
   top: 98px;
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
-    top: 130px;
+  @media only screen and (min-width: 768px) {
+    top: 163px;
   }
   right: 0;
   z-index: 66;

src/pages/main/dialog/AcceptsDialog.vue

@@ -4,12 +4,10 @@
       <div class="DialogTit">
         <span class="iconfont" @click="close()">&#xe6e9;</span>
         <h1 class="name">接诊评估</h1>
-        <span class="success" @click="commitInfo">完成</span>
+        <span class="success" @click="commitInfo">保存</span>
       </div>
       <div class="DialogContent choose">
-
-
-        <el-form :model="receiveTreatmentAsses" label-width="90px">
+        <el-form :model="receiveTreatmentAsses" label-width="110px">
           <el-form-item label="入室方式: " v-if="isShow('入室方式')">
             <el-radio v-model="receiveTreatmentAsses.way" label="1">步行</el-radio>
             <el-radio v-model="receiveTreatmentAsses.way" label="2">扶行</el-radio>
@@ -18,13 +16,10 @@
             <!--</el-radio-group>-->
           </el-form-item>
           <el-form-item label="病人意识: " v-if="isShow('病人意识')">
-
             <el-radio v-model="receiveTreatmentAsses.consciousness" label="1">清醒</el-radio>
             <el-radio v-model="receiveTreatmentAsses.consciousness" label="2">嗜睡</el-radio>
             <el-radio v-model="receiveTreatmentAsses.consciousness" label="3">昏迷</el-radio>
             <el-radio v-model="receiveTreatmentAsses.consciousness" label="4">模糊</el-radio>
-
-
           </el-form-item>
           <el-form-item label="病人食欲: " v-if="isShow('病人食欲')">
             <el-radio v-model="receiveTreatmentAsses.appetite" label="1">正常</el-radio>
@@ -45,17 +40,15 @@
             <el-radio v-model="receiveTreatmentAsses.posture" label="4">端坐位</el-radio>
             <el-radio v-model="receiveTreatmentAsses.posture" label="5">躁动不安</el-radio>
           </el-form-item>
-          <el-form-item label="病情: "  v-if="isShow('病情')">
+          <el-form-item label="病情: " v-if="isShow('病情')">
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="1">一般</el-radio>
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="2">严重</el-radio>
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="3">危</el-radio>
           </el-form-item>
-          <el-form-item label-width="100dp" label="其他病情 : "
-                        v-if="isShow('其他病情')">
-            <el-input v-model="receiveTreatmentAsses.sick_condition_other" style="width: 400px"></el-input>
+          <el-form-item label-width="110dp" label="其他病情 : " v-if="isShow('其他病情')">
+            <el-input v-model="receiveTreatmentAsses.sick_condition_other"></el-input>
           </el-form-item>
-          <el-form-item label-width="100dp" label="跌倒风险评估评分 : "
-                        v-if="isShow('跌倒风险评估评分')">
+          <el-form-item label-width="110dp" label="跌倒风险评估评分 : " v-if="isShow('跌倒风险评估评分')">
             <el-input v-model="receiveTreatmentAsses.score" style="width: 100px"></el-input>
           </el-form-item>
 
@@ -66,283 +59,302 @@
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="4">高风险</el-radio>
           </el-form-item>
 
-
-          <el-form-item label-width="155px" label="跌倒风险预防措施: " v-if="isShow('跌倒风险预防措施')">
-          <el-radio v-model="receiveTreatmentAsses.precaution" label="1">镇定剂</el-radio>
-          <el-radio v-model="receiveTreatmentAsses.precaution" label="2">约束带</el-radio>
-          <el-radio v-model="receiveTreatmentAsses.precaution" label="3">床栏</el-radio>
-          <el-radio v-model="receiveTreatmentAsses.precaution" label="4">加强宣教</el-radio>
-        </el-form-item>
-          <el-form-item label-width="100dp" label="其他跌倒风险预防措施 : "
-                        v-if="isShow('其他跌倒风险预防措施')">
+          <el-form-item label-width="130px" label="跌倒风险预防措施: " v-if="isShow('跌倒风险预防措施')">
+            <el-radio v-model="receiveTreatmentAsses.precaution" label="1">镇定剂</el-radio>
+            <el-radio v-model="receiveTreatmentAsses.precaution" label="2">约束带</el-radio>
+            <el-radio v-model="receiveTreatmentAsses.precaution" label="3">床栏</el-radio>
+            <el-radio v-model="receiveTreatmentAsses.precaution" label="4">加强宣教</el-radio>
+          </el-form-item>
+          <el-form-item label-width="110dp" label="其他跌倒风险预防措施 : " v-if="isShow('其他跌倒风险预防措施')">
             <el-input v-model="receiveTreatmentAsses.precaution_other"></el-input>
           </el-form-item>
 
-
-          <el-form-item label="摄入量: "  v-if="isShow('摄入量')">
+          <el-form-item label="摄入量: " v-if="isShow('摄入量')">
             <el-radio v-model="receiveTreatmentAsses.intake" label="1">正常</el-radio>
             <el-radio v-model="receiveTreatmentAsses.intake" label="2">减少</el-radio>
           </el-form-item>
-          <el-form-item label="营养状况: "  v-if="isShow('营养状况')">
+          <el-form-item label="营养状况: " v-if="isShow('营养状况')">
             <el-radio v-model="receiveTreatmentAsses.nutrition" label="1">正常</el-radio>
             <el-radio v-model="receiveTreatmentAsses.nutrition" label="2">营养不良</el-radio>
           </el-form-item>
-          <el-form-item label="心理评估: "  v-if="isShow('心理评估')">
+          <el-form-item label="心理评估: " v-if="isShow('心理评估')">
             <el-radio v-model="receiveTreatmentAsses.psychological_assessment" label="1">正常</el-radio>
             <el-radio v-model="receiveTreatmentAsses.psychological_assessment" label="2">异常</el-radio>
           </el-form-item>
-          <el-form-item label-width="100dp" label="心理评估异常情况 : "
-                        v-if="isShow('心理评估异常情况')&&receiveTreatmentAsses.psychological_assessment == 2">
+          <el-form-item
+            label-width="110dp"
+            label="心理评估异常情况 : "
+            v-if="isShow('心理评估异常情况')&&receiveTreatmentAsses.psychological_assessment == 2"
+          >
             <el-input v-model="receiveTreatmentAsses.psychological_assessment_other"></el-input>
           </el-form-item>
 
-          <el-form-item label-width="100dp" label="其他心理评估 : "
-                        v-if="isShow('其他心理评估')">
+          <el-form-item label-width="110dp" label="其他心理评估 : " v-if="isShow('其他心理评估')">
             <el-input v-model="receiveTreatmentAsses.psychological_other"></el-input>
           </el-form-item>
-
         </el-form>
         <!-- <div class="button">
           <button @click="commitInfo" class="submitButton">提交</button>
-      </div> -->
+        </div>-->
       </div>
       <!-- <div class="footer">
           处方医生：刘小军 医生
-      </div> -->
+      </div>-->
     </div>
   </div>
 </template>
 
 <script>
-  import {commitAcceptsAssessment, getLastAccepts} from '@/api/dialysis'
-  import {Toast} from 'vant'
+import { commitAcceptsAssessment, getLastAccepts } from "@/api/dialysis";
+import { Toast } from "vant";
 
-  export default {
-    name: 'AcceptsDialog',
-    data () {
-      return {
-        receiveTreatmentAsses: {
-          way: '1',
-          consciousness: '1',
-          appetite: '1',
-          condition: '1',
-          posture: '1',
-          sick_condition: '1',
-          danger_level: '1',
-          intake: '1',
-          nutrition: '1',
-          psychological_assessment: '1',
-          psychological_assessment_other: '',
-          sick_condition_other:'',
-          score:'',
-          psychological_other:'',
-          precaution:'1',
-          precaution_other:'',
-        },
-        patient: {
-          id: 0
-        },
-        record_date: ''
-      }
-    },
-    props: {
-      accepts: {
-        type: Object
+export default {
+  name: "AcceptsDialog",
+  data() {
+    return {
+      receiveTreatmentAsses: {
+        way: "1",
+        consciousness: "1",
+        appetite: "1",
+        condition: "1",
+        posture: "1",
+        sick_condition: "1",
+        danger_level: "1",
+        intake: "1",
+        nutrition: "1",
+        psychological_assessment: "1",
+        psychological_assessment_other: "",
+        sick_condition_other: "",
+        score: "",
+        psychological_other: "",
+        precaution: "1",
+        precaution_other: ""
       },
-      patient_prop: {
-        type: Object
-      }
+      patient: {
+        id: 0
+      },
+      record_date: ""
+    };
+  },
+  props: {
+    accepts: {
+      type: Object
     },
-    created () {
-      if (this.accepts == null || this.accepts.id == '') {
-        let ParamsQuery = {}
-        ParamsQuery['patient'] = this.$route.query.patient_id
+    patient_prop: {
+      type: Object
+    }
+  },
+  created() {
+    if (this.accepts == null || this.accepts.id == "") {
+      let ParamsQuery = {};
+      ParamsQuery["patient"] = this.$route.query.patient_id;
+      getLastAccepts(ParamsQuery).then(response => {
+        if (response.data.state == 0) {
+          return false;
+        } else {
+          for (const key in response.data.data.receiveTreatmentAsses) {
+            this.accepts[key] = response.data.data.receiveTreatmentAsses[key];
+            this.receiveTreatmentAsses.way = this.accepts.way + "";
+            this.receiveTreatmentAsses.consciousness =
+              this.accepts.consciousness + "";
+            this.receiveTreatmentAsses.appetite = this.accepts.appetite + "";
+            this.receiveTreatmentAsses.condition = this.accepts.condition + "";
+            this.receiveTreatmentAsses.posture = this.accepts.posture + "";
+            this.receiveTreatmentAsses.sick_condition =
+              this.accepts.sick_condition + "";
+            this.receiveTreatmentAsses.danger_level =
+              this.accepts.danger_level + "";
+            this.receiveTreatmentAsses.intake = this.accepts.intake + "";
+            this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + "";
+            this.receiveTreatmentAsses.psychological_assessment =
+              this.accepts.psychological_assessment + "";
+            this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other;
+            this.receiveTreatmentAsses.score = this.accepts.score;
+            this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other;
+            this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other;
+
+            this.receiveTreatmentAsses.precaution =
+              this.accepts.precaution + "";
+            this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other;
+          }
+        }
+      });
+    } else {
+      if (
+        this.accepts.way == 0 &&
+        this.accepts.consciousness == 0 &&
+        this.accepts.appetite == 0 &&
+        this.accepts.condition == 0 &&
+        this.accepts.posture == 0 &&
+        this.accepts.sick_condition == 0 &&
+        this.accepts.danger_level == 0 &&
+        this.accepts.intake == 0 &&
+        this.accepts.nutrition == 0 &&
+        this.accepts.psychological_assessment == 0 &&
+        this.accepts.psychological_assessment_other == "" &&
+        this.accepts.sick_condition_other == "" &&
+        this.accepts.psychological_other == "" &&
+        this.accepts.precaution == 0 &&
+        this.accepts.precaution_other == "" &&
+        this.accepts.score == ""
+      ) {
+        let ParamsQuery = {};
+        ParamsQuery["patient"] = this.$route.query.patient_id;
         getLastAccepts(ParamsQuery).then(response => {
           if (response.data.state == 0) {
-            return false
+            return false;
           } else {
             for (const key in response.data.data.receiveTreatmentAsses) {
-              this.accepts[key] = response.data.data.receiveTreatmentAsses[key]
-              this.receiveTreatmentAsses.way = this.accepts.way + ''
+              this.accepts[key] = response.data.data.receiveTreatmentAsses[key];
+              this.receiveTreatmentAsses.way = this.accepts.way + "";
               this.receiveTreatmentAsses.consciousness =
-                this.accepts.consciousness + ''
-              this.receiveTreatmentAsses.appetite = this.accepts.appetite + ''
-              this.receiveTreatmentAsses.condition = this.accepts.condition + ''
-              this.receiveTreatmentAsses.posture = this.accepts.posture + ''
-              this.receiveTreatmentAsses.sick_condition = this.accepts.sick_condition + ''
-              this.receiveTreatmentAsses.danger_level = this.accepts.danger_level + ''
-              this.receiveTreatmentAsses.intake = this.accepts.intake + ''
-              this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
-              this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
-              this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other
-              this.receiveTreatmentAsses.score = this.accepts.score
-              this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
-              this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
-
-              this.receiveTreatmentAsses.precaution = this.accepts.precaution +''
-              this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
-
+                this.accepts.consciousness + "";
+              this.receiveTreatmentAsses.appetite = this.accepts.appetite + "";
+              this.receiveTreatmentAsses.condition =
+                this.accepts.condition + "";
+              this.receiveTreatmentAsses.posture = this.accepts.posture + "";
+              this.receiveTreatmentAsses.sick_condition =
+                this.accepts.sick_condition + "";
+              this.receiveTreatmentAsses.danger_level =
+                this.accepts.danger_level + "";
+              this.receiveTreatmentAsses.intake = this.accepts.intake + "";
+              this.receiveTreatmentAsses.nutrition =
+                this.accepts.nutrition + "";
+              this.receiveTreatmentAsses.psychological_assessment =
+                this.accepts.psychological_assessment + "";
+              this.receiveTreatmentAsses.psychological_assessment_other =
+                this.accepts.psychological_assessment_other + "";
+              this.receiveTreatmentAsses.score = this.accepts.score;
+              this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other;
 
+              this.receiveTreatmentAsses.precaution =
+                this.accepts.precaution + "";
+              this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other;
+              this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other;
             }
           }
-        })
+        });
       } else {
-        if (
-          this.accepts.way == 0 &&
-          this.accepts.consciousness == 0 &&
-          this.accepts.appetite == 0 &&
-          this.accepts.condition == 0 &&
-          this.accepts.posture == 0 &&
-          this.accepts.sick_condition == 0 &&
-          this.accepts.danger_level == 0 &&
-          this.accepts.intake == 0 &&
-          this.accepts.nutrition == 0 &&
-          this.accepts.psychological_assessment == 0 &&
-          this.accepts.psychological_assessment_other == ''&&this.accepts.sick_condition_other == ''&&
-          this.accepts.psychological_other == ''&&
-          this.accepts.precaution == 0&&
-          this.accepts.precaution_other == ''&&
-          this.accepts.score == ''
-
-      ) {
-          let ParamsQuery = {}
-          ParamsQuery['patient'] = this.$route.query.patient_id
-          getLastAccepts(ParamsQuery).then(response => {
-            if (response.data.state == 0) {
-              return false
-            } else {
-              for (const key in response.data.data.receiveTreatmentAsses) {
-                this.accepts[key] = response.data.data.receiveTreatmentAsses[key]
-                this.receiveTreatmentAsses.way = this.accepts.way + ''
-                this.receiveTreatmentAsses.consciousness =
-                  this.accepts.consciousness + ''
-                this.receiveTreatmentAsses.appetite = this.accepts.appetite + ''
-                this.receiveTreatmentAsses.condition =
-                  this.accepts.condition + ''
-                this.receiveTreatmentAsses.posture = this.accepts.posture + ''
-                this.receiveTreatmentAsses.sick_condition = this.accepts.sick_condition + ''
-                this.receiveTreatmentAsses.danger_level = this.accepts.danger_level + ''
-                this.receiveTreatmentAsses.intake = this.accepts.intake + ''
-                this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
-                this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
-                this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
-                this.receiveTreatmentAsses.score = this.accepts.score
-                this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
-
-                this.receiveTreatmentAsses.precaution = this.accepts.precaution + ''
-                this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
-                this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
-
-
-              }
-            }
-          })
-        } else {
-          this.receiveTreatmentAsses.way = this.accepts.way + ''
-          this.receiveTreatmentAsses.consciousness =
-            this.accepts.consciousness + ''
-          this.receiveTreatmentAsses.appetite = this.accepts.appetite + ''
-          this.receiveTreatmentAsses.condition = this.accepts.condition + ''
-          this.receiveTreatmentAsses.posture = this.accepts.posture + ''
-          this.receiveTreatmentAsses.sick_condition = this.accepts.sick_condition + ''
-          this.receiveTreatmentAsses.danger_level = this.accepts.danger_level + ''
-          this.receiveTreatmentAsses.intake = this.accepts.intake + ''
-          this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
-          this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
-          this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
-          this.receiveTreatmentAsses.score = this.accepts.score
-          this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
+        this.receiveTreatmentAsses.way = this.accepts.way + "";
+        this.receiveTreatmentAsses.consciousness =
+          this.accepts.consciousness + "";
+        this.receiveTreatmentAsses.appetite = this.accepts.appetite + "";
+        this.receiveTreatmentAsses.condition = this.accepts.condition + "";
+        this.receiveTreatmentAsses.posture = this.accepts.posture + "";
+        this.receiveTreatmentAsses.sick_condition =
+          this.accepts.sick_condition + "";
+        this.receiveTreatmentAsses.danger_level =
+          this.accepts.danger_level + "";
+        this.receiveTreatmentAsses.intake = this.accepts.intake + "";
+        this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + "";
+        this.receiveTreatmentAsses.psychological_assessment =
+          this.accepts.psychological_assessment + "";
+        this.receiveTreatmentAsses.psychological_assessment_other =
+          this.accepts.psychological_assessment_other + "";
+        this.receiveTreatmentAsses.score = this.accepts.score;
+        this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other;
 
-          this.receiveTreatmentAsses.precaution = this.accepts.precaution +''
-          this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
-          this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
-
-
-        }
+        this.receiveTreatmentAsses.precaution = this.accepts.precaution + "";
+        this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other;
+        this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other;
       }
+    }
 
-      var date = this.$route.query && this.$route.query.date
-      date *= 1000
-      var newDate = new Date(date)
+    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()
+    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.patient.id = this.patient_prop.id;
+  },
+  methods: {
+    isShow(name) {
+      var filedList = this.$store.getters.user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (
+          filedList[i].module == 2 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_show == 1
+        ) {
+          return true;
+        }
       }
-      this.record_date =
-        y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
-      this.patient.id = this.patient_prop.id
+      return false;
     },
-    methods: {
-      isShow(name){
-        var filedList = this.$store.getters.user.fileds
-        for (let i = 0; i < filedList.length; i++){
-          if(filedList[i].module == 2 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
-            return true
-          }
-        }
-        return false
-      },
-      commitInfo: function () {
-        Toast.loading({forbidClick: true, duration: 0})
-        let ParamsQuery = this.receiveTreatmentAsses
-        // ParamsQuery["patient"] =  this.patient.id
-        ParamsQuery['patient'] = this.$route.query.patient_id
-        ParamsQuery['record_date'] = this.record_date
+    commitInfo: function() {
+      Toast.loading({ forbidClick: true, duration: 0 });
+      let ParamsQuery = this.receiveTreatmentAsses;
+      // ParamsQuery["patient"] =  this.patient.id
+      ParamsQuery["patient"] = this.$route.query.patient_id;
+      ParamsQuery["record_date"] = this.record_date;
 
-        commitAcceptsAssessment(ParamsQuery).then(response => {
-          if (response.data.state == 0) {
-            Toast.fail(response.data.msg)
-            return false
-          } else {
-            Toast.success('提交成功')
-            for (const key in response.data.data.receiveTreatmentAsses) {
-              this.accepts[key] = response.data.data.receiveTreatmentAsses[key]
-            }
-            this.finish()
+      commitAcceptsAssessment(ParamsQuery).then(response => {
+        if (response.data.state == 0) {
+          Toast.fail(response.data.msg);
+          return false;
+        } else {
+          Toast.success("提交成功");
+          for (const key in response.data.data.receiveTreatmentAsses) {
+            this.accepts[key] = response.data.data.receiveTreatmentAsses[key];
           }
-        })
-      },
-      finish: function () {
-        this.$emit('finish')
-      },
-      close: function () {
-        this.$emit('close')
-      }
+          this.finish();
+        }
+      });
+    },
+    finish: function() {
+      this.$emit("finish");
+    },
+    close: function() {
+      this.$emit("close");
     }
   }
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-  .choose {
+.choose {
   .el-form-item {
-  margin-bottom: 0;
-  border-bottom: 1px #e5e5e5 solid;
-  padding: 0.15rem 0.36rem;
-  .el-radio {
-  font-size: 18px;
-  }
-
+    margin-bottom: 0;
+    border-bottom: 1px #e5e5e5 solid;
+    padding: 0.15rem 0.36rem;
+    .el-radio {
+      font-size: 18px;
+    }
   }
   .button {
-  text-align: center;
-  margin-top: 1rem;
-  .submitButton {
-  width: 3rem;
-  height: 0.8rem;
-  line-height: 0.8rem;
-  background: $main-color;
-  color: #fff;
-  font-size: 0.3rem;
-  text-align: center;
-  border-radius: 6px;
-  }
-  }
+    text-align: center;
+    margin-top: 1rem;
+    .submitButton {
+      width: 3rem;
+      height: 0.8rem;
+      line-height: 0.8rem;
+      background: $main-color;
+      color: #fff;
+      font-size: 0.3rem;
+      text-align: center;
+      border-radius: 6px;
+    }
   }
+}
+</style>
+<style lang="scss">
+.el-radio {
+  margin-right: 26px;
+  width: 2.4rem;
+}
+.el-radio__inner {
+  width: 20px;
+  height: 20px;
+}
 </style>
 

src/pages/main/dialog/DoubleDialog.vue

@@ -4,28 +4,28 @@
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">双人查对</h1>
-        <span @click="commitInfo" class="success">完成</span>
+        <span @click="commitInfo" class="success">保存</span>
       </div>
       <div style="height: 8rem" class="DialogContent choose">
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
+        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
           <el-form-item label="透析物品核查 : ">
             <el-radio v-model="doubleReview.dialysis_item_check" label="1">正确</el-radio>
             <el-radio v-model="doubleReview.dialysis_item_check" label="2">错误</el-radio>
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="90px">
+          <el-form-item label="差错描述 : " label-width="160px">
             <el-input v-model="doubleReview.dialysis_item_desc"></el-input>
           </el-form-item>
         </el-form>
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
+        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
           <el-form-item label="透析参数核查 : ">
             <el-radio v-model="doubleReview.dialysis_parameter_check" label="1">正确</el-radio>
             <el-radio v-model="doubleReview.dialysis_parameter_check" label="2">错误</el-radio>
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="90px">
+          <el-form-item label="差错描述 : " label-width="160px">
             <el-input v-model="doubleReview.dialysis_parameter_desc"></el-input>
           </el-form-item>
         </el-form>
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
+        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
           <el-form-item label="血管通路核查 : ">
             <!--<el-radio-group v-model="form.appetite">-->
             <!--<el-radio label="正确"></el-radio>-->
@@ -33,49 +33,56 @@
             <!--</el-radio-group>-->
             <el-radio v-model="doubleReview.vascular_access_verification" label="1">正确</el-radio>
             <el-radio v-model="doubleReview.vascular_access_verification" label="2">错误</el-radio>
-
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="90px">
+          <el-form-item label="差错描述 : " label-width="160px">
             <el-input v-model="doubleReview.vascular_access_desc"></el-input>
           </el-form-item>
         </el-form>
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
+        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
           <el-form-item label="管道连接核查 : ">
             <!--<el-radio-group v-model="form.condition">-->
             <el-radio v-model="doubleReview.pipeline_connection_check" label="1">正确</el-radio>
             <el-radio v-model="doubleReview.pipeline_connection_check" label="2">错误</el-radio>
             <!--</el-radio-group>-->
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="90px">
+          <el-form-item label="差错描述 : " label-width="160px">
             <el-input v-model="doubleReview.pipeline_connection_desc"></el-input>
           </el-form-item>
-
         </el-form>
 
         <div class="item">
           <h2 class="name">核对时间</h2>
           <div class="content">
-            <span class="text" style="width: 100px" @click="selectCheckTimeAction">{{ check_time_str }}</span>
+            <span
+              class="text"
+              style="width: 160px"
+              @click="selectCheckTimeAction"
+            >{{ check_time_str }}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
 
-
-        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
-          <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">{{getFirstCheckDesc()}} </p>
-          <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.modifier != 0">{{getScondCheckDesc()}}</p>
+        <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="160px">
+          <p
+            style="margin: 10px 0 10px 13px;"
+            v-if="doubleReview.creater != 0"
+          >{{getFirstCheckDesc()}}</p>
+          <p
+            style="margin: 10px 0 10px 13px;"
+            v-if="doubleReview.modifier != 0"
+          >{{getScondCheckDesc()}}</p>
         </el-form>
 
         <!-- <div class="button">
           <button @click="commitInfo" class="submitButton">提交</button>
-      </div> -->
+        </div>-->
         <!--<div class="footer">-->
         <!--处方医生：黄梦燕  医生-->
         <!--</div>-->
       </div>
       <!-- <div class="footer">
           处方医生：黄梦燕  护士
-      </div> -->
+      </div>-->
     </div>
     <mt-datetime-picker
       ref="start_time_picker"
@@ -84,406 +91,418 @@
       v-model="check_time"
     ></mt-datetime-picker>
   </div>
-
 </template>
 
 <script>
-  import {commitDoubleCheck} from '@/api/dialysis'
-  import {Toast} from 'vant'
-  import {uParseTime} from '@/utils/tools'
-  import {parseTime} from '@/utils'
-
-  export default {
-    name: 'DoubleDialog',
-    data () {
-      return {
-        admin_users: [],
-        first_check_isShow: false,
-        second_check_isShow: false,
-        first_check_desc: '',
-        second_check_desc: '',
-        doubleReview: {
-          dialysis_item_check: '1',
-          dialysis_parameter_check: '1',
-          vascular_access_verification: '1',
-          pipeline_connection_check: '1',
-          dialysis_item_desc: '',
-          dialysis_parameter_desc: '',
-          vascular_access_desc: '',
-          pipeline_connection_desc: '',
-          collator: '',
-          creater: 0,
-          modifier: 0,
-          created_time: 0,
-          updated_time: 0,
-          check_time: 0,
-          first_check_time: 0,
-        },
-        check_time: new Date(),
-        check_time_str: '',
-        patient: {
-          id: 0
-        },
-        doctor: '',
-        record_date: ''
-      }
-    },
-    props: {
-      record: {
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
+import { commitDoubleCheck } from "@/api/dialysis";
+import { Toast } from "vant";
+import { uParseTime } from "@/utils/tools";
+import { parseTime } from "@/utils";
+
+export default {
+  name: "DoubleDialog",
+  data() {
+    return {
+      admin_users: [],
+      first_check_isShow: false,
+      second_check_isShow: false,
+      first_check_desc: "",
+      second_check_desc: "",
+      doubleReview: {
+        dialysis_item_check: "1",
+        dialysis_parameter_check: "1",
+        vascular_access_verification: "1",
+        pipeline_connection_check: "1",
+        dialysis_item_desc: "",
+        dialysis_parameter_desc: "",
+        vascular_access_desc: "",
+        pipeline_connection_desc: "",
+        collator: "",
+        creater: 0,
+        modifier: 0,
+        created_time: 0,
+        updated_time: 0,
+        check_time: 0,
+        first_check_time: 0
       },
-
-      patient_prop: {
-        type: Object
+      check_time: new Date(),
+      check_time_str: "",
+      patient: {
+        id: 0
       },
-      admin_users_prop: {
-        type: Array
+      doctor: "",
+      record_date: ""
+    };
+  },
+  props: {
+    record: {
+      type: Object,
+      default: () => {
+        return { id: 0 };
       }
     },
-    created () {
-      console.log(new Date())
-      this.admin_users = this.admin_users_prop
-      if (this.record.id == '') {
-        this.doubleReview.dialysis_item_check = '1'
-        this.doubleReview.dialysis_parameter_check = '1'
-        this.doubleReview.vascular_access_verification = '1'
-        this.doubleReview.pipeline_connection_check = '1'
-        this.doubleReview.dialysis_item_desc = ''
-        this.doubleReview.dialysis_parameter_desc = ''
-        this.doubleReview.vascular_access_desc = ''
-        this.doubleReview.pipeline_connection_desc = ''
-
-      } else {
-        this.doubleReview.dialysis_item_check =
-          this.record.dialysis_item_check + ''
-        this.doubleReview.dialysis_parameter_check =
-          this.record.dialysis_parameter_check + ''
-        this.doubleReview.vascular_access_verification =
-          this.record.vascular_access_verification + ''
-        this.doubleReview.pipeline_connection_check =
-          this.record.pipeline_connection_check + ''
-        this.doubleReview.dialysis_item_desc = this.record.dialysis_item_desc
-        this.doubleReview.dialysis_parameter_desc = this.record.dialysis_parameter_desc
-        this.doubleReview.vascular_access_desc = this.record.vascular_access_desc
-        this.doubleReview.pipeline_connection_desc = this.record.pipeline_connection_desc
-
-        this.doubleReview.created_time = this.record.created_time
-        this.doubleReview.creater = this.record.creater
-        this.doubleReview.updated_time = this.record.updated_time
-        this.doubleReview.modifier = this.record.modifier
-        this.doubleReview.check_time = this.record.check_time
-        this.doubleReview.first_check_time = this.record.first_check_time
 
-      }
+    patient_prop: {
+      type: Object
+    },
+    admin_users_prop: {
+      type: Array
+    }
+  },
+  created() {
+    console.log(new Date());
+    this.admin_users = this.admin_users_prop;
+    if (this.record.id == "") {
+      this.doubleReview.dialysis_item_check = "1";
+      this.doubleReview.dialysis_parameter_check = "1";
+      this.doubleReview.vascular_access_verification = "1";
+      this.doubleReview.pipeline_connection_check = "1";
+      this.doubleReview.dialysis_item_desc = "";
+      this.doubleReview.dialysis_parameter_desc = "";
+      this.doubleReview.vascular_access_desc = "";
+      this.doubleReview.pipeline_connection_desc = "";
+    } else {
+      this.doubleReview.dialysis_item_check =
+        this.record.dialysis_item_check + "";
+      this.doubleReview.dialysis_parameter_check =
+        this.record.dialysis_parameter_check + "";
+      this.doubleReview.vascular_access_verification =
+        this.record.vascular_access_verification + "";
+      this.doubleReview.pipeline_connection_check =
+        this.record.pipeline_connection_check + "";
+      this.doubleReview.dialysis_item_desc = this.record.dialysis_item_desc;
+      this.doubleReview.dialysis_parameter_desc = this.record.dialysis_parameter_desc;
+      this.doubleReview.vascular_access_desc = this.record.vascular_access_desc;
+      this.doubleReview.pipeline_connection_desc = this.record.pipeline_connection_desc;
+
+      this.doubleReview.created_time = this.record.created_time;
+      this.doubleReview.creater = this.record.creater;
+      this.doubleReview.updated_time = this.record.updated_time;
+      this.doubleReview.modifier = this.record.modifier;
+      this.doubleReview.check_time = this.record.check_time;
+      this.doubleReview.first_check_time = this.record.first_check_time;
+    }
 
-      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.patient.id = this.patient_prop.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.patient.id = this.patient_prop.id
+  },
+  methods: {
+    didSelectCheckTime: function(time) {
+      this.check_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}" + ":00");
     },
-    methods: {
-      didSelectCheckTime: function (time) {
-        this.check_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}' + ':00')
-      },
-      selectCheckTimeAction: function () {
-        this.$refs.start_time_picker.open()
-      },
-      checkInf: function () {
-      },
-      // initData(doubleReview, patient, doctor) {
-      //   //上层传值
-      //   this.patient = patient;
-      //   this.doubleReview = doubleReview;
-      //   this.doctor = doctor;
-      // },
-      commitInfo: function () {
-        Toast.loading({forbidClick: true, duration: 0})
-        let ParamsQuery = this.doubleReview
-        // ParamsQuery["patient"] = this.patient.id
-        ParamsQuery['patient'] = this.$route.query.patient_id
-        ParamsQuery['record_date'] = this.record_date
-        ParamsQuery['check_time'] = this.check_time_str
-        commitDoubleCheck(ParamsQuery).then(response => {
-          if (response.data.state == 0) {
-            // this.$toast({message: response.data.msg});
-            Toast.fail(response.data.msg)
-            return false
-          } else {
-            Toast.success('提交成功')
+    selectCheckTimeAction: function() {
+      this.$refs.start_time_picker.open();
+    },
+    checkInf: function() {},
+    // initData(doubleReview, patient, doctor) {
+    //   //上层传值
+    //   this.patient = patient;
+    //   this.doubleReview = doubleReview;
+    //   this.doctor = doctor;
+    // },
+    commitInfo: function() {
+      Toast.loading({ forbidClick: true, duration: 0 });
+      let ParamsQuery = this.doubleReview;
+      // ParamsQuery["patient"] = this.patient.id
+      ParamsQuery["patient"] = this.$route.query.patient_id;
+      ParamsQuery["record_date"] = this.record_date;
+      ParamsQuery["check_time"] = this.check_time_str;
+      commitDoubleCheck(ParamsQuery).then(response => {
+        if (response.data.state == 0) {
+          // this.$toast({message: response.data.msg});
+          Toast.fail(response.data.msg);
+          return false;
+        } else {
+          Toast.success("提交成功");
 
-            this.doubleReview.creater = response.data.data.doubleCheck.creater
-            this.doubleReview.check_time =
-              response.data.data.doubleCheck.check_time
-            this.doubleReview.first_check_time =
-              response.data.data.doubleCheck.first_check_time
-            this.doubleReview.modifier = response.data.data.doubleCheck.modifier
+          this.doubleReview.creater = response.data.data.doubleCheck.creater;
+          this.doubleReview.check_time =
+            response.data.data.doubleCheck.check_time;
+          this.doubleReview.first_check_time =
+            response.data.data.doubleCheck.first_check_time;
+          this.doubleReview.modifier = response.data.data.doubleCheck.modifier;
 
-            for (const key in response.data.data.doubleCheck) {
-              this.record[key] = response.data.data.doubleCheck[key]
-            }
-            this.$emit('did_update', response.data.data.doubleCheck)
+          for (const key in response.data.data.doubleCheck) {
+            this.record[key] = response.data.data.doubleCheck[key];
+          }
+          this.$emit("did_update", response.data.data.doubleCheck);
+        }
+      });
+    },
+    close: function() {
+      this.$emit("close");
+    },
+    getFirstCheckDesc: function() {
+      if (
+        this.doubleReview.first_check_time > 0 &&
+        this.doubleReview.check_time > 0
+      ) {
+        if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
+          let time = uParseTime(
+            this.doubleReview.first_check_time,
+            "{y}-{m}-{d}  {h}:{i}"
+          );
+          if (this.doubleReview.creater <= 0) {
+            return "";
           }
-        })
-      },
-      close: function () {
-        this.$emit('close')
-      },
-      getFirstCheckDesc: function () {
-        if (this.doubleReview.first_check_time > 0 && this.doubleReview.check_time > 0) {
-          if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
-            let time = uParseTime(
-              this.doubleReview.first_check_time,
-              '{y}-{m}-{d}  {h}:{i}'
-            )
-            if (this.doubleReview.creater <= 0) {
-              return ''
-            }
-
-            var desc = ''
-            if (
-              this.admin_users == null ||
-              typeof this.admin_users.length == 'undefined'
-            ) {
-              return ''
-            }
-
-            var leng = this.admin_users.length
-            if (leng == 0) {
-              return ''
-            }
-
-            for (let index = 0; index < leng; index++) {
-              if (this.admin_users[index].id == this.doubleReview.creater) {
-                let name = this.admin_users[index].name
-                desc = '首次核对人员:' + name + ' 首次核对时间:' + time
-
-                break
-              }
-            }
-            return desc
-
-          } else {
-
-            let time = uParseTime(
-              this.doubleReview.check_time,
-              '{y}-{m}-{d}  {h}:{i}'
-            )
-            if (this.doubleReview.modifier <= 0) {
-              return ''
-            }
 
-            var desc = ''
-            if (
-              this.admin_users == null ||
-              typeof this.admin_users.length == 'undefined'
-            ) {
-              return ''
-            }
+          var desc = "";
+          if (
+            this.admin_users == null ||
+            typeof this.admin_users.length == "undefined"
+          ) {
+            return "";
+          }
 
-            var leng = this.admin_users.length
-            if (leng == 0) {
-              return ''
-            }
+          var leng = this.admin_users.length;
+          if (leng == 0) {
+            return "";
+          }
 
-            for (let index = 0; index < leng; index++) {
-              if (this.admin_users[index].id == this.doubleReview.modifier) {
-                let name = this.admin_users[index].name
-                desc = '首次核对人员:' + name + ' 首次核对时间:' + time
+          for (let index = 0; index < leng; index++) {
+            if (this.admin_users[index].id == this.doubleReview.creater) {
+              let name = this.admin_users[index].name;
+              desc = "首次核对人员:" + name + " 首次核对时间:" + time;
 
-                break
-              }
+              break;
             }
-            return desc
-
           }
-
+          return desc;
         } else {
-
           let time = uParseTime(
-            this.doubleReview.first_check_time,
-            '{y}-{m}-{d}  {h}:{i}'
-          )
-          if (this.doubleReview.creater <= 0) {
-            return ''
+            this.doubleReview.check_time,
+            "{y}-{m}-{d}  {h}:{i}"
+          );
+          if (this.doubleReview.modifier <= 0) {
+            return "";
           }
 
-          var desc = ''
+          var desc = "";
           if (
             this.admin_users == null ||
-            typeof this.admin_users.length == 'undefined'
+            typeof this.admin_users.length == "undefined"
           ) {
-            return ''
+            return "";
           }
 
-          var leng = this.admin_users.length
+          var leng = this.admin_users.length;
           if (leng == 0) {
-            return ''
+            return "";
           }
 
           for (let index = 0; index < leng; index++) {
-            if (this.admin_users[index].id == this.doubleReview.creater) {
-              let name = this.admin_users[index].name
-              desc = '首次核对人员:' + name + ' 首次核对时间:' + time
+            if (this.admin_users[index].id == this.doubleReview.modifier) {
+              let name = this.admin_users[index].name;
+              desc = "首次核对人员:" + name + " 首次核对时间:" + time;
 
-              break
+              break;
             }
           }
-          return desc
+          return desc;
+        }
+      } else {
+        let time = uParseTime(
+          this.doubleReview.first_check_time,
+          "{y}-{m}-{d}  {h}:{i}"
+        );
+        if (this.doubleReview.creater <= 0) {
+          return "";
+        }
 
+        var desc = "";
+        if (
+          this.admin_users == null ||
+          typeof this.admin_users.length == "undefined"
+        ) {
+          return "";
         }
 
-      },
-      getScondCheckDesc: function () {
-        if (this.doubleReview.first_check_time > 0 && this.doubleReview.check_time > 0) {
+        var leng = this.admin_users.length;
+        if (leng == 0) {
+          return "";
+        }
 
-          if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
-            let time = uParseTime(
-              this.doubleReview.check_time,
-              '{y}-{m}-{d} {h}:{i}'
-            )
-            if (this.doubleReview.modifier <= 0) {
-              return ''
-            }
-            var desc = ''
-            if (
-              this.admin_users == null ||
-              typeof this.admin_users.length == 'undefined'
-            ) {
-              return desc
-            }
-            var leng = this.admin_users.length
-            if (leng == 0) {
-              return desc
-            }
-            for (let index = 0; index < leng; index++) {
-              if (this.admin_users[index].id == this.doubleReview.modifier) {
-                let name = this.admin_users[index].name
-                desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
-                break
-              }
-            }
-            return desc
+        for (let index = 0; index < leng; index++) {
+          if (this.admin_users[index].id == this.doubleReview.creater) {
+            let name = this.admin_users[index].name;
+            desc = "首次核对人员:" + name + " 首次核对时间:" + time;
 
-          } else {
-            let time = uParseTime(
-              this.doubleReview.first_check_time,
-              '{y}-{m}-{d} {h}:{i}'
-            )
-            if (this.doubleReview.creater <= 0) {
-              return ''
-            }
-            var desc = ''
-            if (
-              this.admin_users == null ||
-              typeof this.admin_users.length == 'undefined'
-            ) {
-              return desc
-            }
-            var leng = this.admin_users.length
-            if (leng == 0) {
-              return desc
-            }
-            for (let index = 0; index < leng; index++) {
-              if (this.admin_users[index].id == this.doubleReview.creater) {
-                let name = this.admin_users[index].name
-                desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
-                break
-              }
-            }
-            return desc
+            break;
           }
-
-        } else {
+        }
+        return desc;
+      }
+    },
+    getScondCheckDesc: function() {
+      if (
+        this.doubleReview.first_check_time > 0 &&
+        this.doubleReview.check_time > 0
+      ) {
+        if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
           let time = uParseTime(
             this.doubleReview.check_time,
-            '{y}-{m}-{d} {h}:{i}'
-          )
+            "{y}-{m}-{d} {h}:{i}"
+          );
           if (this.doubleReview.modifier <= 0) {
-            return ''
+            return "";
           }
-          var desc = ''
+          var desc = "";
           if (
             this.admin_users == null ||
-            typeof this.admin_users.length == 'undefined'
+            typeof this.admin_users.length == "undefined"
           ) {
-            return desc
+            return desc;
           }
-          var leng = this.admin_users.length
+          var leng = this.admin_users.length;
           if (leng == 0) {
-            return desc
+            return desc;
           }
           for (let index = 0; index < leng; index++) {
             if (this.admin_users[index].id == this.doubleReview.modifier) {
-              let name = this.admin_users[index].name
-              desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
-              break
+              let name = this.admin_users[index].name;
+              desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
+              break;
+            }
+          }
+          return desc;
+        } else {
+          let time = uParseTime(
+            this.doubleReview.first_check_time,
+            "{y}-{m}-{d} {h}:{i}"
+          );
+          if (this.doubleReview.creater <= 0) {
+            return "";
+          }
+          var desc = "";
+          if (
+            this.admin_users == null ||
+            typeof this.admin_users.length == "undefined"
+          ) {
+            return desc;
+          }
+          var leng = this.admin_users.length;
+          if (leng == 0) {
+            return desc;
+          }
+          for (let index = 0; index < leng; index++) {
+            if (this.admin_users[index].id == this.doubleReview.creater) {
+              let name = this.admin_users[index].name;
+              desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
+              break;
             }
           }
-          return desc
+          return desc;
         }
-
-      },
-      getDate: function (val) {
-        return parseTime(val, '{y}-{m}-{d} {h}:{i}')
-      }
-    }, mounted () {
-
-      if (this.record.id == 0) {
-        this.check_time_str = parseTime(this.check_time, '{y}-{m}-{d} {h}:{i}' + ':00')
       } else {
-        if (this.record.modifier == 0) {
-          this.check_time_str = parseTime(this.check_time, '{y}-{m}-{d} {h}:{i}' + ':00')
-
-        } else {
-          this.check_time_str = parseTime(this.record.check_time, '{y}-{m}-{d} {h}:{i}' + ':00')
+        let time = uParseTime(
+          this.doubleReview.check_time,
+          "{y}-{m}-{d} {h}:{i}"
+        );
+        if (this.doubleReview.modifier <= 0) {
+          return "";
         }
+        var desc = "";
+        if (
+          this.admin_users == null ||
+          typeof this.admin_users.length == "undefined"
+        ) {
+          return desc;
+        }
+        var leng = this.admin_users.length;
+        if (leng == 0) {
+          return desc;
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.admin_users[index].id == this.doubleReview.modifier) {
+            let name = this.admin_users[index].name;
+            desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
+            break;
+          }
+        }
+        return desc;
+      }
+    },
+    getDate: function(val) {
+      return parseTime(val, "{y}-{m}-{d} {h}:{i}");
+    }
+  },
+  mounted() {
+    if (this.record.id == 0) {
+      this.check_time_str = parseTime(
+        this.check_time,
+        "{y}-{m}-{d} {h}:{i}" + ":00"
+      );
+    } else {
+      if (this.record.modifier == 0) {
+        this.check_time_str = parseTime(
+          this.check_time,
+          "{y}-{m}-{d} {h}:{i}" + ":00"
+        );
+      } else {
+        this.check_time_str = parseTime(
+          this.record.check_time,
+          "{y}-{m}-{d} {h}:{i}" + ":00"
+        );
       }
     }
   }
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-  .choose {
+.choose {
   .demo-form-inline {
-  border-bottom: 1px #e5e5e5 solid;
-  .el-form-item {
-  margin-bottom: 0;
-  padding: 0.2rem 0.2rem;
-  margin-right: 0;
-  }
-  p {
-  color: $title-color;
-  }
+    border-bottom: 1px #e5e5e5 solid;
+    .el-form-item {
+      margin-bottom: 0;
+      padding: 0.2rem 0.2rem;
+      margin-right: 0;
+    }
+    p {
+      color: $title-color;
+    }
   }
 
   .button {
-  text-align: center;
-  margin-top: 1rem;
-  .submitButton {
-  width: 3rem;
-  height: 0.8rem;
-  line-height: 0.8rem;
-  background: $main-color;
-  color: #fff;
-  font-size: 0.3rem;
-  text-align: center;
-  border-radius: 6px;
+    text-align: center;
+    margin-top: 1rem;
+    .submitButton {
+      width: 3rem;
+      height: 0.8rem;
+      line-height: 0.8rem;
+      background: $main-color;
+      color: #fff;
+      font-size: 0.3rem;
+      text-align: center;
+      border-radius: 6px;
+    }
   }
+}
+</style>
+<style lang="scss">
+.el-radio__inner {
+  @media only screen and (min-width: 768px) {
+    width: 20px;
+    height: 20px;
   }
+}
+.el-radio__input {
+  @media only screen and (min-width: 768px) {
+    margin-top: -6px;
   }
+}
 </style>
 

src/pages/main/dialog/OrdersDialog.vue

@@ -48,11 +48,11 @@
         <div class="content clearfix">
           <table class="table">
             <tr @click="cancelAdviceSelect">
-              <th width="8%">开嘱医生</th>
-              <th width="10%">开始时间</th>
+              <th width="11%">开嘱医生</th>
+              <th width="14%">开始时间</th>
               <th width="40%">医嘱内容</th>
-              <th width="10%">执行时间</th>
-              <th width="10%">执行护士</th>
+              <th width="14%">执行时间</th>
+              <th width="11%">执行护士</th>
               <th v-if="template_id != 6" width="10%">核对人员</th>
             </tr>
             <template v-for="(group, group_index) in advice_groups">
@@ -1491,7 +1491,7 @@ export default {
   display: flex;
   flex-wrap: wrap;
   span {
-    width: 16%;
+    width: 18%;
     @media only screen and (max-width: 415px) {
       padding: 0;
     }

src/pages/main/dialog/PrescriptionDialog.vue

@@ -4,14 +4,15 @@
     <div v-if="isShowDialog" class="Dialog">
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
-        <h1 class="name">透析处方</h1>
-        <button @click="showmsgtip">{{patient.name}} [透析号 {{patient.dialysis_no}} ]</button>
-        <span @click="commitInfo" class="success" v-if="isPermission()">完成</span>
+        <h1 class="name newName">透析处方</h1>
+        <button class="newButton" @click="showmsgtip">{{patient.name}}</button>
+        <span @click="commitInfo" class="success" v-if="isPermission()">保存</span>
         <span @click="commitInfo" class="success" v-if="!isPermission()"></span>
 
       </div>
 
-      <div class="DialogContent" id="dialogTop">
+      <div class="DialogContent newDialogContent" id="dialogTop">
+        <div>
         <div @click="showSubMenu('mode')" class="item" ref="mode" v-if="isShow('透析模式')">
           <label class="name" for="txms">透析模式</label>
           <div class="content">
@@ -279,7 +280,7 @@
           <textarea class="textarea" id="bz" placeholder="请输入内容" v-model="dialysisPrescription.remark"
                     @focus="lastInputFocus" @blur="lastInputBlur"></textarea>
         </div>
-
+        </div>
         <!--<div class="footer">-->
         <!--处方医生：刘小军 医生-->
         <!--</div>-->
@@ -311,7 +312,7 @@
     <long-advice-sub-menu :visibility="advice_visibility" v-on:menu-cancle-three="menuCancleThree"
                           v-on:menu-comfirm-three="menuComfirmThree" :propsForm="advicePropForm"></long-advice-sub-menu>
 
-    <msg-tip style="width:500px;" :visibility="msgtip_visibility" :predialysis="predialysis"
+    <msg-tip  :visibility="msgtip_visibility" :predialysis="predialysis"
              :last_predialysis="last_predialysis"
              :record="record"
              :last_record="last_record"
@@ -1883,11 +1884,33 @@
   height: 2.4rem;
   line-height: 0.6rem;
   color: $pgh-color;
-  font-size: 0.28rem;
+  font-size: 0.45rem;
   padding-left: 0.36rem;
   border: none;
   border-bottom: 1px #e5e5e5 solid;
   }
   }
+  .newButton{
+    background: #258ffc;
+    padding: 0 0.2rem;
+    height: 0.85rem;
+    line-height: 0.85rem;
+    border-radius:5px; 
+    color: #fff;
+    margin-right: -3rem;
+  }
+  .newName{
+    margin-right: -3rem;
+  }
+  .newDialogContent{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+    >:first-child{
+      flex: 1;
+      overflow: auto;
+    }
+  }
 </style>
 

src/pages/main/dialog/TreatmentDialog.vue

@@ -1,46 +1,71 @@
 <template>
- <div>
-    <div class="Dialog" v-show="isShowDialog" >
-        <div class="DialogTit">
-            <span @click="close()" class="iconfont">&#xe6e9;</span>
-            <h1 class="name">治疗小结</h1>
-            <span @click="commitInfo" class="success">完成</span>
-        </div>
+  <div>
+    <div class="Dialog" v-show="isShowDialog">
+      <div class="DialogTit">
+        <span @click="close()" class="iconfont">&#xe6e9;</span>
+        <h1 class="name">治疗小结</h1>
+        <span @click="commitInfo" class="success">保存</span>
+      </div>
 
-        <div class="DialogContent choose " id="dialogTop">
-          <el-form  :model="dialysisSummary" label-width="90px">
-              <el-form-item label="透后宣教 : ">
-                <!-- <el-select @change="dialysisAfterTeachSelectChange" v-model="dialysisSummary.text1" placeholder="请选择">
+      <div class="DialogContent choose" id="dialogTop">
+        <el-form :model="dialysisSummary" label-width="120px">
+          <el-form-item label="透后宣教 : ">
+            <!-- <el-select @change="dialysisAfterTeachSelectChange" v-model="dialysisSummary.text1" placeholder="请选择">
                   <el-option v-for="(s, index) in teach" :label="s.text" :value="s.value" :key="index"></el-option>
-                </el-select> -->
-              <el-input readonly v-model="dialysisSummary.propagandaAndEducationContentSelect" placeholder="请选择" @focus="showSubMenu('education')" ></el-input>
-              </el-form-item>
-              <el-form-item label-width="0"  >
-                <el-input type="textarea" v-model="dialysisSummary.propagandaAndEducationContent" :rows="5"></el-input>
-
-              </el-form-item>
-              <el-form-item label="透析小结 : ">
-                <!-- <el-select @change="dialysisSummarySelectChange"  v-model="dialysisSummary.text2"
+            </el-select>-->
+            <el-input
+              readonly
+              v-model="dialysisSummary.propagandaAndEducationContentSelect"
+              placeholder="请选择"
+              @focus="showSubMenu('education')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label-width="0">
+            <el-input
+              class="newTextarea"
+              type="textarea"
+              v-model="dialysisSummary.propagandaAndEducationContent"
+              :rows="5"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="透析小结 : ">
+            <!-- <el-select @change="dialysisSummarySelectChange"  v-model="dialysisSummary.text2"
                            placeholder="请选择">
                   <el-option v-for="(s, index) in summary" :label="s.text" :value="s.value"
                              :key="index"></el-option>
-                </el-select> -->
-                
-              <el-input readonly v-model="dialysisSummary.summaryContentSelect" placeholder="请选择" @focus="showSubMenu('summary')" ></el-input>
+            </el-select>-->
 
-              </el-form-item>
+            <el-input
+              readonly
+              v-model="dialysisSummary.summaryContentSelect"
+              placeholder="请选择"
+              @focus="showSubMenu('summary')"
+            ></el-input>
+          </el-form-item>
 
-              <el-form-item label-width="0"  >
-                <el-input @focus="lastInputFocus" @blur="lastInputBlur" type="textarea" v-model="dialysisSummary.summaryContent" :rows="5"></el-input>
-              </el-form-item>
-          </el-form>
-          <!-- <div class="button">
+          <el-form-item label-width="0">
+            <el-input
+              class="newTextarea"
+              @focus="lastInputFocus"
+              @blur="lastInputBlur"
+              type="textarea"
+              v-model="dialysisSummary.summaryContent"
+              :rows="5"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <!-- <div class="button">
               <button @click="commitInfo" class="submitButton">提交</button>
-          </div> -->
-        </div>
+        </div>-->
+      </div>
     </div>
-    
-    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" :propsForm="propForm"></check-box-sub-menu>
+
+    <check-box-sub-menu
+      :visibility="visibility"
+      v-on:menu-cancle="menuCancle"
+      v-on:menu-comfirm="menuComfirm"
+      :propsForm="propForm"
+    ></check-box-sub-menu>
   </div>
 </template>
 
@@ -48,29 +73,29 @@
 import { commitTreatmentSummary } from "@/api/dialysis";
 import { Toast } from "vant";
 import CheckBoxSubMenu from "./subMenu/checkBoxSubMenu";
-import {getDataConfig} from '@/utils/data';
+import { getDataConfig } from "@/utils/data";
 
 export default {
   name: "TreatmentDialog",
   data() {
     return {
-      isShowDialog:true,
-      
+      isShowDialog: true,
+
       visibility: false,
       propForm: {
-        title: '',
+        title: "",
         list: [],
         optionList: [],
         isMultiple: 2,
         result: [], //选中的值
         type: 1, //用来区分不同子菜单，方便对返回值进行赋值
-        selectId: 0,
+        selectId: 0
       },
 
       dialysisSummary: {
         text: "",
         propagandaAndEducationContent: "",
-        propagandaAndEducationContentSelect:'',
+        propagandaAndEducationContentSelect: "",
         text2: "",
         summaryContent: "",
         summaryContentSelect: "",
@@ -83,9 +108,9 @@ export default {
       summary: [],
       summaryObj: {},
       teach: [],
-      teachObj:{},
+      teachObj: {},
       title: "治疗小结 ",
-      record_date:"",
+      record_date: "",
       patient: {
         id: 0
       }
@@ -101,19 +126,19 @@ export default {
   },
   created() {
     // this.summary = this.$store.getters.summary;
-    this.summary = getDataConfig('summary','summary');
+    this.summary = getDataConfig("summary", "summary");
     // console.log("this.summary",this.summary)
     // this.teach = this.$store.getters.teach;
-    this.teach =  getDataConfig('education','education');
+    this.teach = getDataConfig("education", "education");
 
-    if (this.teach.length>0) {
+    if (this.teach.length > 0) {
       var tlen = this.teach.length;
       for (let index = 0; index < tlen; index++) {
         this.teach[index].name = this.teach[index].text;
         this.teachObj[this.teach[index].id] = this.teach[index];
       }
     }
-    if (this.summary.length>0) {
+    if (this.summary.length > 0) {
       var tlen = this.summary.length;
       for (let index = 0; index < tlen; index++) {
         this.summary[index].name = this.summary[index].text;
@@ -134,10 +159,11 @@ export default {
       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);
     // this.patient.id = this.patient_prop.id
 
-    if (this.record != null && this.record.id != '') {
+    if (this.record != null && this.record.id != "") {
       // for (const key in this.record) {
       //   this.dialysisSummary[key] = this.record[key];
       // }
@@ -147,11 +173,9 @@ export default {
       // if(this.record.dialysis_summary != 'undefined'){
       //   this.dialysisSummary.summaryContent = this.record.dialysis_summary
       // }
-
-
     }
-    console.log(this.dialysisSummary.propagandaAndEducationContent)
-    console.log(this.dialysisSummary.summaryContent)
+    console.log(this.dialysisSummary.propagandaAndEducationContent);
+    console.log(this.dialysisSummary.summaryContent);
   },
   methods: {
     lastInputFocus: function(event) {
@@ -167,63 +191,64 @@ export default {
         input.style.marginBottom = "";
       }, 0);
     },
-    showSubMenu: function (val) {
+    showSubMenu: function(val) {
       switch (val) {
-        case 'education':
-          this.propForm.type = 1
-          this.isShowDialog = false
-          this.propForm.title = '透后宣教'
-          this.visibility = true
-          this.propForm.list = []
+        case "education":
+          this.propForm.type = 1;
+          this.isShowDialog = false;
+          this.propForm.title = "透后宣教";
+          this.visibility = true;
+          this.propForm.list = [];
           this.propForm.optionList = this.teach;
           this.propForm.isMultiple = 1;
           this.propForm.selectId = this.dialysisSummary.xjid;
           break;
-        case 'summary':
-          this.propForm.type = 2
-          this.isShowDialog = false
-          this.propForm.title = '透析小结'
-          this.visibility = true
-          this.propForm.list = []
+        case "summary":
+          this.propForm.type = 2;
+          this.isShowDialog = false;
+          this.propForm.title = "透析小结";
+          this.visibility = true;
+          this.propForm.list = [];
           this.propForm.optionList = this.summary;
           this.propForm.isMultiple = 1;
           this.propForm.selectId = this.dialysisSummary.xxjid;
           break;
       }
-
     },
-    menuCancle: function () {
-        this.visibility = false
-        this.isShowDialog = true
-    }, 
-    menuComfirm: function (val) {
-
-      this.visibility = false
-      this.isShowDialog = true
+    menuCancle: function() {
+      this.visibility = false;
+      this.isShowDialog = true;
+    },
+    menuComfirm: function(val) {
+      this.visibility = false;
+      this.isShowDialog = true;
       switch (val.type) {
         case 1:
-          if(val.selectId in this.teachObj) {
+          if (val.selectId in this.teachObj) {
             var theValue = this.teachObj[val.selectId].value;
             this.dialysisAfterTeachSelectChange(theValue);
             this.dialysisSummary.xjid = val.selectId;
-            this.dialysisSummary.propagandaAndEducationContentSelect = this.teachObj[val.selectId].name;
+            this.dialysisSummary.propagandaAndEducationContentSelect = this.teachObj[
+              val.selectId
+            ].name;
           }
-          break
+          break;
         case 2:
-          if(val.selectId in this.summaryObj) {
+          if (val.selectId in this.summaryObj) {
             var theValue = this.summaryObj[val.selectId].value;
             this.dialysisSummarySelectChange(theValue);
             this.dialysisSummary.xxjid = val.selectId;
-            this.dialysisSummary.summaryContentSelect = this.summaryObj[val.selectId].name;
+            this.dialysisSummary.summaryContentSelect = this.summaryObj[
+              val.selectId
+            ].name;
           }
-          break
+          break;
       }
-
-    }, 
+    },
 
     dialysisSummarySelectChange: function(values) {
-      if(this.dialysisSummary.summaryContent == null){
-        this.dialysisSummary.summaryContent == ""
+      if (this.dialysisSummary.summaryContent == null) {
+        this.dialysisSummary.summaryContent == "";
       }
 
       if (this.dialysisSummary.summaryContent == "") {
@@ -247,13 +272,16 @@ export default {
       }
     },
     dialysisAfterTeachSelectChange: function(values) {
-      if(this.dialysisSummary.propagandaAndEducationContent == null){
-        this.dialysisSummary.propagandaAndEducationContent == ""
+      if (this.dialysisSummary.propagandaAndEducationContent == null) {
+        this.dialysisSummary.propagandaAndEducationContent == "";
       }
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
         this.dialysisSummary.propagandaAndEducationContent = values;
       } else {
-        if (this.dialysisSummary.propagandaAndEducationContent.indexOf(values) == -1) {
+        if (
+          this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
+          -1
+        ) {
           if (
             this.dialysisSummary.propagandaAndEducationContent
               .charAt(
@@ -271,10 +299,10 @@ export default {
       }
     },
     commitInfo: function() {
-      Toast.loading({forbidClick: true, duration: 0})
+      Toast.loading({ forbidClick: true, duration: 0 });
       let ParamsQuery = this.dialysisSummary;
-      ParamsQuery['patient'] = this.$route.query.patient_id
-      ParamsQuery["record_date"] = this.record_date
+      ParamsQuery["patient"] = this.$route.query.patient_id;
+      ParamsQuery["record_date"] = this.record_date;
       commitTreatmentSummary(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           Toast.fail(response.data.msg);
@@ -284,30 +312,29 @@ export default {
 
           this.$emit("did_update", response.data.data.summary);
           for (const key in response.data.data.summary) {
-            this.record[key] = response.data.data.summary[key]
+            this.record[key] = response.data.data.summary[key];
           }
         }
       });
     },
     close: function() {
       this.$emit("close");
-    }, open:function(){
-        this.isShowDialog = true;
-        this.visibility = false;
-        var dialogTop = document.querySelector('#dialogTop');
-        if (dialogTop != null) {
-          this.$nextTick(() => {
-              dialogTop.scrollTop = 0;
-          });
-        }
+    },
+    open: function() {
+      this.isShowDialog = true;
+      this.visibility = false;
+      var dialogTop = document.querySelector("#dialogTop");
+      if (dialogTop != null) {
+        this.$nextTick(() => {
+          dialogTop.scrollTop = 0;
+        });
       }
+    }
   },
-  
-  components: {
-    CheckBoxSubMenu,
-  },
-
 
+  components: {
+    CheckBoxSubMenu
+  }
 };
 </script>
 
@@ -328,6 +355,10 @@ export default {
     }
   }
 }
-
+</style>
+<style lang="scss">
+.newTextarea {
+  font-size: 0.45rem;
+}
 </style>
 

src/pages/main/dialog/TwoMenu.vue

@@ -7,9 +7,7 @@
       <h1 class="name">{{ title }}</h1>
       <!-- <span class="success" @click="handle_selected()">完成</span> -->
       <span v-if="type == 1" class="success"></span>
-      <span v-if="type == 2" @click="handle_selected" class="success"
-        >确定</span
-      >
+      <span v-if="type == 2" @click="handle_selected" class="success">确定</span>
     </div>
 
     <div class="optionsBox" v-show="type == 1">
@@ -30,9 +28,7 @@
                 single.id_key.lenght == 0 ? item : item[single.id_key]
               )
             "
-          >
-            {{ single.show_key.lenght == 0 ? item : item[single.show_key] }}
-          </li>
+          >{{ single.show_key.lenght == 0 ? item : item[single.show_key] }}</li>
         </ul>
       </div>
     </div>
@@ -46,10 +42,11 @@
               v-for="(item, index) in mutable.options"
               :key="index"
               :name="mutable.id_key.lenght == 0 ? item : item[mutable.id_key]"
-              >{{
-                mutable.show_key.lenght == 0 ? item : item[mutable.show_key]
-              }}</van-checkbox
             >
+              {{
+              mutable.show_key.lenght == 0 ? item : item[mutable.show_key]
+              }}
+            </van-checkbox>
           </van-checkbox-group>
         </li>
       </ul>
@@ -153,10 +150,11 @@ export default {
   }
   ul {
     li {
-      height: 1rem;
-      line-height: 1rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
       border-bottom: 1px #e5e5e5 solid;
       padding: 0 0.38rem;
+      font-size: 0.45rem;
     }
     .tick {
       position: relative;

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

@@ -36,10 +36,10 @@
           </div>
           <table class="table">
             <tr>
-              <th width="30%">医嘱内容</th>
+              <th width="26%">医嘱内容</th>
               <th width="20%">药品规格</th>
-              <th width="10%">开药数量</th>
-              <th width="10%">单次用量</th>
+              <th width="12%">开药数量</th>
+              <th width="12%">单次用量</th>
               <th width="15%">给药途径</th>
               <th width="15%">执行频率</th>
             </tr>

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

@@ -20,24 +20,18 @@
                 "
                 class="select_all_btn"
                 @click="selectTemplateAllAdviceAction(template)"
-              >
-                全选
-              </div>
+              >全选</div>
               <div
                 v-show="
                   isFold(template.id) && isTemplateSelectingAllAdvices(template)
                 "
                 class="select_all_btn"
                 @click="cancelSelectTemplateAllAdviceAction(template)"
-              >
-                取消全选
-              </div>
+              >取消全选</div>
 
               <span v-if="isFold(template.id)" class="iconfont">&#xe749;</span>
               <span v-if="!isFold(template.id)" class="iconfont">&#xe74a;</span>
-              <div @click="foldTemplateAction(template.id)" class="name">
-                {{ template.name }}
-              </div>
+              <div @click="foldTemplateAction(template.id)" class="name">{{ template.name }}</div>
             </div>
             <div
               v-show="isFold(template.id)"
@@ -52,9 +46,9 @@
                   {{ advice.prescribing_number }}
                   {{ advice.prescribing_number_unit }}
                 </span>
-                <span v-if="advice.single_dose">
-                  单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}
-                </span>
+                <span
+                  v-if="advice.single_dose"
+                >单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
               </span>
               <van-checkbox
                 v-else
@@ -68,9 +62,9 @@
                   {{ advice.prescribing_number }}
                   {{ advice.prescribing_number_unit }}
                 </span>
-                <span v-if="advice.single_dose">
-                  单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}
-                </span>
+                <span
+                  v-if="advice.single_dose"
+                >单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                 <span>{{ advice.delivery_way }}</span>
                 <span>{{ advice.execution_frequency }}</span>
                 <!--{{ advice.advice_name }} {{ advice.advice_desc }} {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }} 单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }} {{ advice.delivery_way }} {{ advice.execution_frequency }}-->
@@ -257,7 +251,7 @@ export default {
   min-height: 5rem;
   overflow-y: scroll;
   @media only screen and (max-width: 811px) {
-    min-height: 17.8rem !important;
+    max-height: 15.8rem !important;
   }
   ul {
     li {
@@ -288,8 +282,8 @@ export default {
     border-bottom: 1px #e5e5e5 solid;
     overflow: hidden;
     .template_name {
-      height: 1rem;
-      line-height: 1rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
       padding: 0 0.38rem;
 
       .select_all_btn {
@@ -306,6 +300,7 @@ export default {
       .name {
         display: inline-block;
         width: 76%;
+        font-size: 0.45rem;
       }
     }
 
@@ -323,11 +318,15 @@ export default {
         float: left;
         width: 8%;
         margin-top: 6px;
+        @media only screen and (min-width: 768px) {
+          margin-top: 10px;
+        }
       }
       .van-checkbox__label {
         float: left;
         width: 92%;
         line-height: 1rem;
+        font-size: 0.45rem;
       }
       .van-checkbox__label {
         margin-left: 0px;

src/pages/main/dialog/subMenu/checkBoxSubMenu.vue

@@ -5,14 +5,8 @@
         <span class="iconfont">&#xe720;</span>返回
       </div>
       <h1 class="name">{{ propsForm.title }}</h1>
-      <span
-        v-if="propsForm.isMultiple == 1"
-        @click="comfirm"
-        class="success"
-      ></span>
-      <span v-if="propsForm.isMultiple == 2" @click="comfirm" class="success"
-        >确定</span
-      >
+      <span v-if="propsForm.isMultiple == 1" @click="comfirm" class="success"></span>
+      <span v-if="propsForm.isMultiple == 2" @click="comfirm" class="success">确定</span>
     </div>
 
     <div v-if="propsForm.isMultiple == 1" class="optionsBox">
@@ -25,9 +19,7 @@
             :key="item.id"
             value="item"
             :class="propsForm.selectId == item.id ? 'tick' : ''"
-          >
-            {{ item.name }}
-          </li>
+          >{{ item.name }}</li>
           <!--<li v-if="propsForm.isHasOther == 1 && this.$store.getters.user.template_info.template_id == 2" @click="itemClick(-1)"  :key="-1" value="-1" :class="propsForm.selectId == -1? 'tick':'' ">其他</li>-->
         </ul>
       </div>
@@ -42,8 +34,7 @@
               v-for="(item, index) in propsForm.list"
               :key="index"
               :name="item.name"
-              >{{ item.name }}</van-checkbox
-            >
+            >{{ item.name }}</van-checkbox>
           </van-checkbox-group>
         </li>
       </ul>
@@ -139,11 +130,11 @@ export default {
       max-height: 16rem;
     }
     li {
-      height: 1.1rem;
-      line-height: 1.1rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
       border-bottom: 1px #e5e5e5 solid;
       padding: 0 0.38rem;
-      font-size: 0.36rem;
+      font-size: 0.45rem;
       color: $title-color;
     }
     .tick {
@@ -182,7 +173,7 @@ export default {
   }
   ul {
     li {
-      line-height: 1rem;
+      line-height: 1.2rem;
     }
   }
 }

src/pages/main/dialysis/AdviceTable.vue

@@ -65,10 +65,9 @@
         </li>
       </ul>
     </div>
-    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="AdviceTable">
+    <!-- <div style="width:100%;overflow:hildden;overflow-x:auto;" class="AdviceTable">
       <table class="table" style>
         <tr>
-          <!-- <th width="150px">序号</th> -->
           <th width="177px">期效</th>
 
           <th width="334px">开始时间</th>
@@ -86,7 +85,6 @@
           <th width="177px">校对护士</th>
           <th width="177px">校对时间</th>
 
-          <!-- <th width="200px">备注</th> -->
           <th width="177px">停止时间</th>
           <th width="177px">停止原因</th>
           <th width="177px">停嘱医生</th>
@@ -94,9 +92,6 @@
         </tr>
         <template v-for="(group, group_index) in advice_groups">
           <tr v-for="(advice, advice_index) in group.advices" :key="advice.id">
-            <!--<td v-if="advice.patient_id > 0" :rowspan="group.advices.length">-->
-            <!--<span></span>-->
-            <!--</td>-->
 
             <td v-if="advice_index == 0" :rowspan="group.advices.length">
               <span v-if="advice.advice_type == 1">长嘱</span>
@@ -156,7 +151,7 @@
               :rowspan="group.advices.length"
             >{{ parseTime(advice.check_time, "{m}-{d}{h}:{i}") }}</td>
 
-            <!-- <td>{{ advice.remark }}</td> -->
+
             <td v-if="advice_index == 0" :rowspan="group.advices.length">
               {{ advice.stop_state == 1 && advice.parent_id
               == 0 ? parseTime(advice.stop_time, '{y}-{m}-{d} {h}:{i}') : '' }}
@@ -194,49 +189,47 @@
             </td>
           </tr>
         </template>
-        <!-- <tr v-for="(item,index) in tableDate" :key="index" :value="item.value">
-          <td>{{setAdviceNo(index, item)}}</td>
-          <td>{{item.start_time_show}}</td>
-          <td>{{item.advice_name}}</td>
-          <td>{{item.drug_spec}} {{ item.drug_spec_unit }}</td>
-          <td>{{item.single_dose}} {{item.single_dose_unit }}</td>
-          <td>
-            <span v-if="item.parent_id==0">{{item.delivery_way}}</span>
-          </td>
-          <td>
-            <span v-if="item.parent_id==0">{{item.execution_frequency}}</span>
-          </td>
-          <td>{{tranDoctor(item.advice_doctor)}}</td>
-          <td>{{item.advice_affirm}}</td>
-          <td>{{item.remark}}</td>
-          <td>{{item.stop_time_show}}</td>
-          <td>
-            <span v-if="item.parent_id==0">{{item.stop_reason}}</span>
-          </td>
-          <td>
-            <span v-if="item.stop_state==1&&item.parent_id==0">{{tranDoctor(item.stop_doctor)}}</span>
-          </td>
-          <td>
-            <span class="xg" @click="openEdit(index, item)">
-              <span class="iconfont">&#xe6f7;</span>修改医嘱
-            </span>
-            <span class="xg" @click="openStop(index, item)">
-              <span class="iconfont">&#xe64c;</span>停止医嘱
-            </span>
-            <span class="sc" @click="deleteAdvice(index, item)">
-              <span class="iconfont">&#xe6f8;</span>删除医嘱
-            </span>
-            <span class="xg" @click="openNewChild(index, item)">
-              <span class="iconfont">&#xe604;</span>添加医嘱
-            </span>
-          </td>
-        </tr>-->
+        
       </table>
-      <!--<div class="NoData" v-show="tableDate.length == 0"><img src="@/assets/login/data.jpg" alt=""></div>-->
       <div class="NoData" v-show="advice_groups.length == 0">
         <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
       </div>
-    </div>
+    </div>-->
+    <el-table :data="date" border style="width: 100%">
+      <el-table-column fixed prop="date" label="期效" width="100"></el-table-column>
+      <el-table-column prop="name" label="开始时间" width="100"></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="100"></el-table-column>
+      <el-table-column prop="date" label="单次用量" width="100"></el-table-column>
+      <el-table-column prop="name" label="给药途径" width="100"></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="100"></el-table-column>
+      <el-table-column prop="date" label="开嘱医生" width="100"></el-table-column>
+      <el-table-column prop="name" label="开嘱时间" width="100"></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="date" label="停止时间" width="100"></el-table-column>
+      <el-table-column prop="name" label="停止原因" width="100"></el-table-column>
+      <el-table-column prop="province" label="停嘱医生" width="120"></el-table-column>
+      <el-table-column label="操作" width="500">
+        <template slot-scope="scope">
+          <span class="xg" @click="modifyAdviceAction(group_index, advice_index)">
+            <span class="iconfont">&#xe6f7;</span>修改医嘱
+          </span>
+          <span class="xg" @click="stopAdviceAction(group_index, advice_index)">
+            <span class="iconfont">&#xe64c;</span>停止医嘱
+          </span>
+          <span class="sc" @click="deleteAdviceAction(group_index, advice_index)">
+            <span class="iconfont">&#xe6f8;</span>删除医嘱
+          </span>
+          <span class="xg" @click="addSubdrugAction(group_index, advice_index)">
+            <span class="iconfont">&#xe604;</span>添加子药
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
     <mt-datetime-picker
       ref="start_date_picker"
       type="date"
@@ -540,7 +533,41 @@ export default {
       modify_advice_context: {
         group_index: -1,
         advice_index: -1
-      }
+      },
+      date: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        }
+      ]
     };
   },
   methods: {

src/pages/main/dialysis/CheckTab.vue

@@ -105,15 +105,18 @@ export default {
   // @media only screen and (min-width: 415px) and (max-width: 736px) {
   //   top: 88px !important;
   // }
-  @media only screen and (max-width: 812px) {
-    top: 76px !important;
-  }
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
-    top: 117px !important;
-  }
-  @media only screen and (min-width: 1024px) {
-    top: 117px !important;
+  // @media only screen and (max-width: 767px) {
+  //   top: 76px !important;
+  // }
+  @media only screen and (min-width: 768px) {
+    top: 116px !important;
   }
+  // @media only screen and (min-width: 813px) and (max-width: 1024px) {
+  //   top: 117px !important;
+  // }
+  // @media only screen and (min-width: 1024px) {
+  //   top: 117px !important;
+  // }
   right: 0;
   z-index: 55;
   left: 0;
@@ -182,4 +185,16 @@ export default {
     transform: translateX(75.25px) !important;
   }
 }
+.van-tabs {
+  height: 1.1rem;
+}
+.van-tabs--line .van-tabs__wrap {
+  height: 1.1rem;
+}
+.van-tabs--line {
+  padding-top: 1.1rem;
+}
+.van-tab {
+  line-height: 1.1rem;
+}
 </style>

src/pages/main/dialysis/DialysisTab.vue

@@ -62,6 +62,9 @@ export default {
   // @media only screen and (min-width: 376px) and (max-width: 737px) {
   //   padding-top: 46px;
   // }
+  @media only screen and (min-width: 768px) {
+    padding-top: 75px;
+  }
   @media only screen and (min-width: 813px) and (max-width: 1024px) {
     padding-top: 74px;
   }
@@ -69,9 +72,12 @@ export default {
     border-bottom: 1px #e5e5e5 solid;
     position: fixed;
     top: 45px;
-    @media only screen and (min-width: 813px) and (max-width: 1024px) {
-      top: 64px;
+    @media only screen and (min-width: 768px) {
+      top: 63px;
     }
+    // @media only screen and (min-width: 813px) and (max-width: 1024px) {
+    //   top: 64px;
+    // }
     // @media only screen and (min-width: 376px) and (max-width: 668px) {
     //   top: 50px;
     // }

src/pages/main/dialysis/InspectionItemTable.vue

@@ -300,7 +300,7 @@ export default {
 .van-list {
   background: #fff;
   min-height: calc(100vh - 178px);
-  margin-top: 76px;
+  margin-top: 66px;
   // @media only screen and (min-width: 376px) and (max-width: 668px) {
   //   margin-top: 84px;
   // }
@@ -310,12 +310,15 @@ export default {
   // @media only screen and (max-width: 812px) {
   //   margin-top: 80px !important;
   // }
-  @media only screen and (min-width: 813px) and (max-width: 1023px) {
-    margin-top: 114px !important;
-  }
-  @media only screen and (min-width: 1024px) {
-    margin-top: 96px !important;
+  @media only screen and (min-width: 768px) {
+    margin-top: 126px !important;
   }
+  // @media only screen and (min-width: 813px) and (max-width: 1023px) {
+  //   margin-top: 114px !important;
+  // }
+  // @media only screen and (min-width: 1024px) {
+  //   margin-top: 96px !important;
+  // }
 }
 </style>
 

src/pages/main/dialysis/LongTable.vue

@@ -1,14 +1,13 @@
 <template>
   <div>
     <div class="blueBorder"></div>
-    <div class="tableTit">
+    <!-- <div class="tableTit">
       <ul>
         <li
           v-for="(item,index) in ['序号','透析模式','透析时长','医生','更新日期','操作']"
           :key="index"
           :value="item.value"
         >{{item}}</li>
-        <!-- <li v-for="(item,index) in ['序号','透析模式','透析时长','医生','更新日期']" :key="index" :value="item.value" >{{item}}</li> -->
       </ul>
     </div>
     <div class="tableDate">
@@ -29,8 +28,21 @@
       <div class="NoData" v-show="tableDate.length == 0">
         <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
       </div>
+    </div>-->
+    <div class="newTable">
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column fixed prop="date" label="序号" width="100"></el-table-column>
+        <el-table-column prop="name" label="透析模式" width="100"></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="100"></el-table-column>
+        <el-table-column label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" type="text" size="small">修改</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
-
     <van-popup
       title="透析处方"
       v-model="showObj.showPopup"
@@ -404,7 +416,42 @@ export default {
       anticoagulantsConfit: {},
       timeValue: "",
       time: "03:00",
-      record_date: ""
+      record_date: "",
+
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        }
+      ]
     };
   },
   methods: {
@@ -793,4 +840,14 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+.newTable {
+  .el-table td {
+    padding: 0;
+  }
+  .el-table th {
+    padding: 6px 0;
+  }
+}
+</style>
 

src/pages/main/dialysis/RecordTable.vue

@@ -44,7 +44,7 @@
         </ul>
       </div>
       <div class="blueBorder"></div>
-      <div style="width:100%;overflow:hildden;overflow-x:auto;" class="RecordTable">
+      <!-- <div style="width:100%;overflow:hildden;overflow-x:auto;" class="RecordTable">
         <table class="table" style>
           <tr>
             <th width="124px">透析日期</th>
@@ -80,17 +80,31 @@
             <td>{{item.assessment_after_dislysis.systolic_blood_pressure?item.assessment_after_dislysis.systolic_blood_pressure:""}}</td>
             <td>{{item.predialysis_evaluation.ultrafiltration_amount?item.predialysis_evaluation.ultrafiltration_amount:""}}</td>
             <td>{{setAnticoagulantsConfit(item.prescription)}}</td>
-            <!--<td>{{getName(item.treatment_summary.zl_nurse)}}</td>-->
-            <!--<td>{{getName(item.treatment_summary.zl_doctor)}}</td>-->
             <td>{{getName(item.treatment_summary.zl_nurse)}}</td>
             <td>{{getName(item.treatment_summary.zl_doctor)}}</td>
           </tr>
         </table>
-        <!--<div class="NoData" v-show="tableDate.length == 0"><img src="@/assets/login/data.jpg" alt=""></div>-->
         <div class="NoData" v-show="tableDate.length == 0">
           <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
         </div>
-      </div>
+
+      </div>-->
+      <el-table :data="date" border style="width: 100%">
+        <el-table-column fixed prop="date" label="透析日期" width="100"></el-table-column>
+        <el-table-column prop="name" label="班次" width="100"></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="透析时长(h)" width="100"></el-table-column>
+        <el-table-column prop="date" label="干体重(kg)" width="100"></el-table-column>
+        <el-table-column prop="name" label="透前体重(kg)" width="100"></el-table-column>
+        <el-table-column prop="province" label="透后体重(kg)" width="120"></el-table-column>
+        <el-table-column prop="city" label="透前血压(mmHg)" width="120"></el-table-column>
+        <el-table-column prop="address" label="透后血压(mmHg)" width="100"></el-table-column>
+        <el-table-column prop="date" label="超滤总量(L)" width="100"></el-table-column>
+        <el-table-column prop="name" label="抗凝剂种类 首剂/维持/总量" width="100"></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>
     </van-list>
 
     <mt-datetime-picker
@@ -195,7 +209,42 @@ export default {
         limit: 15
       },
 
-      tableDate: []
+      tableDate: [],
+
+      date: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        }
+      ]
     };
   },
   methods: {
@@ -456,4 +505,12 @@ export default {
   overflow-y: scroll;
 }
 </style>
+<style lang="scss">
+.el-table td {
+  padding: 0;
+}
+.el-table th {
+  padding: 6px 0;
+}
+</style>
 

src/pages/main/records/CaseHistory.vue

@@ -76,7 +76,7 @@ export default {
   left: 0;
   background: #fff;
   background: #fff;
-  @media only screen and (max-width: 812px) {
+  @media only screen and (max-width: 767px) {
     top: 45px !important;
   }
   // @media only screen and (min-width: 376px) and (max-width: 668px) {

src/pages/main/today/TodayTab.vue

@@ -1604,3 +1604,8 @@ export default {
   z-index: 999;
 }
 </style>
+<style lang="scss">
+.el-table::before{
+  z-index: 0;
+}
+</style>

src/pages/main/today/detailsInfo.vue

@@ -8,11 +8,7 @@
 
     <div class="ui-step clearfix">
       <ul class="ui-step-ul">
-        <li
-          v-for="(item, index) in step_data"
-          :key="index"
-          class="ui-step-done"
-        >
+        <li v-for="(item, index) in step_data" :key="index" class="ui-step-done">
           <div
             class="ui-step-number"
             :style="
@@ -218,6 +214,11 @@ export default {
           font-weight: normal;
           @media only screen and (max-width: 415px) {
             width: 1rem;
+            margin-left: 2px;
+          }
+          @media only screen and (min-width: 768px) {
+            width: 1rem;
+            margin-left: 10px;
           }
         }
         .ui-step-number {

src/pages/monitoring/index.vue

@@ -168,6 +168,7 @@
           />
         </div>
       </van-list>-->
+<<<<<<< .mine
       <el-table :data="tableData" border style="width: 100%" class="newTable">
         <el-table-column fixed prop="date" label="机号" width="100" align="center">
             <template slot-scope="scope">
@@ -247,6 +248,87 @@
             </template>
         </el-table-column>
       </el-table>
+=======
+      <div class="monitoringTable">
+        <el-table :data="tableData" border style="width: 100%" class="newTable">
+          <el-table-column fixed prop="date" label="姓名" width="100"></el-table-column>
+          <el-table-column prop="name" label="机号" width="100"></el-table-column>
+          <el-table-column prop="province" label="透析号" width="100"></el-table-column>
+          <el-table-column prop="city" label="排班时间" width="100"></el-table-column>
+          <el-table-column prop="address" label="透析模式" width="200"></el-table-column>
+          <el-table-column prop="zip" label="脱水量" width="100"></el-table-column>
+          <el-table-column prop="zip" label="体重(透前/透后)" width="150"></el-table-column>
+          <el-table-column prop="zip" label="监控预警(血压/心率)" width="200"></el-table-column>
+        </el-table>
+      </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
     </div>
     <side-bar :active_index="1"></side-bar>
     <mt-datetime-picker
@@ -561,8 +643,11 @@ export default {
   // @media only screen and (max-width: 415px) {
   //   top: 38px !important;
   // }
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
-    top: 38px !important;
+  // @media only screen and (min-width: 813px) and (max-width: 1024px) {
+  //   top: 38px !important;
+  // }
+  @media only screen and (min-width: 768px) {
+    top: 80px !important;
   }
   ul {
     @include display-flex;
@@ -579,10 +664,11 @@ export default {
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
-      padding: 0.3rem 0;
+      padding: 0 0 0.3rem;
 
       .iconfont {
         margin: 0 0.1rem;
+        color: #fff;
       }
       .line {
         background: #a8b3ba;
@@ -652,13 +738,18 @@ export default {
   line-height: 1rem;
   font-size: 0.45rem;
 }
-.newTable {
-  margin-top: 90px;
-}
-.el-table td {
-  padding: 0;
-}
-.el-table th {
-  padding: 6px 0;
+.monitoringTable {
+  .newTable {
+    margin-top: 90px;
+    @media only screen and (min-width: 768px) {
+      margin-top: 140px !important;
+    }
+  }
+  .el-table td {
+    padding: 0;
+  }
+  .el-table th {
+    padding: 6px 0;
+  }
 }
 </style>

src/pages/personal/ChangePassword.vue

@@ -0,0 +1,3 @@
+<template>
+  <div>12</div>
+</template>

src/pages/personal/ForgetPassword.vue

@@ -0,0 +1,127 @@
+<template>
+  <div class="container">
+    <div class="newLogin">
+      <div class="login">
+        <div class="logo">
+          <img src="../../assets/login/newLogo.png" alt />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped >
+.container {
+  // background: $white-bg;
+  background: #f5f5f5;
+  @include box-sizing;
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+
+  .newLogin {
+    width: 90%;
+    height: 90%;
+    margin: auto;
+    box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
+    border-radius: 14px;
+    background: #fff;
+  }
+  .login {
+    // @include box-shadow;
+    @include text-align;
+    @include display-flex;
+    @include align-items-center;
+    // @include justify-content-center;
+    @include flex-direction;
+    height: 100%;
+    .logo {
+      padding: 3rem 0 1rem;
+      img {
+        width: 40%;
+        height: auto;
+        display: inline-block;
+      }
+    }
+    .reg {
+      width: 8.77rem;
+      .welcome {
+        text-align: left;
+        font-size: 0.55rem;
+        font-weight: 400;
+        color: rgba(37, 143, 252, 1);
+        margin-bottom: 0.5rem;
+        // line-height: 14px;
+      }
+      .newForget {
+        text-align: right;
+        font-size: 0.5rem;
+        font-weight: 400;
+        color: rgba(37, 143, 252, 1);
+        margin-top: 0.5rem;
+      }
+      .form {
+        border: 1px $border-color solid;
+        border-radius: 4px;
+        li {
+          border-bottom: 1px $border-color solid;
+          @include align-items-center;
+          @include text-align;
+          @include display-flex;
+          @include box-sizing;
+          .tel {
+            padding: 0.4rem 0;
+            width: 90%;
+            border: none;
+            outline: none;
+            font-size: 0.45rem;
+          }
+          .mint-cell {
+            width: 100%;
+          }
+          &:last-child {
+            border: none;
+          }
+          .iconfont {
+            color: $main-color;
+            font-size: 0.5rem;
+            margin: 0 0.46rem;
+          }
+        }
+      }
+      .forget {
+        text-align: left;
+        padding: 0.45rem 1rem;
+        a {
+          float: left;
+          font-size: 0.28rem;
+          color: $main-color;
+          &:nth-child(2) {
+            color: #999999;
+            float: right;
+          }
+          &:active {
+            background: $white-bg;
+          }
+        }
+      }
+      .loginBtn {
+        width: 100%;
+        height: 1.3rem;
+        line-height: 1.3rem;
+        background: $main-color;
+        color: #fff;
+        font-size: 0.45rem;
+        @include text-align;
+        border-radius: 4px;
+        margin: 40px 0 0 0;
+      }
+      .disableLoginBtn {
+        background: lightgray;
+      }
+    }
+  }
+}
+</style>

src/pages/personal/index.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="mainBox">
     <div class="mainContent">
-      <h1 class="title">我的</h1>
+      <!-- <h1 class="title">我的</h1>
       <div class="information">
         <div class="blueBorder"></div>
         <div class="name">
-          <!--<router-link to="/EditPersonal">-->
+          <router-link to="/EditPersonal">
           <div class="item">
             <div class="tx">
               <img :src="myinfo.avatar" alt v-if="myinfo.avatar != ''" />
               <img :src="avatar" alt v-if="myinfo.avatar == ''" />
             </div>
-            <!--<span class="iconfont">&#xe6f9;</span>-->
+            <span class="iconfont">&#xe6f9;</span>
           </div>
-          <!--</router-link>-->
+          </router-link>
         </div>
         <div class="name">
           <router-link to="/ElectronicSignature">
@@ -26,16 +26,6 @@
             </div>
           </router-link>
         </div>
-        <!-- <div class="name"> 
-          <router-link to="/">
-            <div class="item">
-              <div class="tx">
-              <h2>修改密码</h2>
-              </div>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
-          </router-link>
-        </div> -->
         <div class="set" v-show="false">
           <div class="item">
             <div class="tx">
@@ -76,6 +66,41 @@
         <div class="set">
           <span class="out" @click="logout">退出登录</span>
         </div>
+      </div>-->
+      <div class="myTitle">我的</div>
+      <div class="mybanner">
+        <img class="bannerOne" src="../../assets/my/myBanner.png" alt />
+        <div class="avatar">
+          <img src="../../assets/my/avatar.png" alt />
+          <p>用户姓名</p>
+        </div>
+      </div>
+      <div class="list">
+        <router-link to="/ElectronicSignature">
+          <div class="name">
+            <div class="left">
+              <img src="../../assets/my/name.png" alt />
+              <span>电子签名</span>
+            </div>
+            <span class="iconfont jiantou">&#xe6f9;</span>
+          </div>
+        </router-link>
+        <router-link to="/ChangePassword">
+          <div class="name">
+            <div class="left">
+              <img src="../../assets/my/modification.png" alt />
+              <span>修改密码</span>
+            </div>
+            <span class="iconfont jiantou">&#xe6f9;</span>
+          </div>
+        </router-link>
+        <div class="name" @click="logout">
+          <div class="left">
+            <img src="../../assets/my/exit.png" alt />
+            <span>退出登录</span>
+          </div>
+          <span class="iconfont jiantou">&#xe6f9;</span>
+        </div>
       </div>
     </div>
     <side-bar :active_index="3"></side-bar>
@@ -241,5 +266,77 @@ export default {
     flex: 1;
     overflow: auto;
   }
+  .myTitle {
+    height: 1.4rem;
+    line-height: 1.4rem;
+    width: 100%;
+    background: #3275fd;
+    text-align: center;
+    color: #fff;
+    font-size: 0.6rem;
+  }
+  .mybanner {
+    height: 30%;
+    margin-top: -1px;
+    position: relative;
+    .bannerOne {
+      position: absolute;
+    }
+    img {
+      width: 100%;
+      height: 100%;
+    }
+    .avatar {
+      position: absolute;
+      width: 4rem;
+      top: 1rem;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      margin: auto;
+      text-align: center;
+      img {
+        width: 2.5rem;
+        height: 2.5rem;
+      }
+      p {
+        font-size: 0.5rem;
+        color: #fff;
+        margin-top: 0.2rem;
+      }
+    }
+  }
+  .name {
+    display: flex;
+    height: 1.8rem;
+    line-height: 1.8rem;
+    background: #fff;
+    margin: 0 0.4rem;
+    padding: 0 0.4rem;
+    display: flex;
+    justify-content: space-between;
+    border-radius: 5px;
+    margin-top: 0.5rem;
+    .left {
+      height: 100%;
+      line-height: 1.8rem;
+      display: flex;
+      align-items: center;
+      span {
+        color: #333333;
+        font-size: 0.5rem;
+        margin-left: 0.4rem;
+        font-weight: 600;
+      }
+    }
+    img {
+      width: 1rem;
+      height: 1rem;
+      display: inline-block;
+    }
+    .jiantou {
+      font-size: 0.6rem;
+    }
+  }
 }
 </style>

src/router/index.js

@@ -1,70 +1,79 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-Vue.use(Router)
+Vue.use(Router);
 
 export default new Router({
   routes: [
     {
-      path: '/',
-      name: 'Home',
-      component: () => import('@/pages/home/login')
+      path: "/",
+      name: "Home",
+      component: () => import("@/pages/home/login")
     },
     {
-      path: '/product',
-      name: 'Product',
-      component: () => import('@/pages/product/index')
+      path: "/product",
+      name: "Product",
+      component: () => import("@/pages/product/index")
     },
     {
-      path: '/main',
-      name: 'main',
-      component: () => import('@/pages/main/index')
+      path: "/main",
+      name: "main",
+      component: () => import("@/pages/main/index")
     },
     {
-      path: '/details',
-      name: 'details',
-      component: () => import('@/pages/main/DetailsPage')
+      path: "/details",
+      name: "details",
+      component: () => import("@/pages/main/DetailsPage")
     },
     {
-      path: '/monitoring',
-      name: 'monitorPage',
-      component: () => import('@/pages/monitoring/index')
-
+      path: "/monitoring",
+      name: "monitorPage",
+      component: () => import("@/pages/monitoring/index")
+    },
+    {
+      path: "/my",
+      name: "my",
+      component: () => import("@/pages/personal/index")
+    },
+    {
+      path: "/advice",
+      name: "doctorAdvice",
+      component: () => import("@/pages/advice/index")
     },
     {
-      path: '/my',
-      name: 'my',
-      component: () => import('@/pages/personal/index')
+      path: "/EditPersonal",
+      name: "EditPersonal",
+      component: () => import("@/pages/personal/EditPersonal")
     },
     {
-      path: '/advice',
-      name: 'doctorAdvice',
-      component: () => import('@/pages/advice/index')
+      path: "/ElectronicSignature",
+      name: "ElectronicSignature",
+      component: () => import("@/pages/personal/ElectronicSignature")
     },
     {
-      path: '/EditPersonal',
-      name: 'EditPersonal',
-      component: () => import('@/pages/personal/EditPersonal')
+      path: "/Print",
+      name: "Print",
+      component: () => import("@/pages/main/PrintIndex")
     },
     {
-      path: '/ElectronicSignature',
-      name: 'ElectronicSignature',
-      component: () => import('@/pages/personal/ElectronicSignature')
+      path: "/add_urgent_schedule",
+      name: "AddUrgentSchedule",
+      component: () => import("@/pages/main/add_urgent_schedule")
     },
     {
-      path: '/Print',
-      name: 'Print',
-      component: () => import('@/pages/main/PrintIndex')
+      path: "/Prints",
+      name: "Prints",
+      component: () => import("@/pages/main/Print")
     },
     {
-      path: '/add_urgent_schedule',
-      name: 'AddUrgentSchedule',
-      component: () => import('@/pages/main/add_urgent_schedule')
+      path: "/forgetPassword",
+      name: "forgetPassword",
+      component: () => import("@/pages/personal/ForgetPassword")
     },
     {
-      path: '/Prints',
-      name: 'Prints',
-      component: () => import('@/pages/main/Print')
+      path: "/changePassword",
+      name: "changePassword",
+      component: () => import("@/pages/personal/changePassword")
     }
   ]
-})
+});

src/styles/style.scss

@@ -12,6 +12,7 @@ body {
 
 .iconfont {
   color: #a8b3ba;
+  font-size: 0.45rem;
 }
 
 .mainBox {
@@ -417,18 +418,18 @@ body {
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
-      padding: 0.2rem 0.36rem;
+      padding: 0.3rem 0.36rem;
       z-index: 999;
       background: #fff;
       box-shadow: 3px 3px 3px #d7dce2;
       margin-bottom: 0.24rem;
       .iconfont {
-        font-size: 0.5rem;
+        font-size: 0.6rem;
         color: $main-color;
         font-weight: bold;
-        @media only screen and (max-width: 812px) {
-          font-size: 0.34rem !important;
-        }
+        // @media only screen and (max-width: 812px) {
+        //   font-size: 0.34rem !important;
+        // }
       }
       .back {
         font-size: 0.36rem;
@@ -443,12 +444,12 @@ body {
         }
       }
       .name {
-        font-size: 0.36rem;
+        font-size: 0.45rem;
         color: $main-color;
         font-weight: 600;
       }
       .success {
-        font-size: 0.36rem;
+        font-size: 0.45rem;
         font-weight: 600;
         color: $title-color;
       }
@@ -487,9 +488,9 @@ body {
         @include justify-content-between;
         color: $title-color;
         .name {
-          font-size: 0.34rem;
-          height: 1.1rem;
-          line-height: 1.1rem;
+          font-size: 0.45rem;
+          height: 1.2rem;
+          line-height: 1.2rem;
           color: $title-color;
         }
         .content {
@@ -503,7 +504,7 @@ body {
             height: 1rem;
             line-height: 1rem;
             border: none;
-            font-size: 0.3rem;
+            font-size: 0.45rem;
             @include flex;
             text-align: right;
             width: 100%;
@@ -511,7 +512,7 @@ body {
           .text {
             height: 1rem;
             line-height: 0.5rem;
-            font-size: 0.34rem;
+            font-size: 0.45rem;
           }
         }
       }
@@ -529,13 +530,13 @@ body {
       button {
         padding: 0 0.32rem;
         border: $main-color;
-        font-size: 0.28rem;
+        font-size: 0.36rem;
         text-align: center;
-        height: 0.7rem;
+        height: 1rem;
         line-height: 0.7rem;
         background: #fff;
         border: 1px $main-color solid;
-        border-radius: 0.06rem;
+        border-radius: 5px;
         color: $main-color;
         margin: 0 0.11rem;
         &.tjcq {
@@ -601,26 +602,26 @@ body {
   color: #fff;
   border-color: $main-color !important;
   background-color: $main-color !important;
-  @media only screen and (max-width: 812px) {
-    font-size: 14px !important;
-    line-height: 16px !important;
-    width: 16px !important;
-    height: 16px !important;
+  @media only screen and (min-width: 768px) {
+    font-size: 20px !important;
+    line-height: 30px !important;
+    width: 30px !important;
+    height: 30px !important;
   }
 }
 
-.van-checkbox__icon .van-icon {
-  @media only screen and (max-width: 812px) {
-    font-size: 14px !important;
-    line-height: 16px !important;
-    width: 16px !important;
-    height: 16px !important;
-  }
-}
+// .van-checkbox__icon .van-icon {
+//   @media only screen and (max-width: 812px) {
+//     font-size: 14px !important;
+//     line-height: 16px !important;
+//     width: 16px !important;
+//     height: 16px !important;
+//   }
+// }
 
 .CheckBox .van-checkbox__label {
   width: 94%;
-  font-size: 0.34rem;
+  font-size: 0.45rem;
   @media only screen and (max-width: 812px) {
     width: 90%;
   }
@@ -631,7 +632,7 @@ body {
 }
 
 .picker-item {
-  font-size: 0.34rem;
+  font-size: 0.45rem;
 }
 
 .NoData {
@@ -694,14 +695,14 @@ body {
 }
 
 .el-form-item__label {
-  font-size: 0.34rem !important; // width: 90px !important;
+  font-size: 0.45rem !important; // width: 90px !important;
   @media only screen and (max-width: 812px) {
     text-align: left !important;
   }
 }
 
 .el-radio__label {
-  font-size: 0.32rem !important;
+  font-size: 0.45rem !important;
 }
 
 .el-radio + .el-radio {
@@ -800,7 +801,7 @@ body {
 }
 .picker-toolbar {
   @media only screen and (max-width: 812px) {
-    height: 30px !important;
+    height: 40px !important;
   }
 }
 .mint-datetime-action {
@@ -874,6 +875,9 @@ body {
   background: #fff;
   min-height: calc(100vh - 2px);
   padding-left: 0.45rem;
+  @media only screen and (min-width: 768px) {
+    padding-top: 216px;
+  }
 }
 #app {
   -webkit-overflow-scrolling: touch;