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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.2"
+  "version": "1.1.68"
 }

config/prod.env.js

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

src/pages/home/login.vue

@@ -37,25 +37,18 @@
             :disabled="loginDisable"
           >登录</button>
 
-          <!-- <router-link to="/forgetPassword"> -->
-          <div class="newForget" style="display:none">忘记密码</div>
-          <!-- </router-link> -->
+          <!-- <router-link to="/forgetPassword">
+            <div class="newForget">忘记密码</div>
+          </router-link>-->
           <!-- </router-link> -->
           <!-- <div class="forget">
           <a href="">免密码登录</a>
           <a href="">忘记密码？</a>
           </div>-->
-          <!--<div class="agree">-->
-            <!--<el-checkbox v-model="agreement">-->
-              <!--我已阅读并同意-->
-              <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
-
-              <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
-            <!--</el-checkbox>-->
-            <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
-            <!--<span class="agreeText" @click="agree">《隐私服务协议》</span>-->
-            <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
-          <!--</div>-->
+          <div class="agree">
+            <el-checkbox v-model="agreement">我已阅读并同意</el-checkbox>
+            <span class="agreeText" @click="agree()">《隐私服务协议》</span>
+          </div>
         </div>
       </div>
     </div>
@@ -131,7 +124,7 @@ export default {
       });
     },
     to: function() {
-      this.$router.push({ path: "/forgetPassword" });
+      this.$router.push({ path: "/privacy" });
     },
     submitForm() {
       const self = this;
@@ -150,8 +143,11 @@ export default {
 
       loginByPwd(this.form.mobile, hex_md5(this.form.pwd)).then(rs => {
         var resp = rs.data;
+        if (this.agreement != true) {
+          Toast("请同意隐私服务协议");
+        }
 
-        if (resp.state == 1) {
+        if (resp.state == 1 && this.agreement == true) {
           cacheLoginInfo(this.form.mobile, this.form.pwd);
           console.log(resp);
 
@@ -217,7 +213,7 @@ export default {
       this.setCookie("", "", -1); //修改2值都为空，天数为负1天就好了
     },
     agree() {
-      this.$router.push({ path: "/privacyPolicy" });
+      this.$router.push({ path: "/privacy" });
     }
   }
 };

src/pages/layout/SideBar.vue

@@ -3,17 +3,15 @@
     <div class="column">
       <!-- <div class="head"><img :src="$store.getters.user.org.org_logo" alt=""></div> -->
       <ul class="sidebar">
-        <li
-          style="position: relative;"
-          :class="active_index == 0 ? 'active' : ''"
-        >
+        <li style="position: relative;" :class="active_index == 0 ? 'active' : ''">
           <router-link to="/main">
             <span class="iconfont">&#xe6e6;</span>
             <p>记录</p>
           </router-link>
-          <span class="redpoint" v-if="total_read_dot">
-            {{ total_read_dot > 99 ? total_read_dot + "+" : total_read_dot }}
-          </span>
+          <span
+            class="redpoint"
+            v-if="total_read_dot"
+          >{{ total_read_dot > 99 ? total_read_dot + "+" : total_read_dot }}</span>
         </li>
         <li :class="active_index == 1 ? 'active' : ''">
           <router-link to="/monitoring">
@@ -68,13 +66,19 @@ export default {
   position: absolute;
   top: 3px;
   right: -16px;
-  @media only screen and (max-width: 767px) {
+  @media only screen and (max-width: 415px) {
     height: 16px;
     width: 16px;
     line-height: 16px;
     top: 1px;
     right: -8px;
   }
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
+    height: 20px;
+    width: 20px;
+    line-height: 21px;
+    font-size: 0.36rem;
+  }
 }
 .sideColumn {
   // float: left;

src/pages/main/DetailsPage.vue

@@ -2,7 +2,7 @@
   <div class="mainBox">
     <div class="mainContent">
       <div class="navigation">
-        <div class="goBack">
+        <div class="goBack newGoBack">
           <span class="back" @click="backAction()">
             <span class="iconfont">&#xe720;</span>返回
           </span>
@@ -10,7 +10,7 @@
             <li slot="reference" class="name">{{ patient_name }}</li>
           </el-popover>
         </div>
-        <div class="nav">
+        <div class="nav newNav1">
           <ul>
             <li
               v-for="(item, i) in ['病历', '透析', '今日']"
@@ -155,11 +155,11 @@ export default {
 .mainContent {
   position: relative;
   .navigation {
-    @include display-flex;
-    @include align-items-center;
-    @include text-align;
-    @include box-sizing;
-    @include justify-content-between;
+    // @include display-flex;
+    // @include align-items-center;
+    // @include text-align;
+    // @include box-sizing;
+    // @include justify-content-between;
     padding: 0.3rem 0.36rem;
     // border-bottom: 1px #e5e5e5 solid;
     position: fixed;
@@ -168,22 +168,25 @@ export default {
     right: 0;
     z-index: 100;
     background: #258ffc;
-    @media only screen and (max-width: 320px) {
-      display: -webkit-box;
+    .newGoBack {
+      float: left;
+    }
+    .newNav1 {
+      float: left;
     }
     .name {
       color: #fff;
     }
     .nav {
-      margin-right: 2.4rem;
+      margin-left: 0.4rem;
       @media only screen and (min-width: 376px) and (max-width: 415px) {
-        margin-right: 3.6rem;
+        margin-left: 1rem;
       }
       @media only screen and (min-width: 415px) and (max-width: 767px) {
-        margin-right: 3.6rem;
+        margin-left: 1.6rem;
       }
       @media only screen and (min-width: 768px) {
-        margin-right: 4rem;
+        margin-left: 2rem;
       }
       ul {
         li {

src/pages/main/PatientBox.vue

@@ -18,28 +18,24 @@
             "
             alt
           />
-          <span class="redpoint" v-if="getStatus(patient)">{{
+          <span class="redpoint" v-if="getStatus(patient)">
+            {{
             getUnReadNum(patient) > 99
-              ? getUnReadNum(patient) + "+"
-              : getUnReadNum(patient)
-          }}</span>
+            ? getUnReadNum(patient) + "+"
+            : getUnReadNum(patient)
+            }}
+          </span>
           <div class="right">
             <h3 class="name">
               {{ patient.patient.name }}
               <span class="yztx" v-if="getStatus(patient)">医嘱</span>
               <span class="yc" v-show="isAbnormal(patient)">异常</span>
             </h3>
-            <span class="num"
-              >{{ genderText(patient) }} | {{ age(patient) }}岁</span
-            >
+            <span class="num">{{ genderText(patient) }} | {{ age(patient) }}岁</span>
             <!-- 性别、年龄 -->
           </div>
         </div>
-        <div
-          class="online"
-          style="flex:1.1;"
-          v-show="computeState(patient) != 4"
-        >
+        <div class="online" style="flex:1;" v-show="computeState(patient) != 4">
           <p :class="stateColor(patient)">{{ stateText(patient) }}</p>
           <!-- <span class="time">剩余时间 : 90:08</span>     -->
         </div>
@@ -55,11 +51,11 @@
             <span class="iconfont">&#xe6de;</span>
             床位号 :
             {{
-              patient.dialysis_order &&
-              patient.dialysis_order.device_number &&
-              patient.dialysis_order.device_number.number.length > 0
-                ? patient.dialysis_order.device_number.number
-                : patient.device_number.number
+            patient.dialysis_order &&
+            patient.dialysis_order.device_number &&
+            patient.dialysis_order.device_number.number.length > 0
+            ? patient.dialysis_order.device_number.number
+            : patient.device_number.number
             }}
           </li>
           <li>
@@ -298,9 +294,17 @@ export default {
   @media only screen and (max-width: 415px) {
     width: 96% !important;
   }
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
+    width: 48%;
+    margin: 0 1% 0.5rem 0;
+  }
   .function {
     padding: 0.3rem 0.32rem 0 0.32rem;
     color: #7b8a97;
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      margin: 0;
+      padding: 0.3rem 0.1rem 0 0.1rem;
+    }
     ul {
       @include display-flex;
       @include align-items-center;
@@ -334,6 +338,9 @@ export default {
     @include justify-content-between;
     border-bottom: 1px #e5e5e5 solid;
     padding: 0 0 0.3rem 0.32rem;
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      padding: 0 0 0.3rem 0.1rem;
+    }
     .tx {
       @include display-flex;
       @include align-items-center;
@@ -397,6 +404,10 @@ export default {
           font-size: 0.36rem;
           width: 1.7rem;
         }
+        @media only screen and (min-width: 415px) and (max-width: 767px) {
+          width: 1.3rem;
+          font-size: 0.36rem;
+        }
       }
       .blue {
         background: $main-color;
@@ -443,13 +454,21 @@ export default {
   top: -6px;
   left: 0.6rem;
   border: 1px solid #fff;
-  @media only screen and (max-width: 767px) {
+  @media only screen and (max-width: 415px) {
     height: 16px;
     width: 16px;
     line-height: 15px;
     top: -6px;
     left: 0.6rem;
   }
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
+    height: 20px;
+    width: 20px;
+    line-height: 19px;
+    top: -6px;
+    left: 0.6rem;
+    font-size: 0.36rem;
+  }
 }
 .yztx {
   margin: 0 5px;
@@ -461,5 +480,9 @@ export default {
   @media only screen and (max-width: 415px) {
     font-size: 0.34rem !important;
   }
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
+    margin: 0;
+    padding: 3px 3px;
+  }
 }
 </style>

src/pages/main/RecordPage.vue

@@ -76,9 +76,9 @@
               {{ "候诊区" }}
               <span class="redpoint" v-if="un_read_wait_num">
                 {{
-                  un_read_wait_num > 99
-                    ? un_read_wait_num + "+"
-                    : un_read_wait_num
+                un_read_wait_num > 99
+                ? un_read_wait_num + "+"
+                : un_read_wait_num
                 }}
               </span>
             </li>
@@ -90,9 +90,9 @@
               {{ "透析区" }}
               <span class="redpoint" v-if="un_read_dialysis_num">
                 {{
-                  un_read_dialysis_num > 99
-                    ? un_read_dialysis_num + "+"
-                    : un_read_dialysis_num
+                un_read_dialysis_num > 99
+                ? un_read_dialysis_num + "+"
+                : un_read_dialysis_num
                 }}
               </span>
             </li>
@@ -118,11 +118,7 @@
         <van-button size="small" type="info">临时排班</van-button>
     </div>-->
     <div class="area">
-      <waiting-area
-        v-show="index == 0"
-        title="候诊区"
-        :search_keyword="search_keyword"
-      ></waiting-area>
+      <waiting-area v-show="index == 0" title="候诊区" :search_keyword="search_keyword"></waiting-area>
       <dialysis-area
         v-show="index == 1"
         title="透析区"
@@ -284,6 +280,12 @@ export default {
     width: 16px;
     line-height: 15px;
   }
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
+    height: 20px;
+    width: 20px;
+    line-height: 20px;
+    font-size: 0.36rem;
+  }
 }
 .box {
   height: 1rem;
@@ -350,6 +352,7 @@ export default {
     }
   }
   .el-input__prefix {
+    // left:1px;
     @media only screen and (min-width: 768px) {
       left: 10px;
     }

src/pages/main/add_urgent_schedule.vue

@@ -239,7 +239,6 @@
 
       var today = new Date();
       this.date = parseTime(today, "{y}-{m}-{d}");
-
       var hour = today.getHours();
       if (hour > 3 && hour < 11) {
         this.schedule_type = 1;
@@ -248,9 +247,6 @@
       } else {
         this.schedule_type = 3;
       }
-
-
-
     },
     mounted() {
 
@@ -353,7 +349,15 @@
       selectSchTypeAction: function() {
         this.$refs.sch_type_field.blur();
         this.show_sch_type_picker = true;
-
+        //
+        // this.$nextTick(() => {
+        //   // this.$refs.schedule.setColumnIndex(2)
+        //   // .setIndexes(this.schedule_type)
+        //   console.log(this.$refs.schedule)
+        //   console.log(this.$refs.schedule.getColumnIndex)
+        //   console.log(this.$refs.schedule.getColumnValue)
+        //
+        // })
       },
 
       didChangePatient: function(picker, patient, index) {

src/pages/main/dialog/ComputerDialog.vue

@@ -100,6 +100,7 @@
         zone_beds: [], // 该排班的区里的床位
         creator: 0,
         template_id: 0,
+        temp_device_numbers:[],
         blood_drawing:100,
         schedual_type:0,
         schedules_type: [
@@ -136,31 +137,39 @@
       },
     }, mounted () {
 
+
+    },
+    created () {
+      this.temp_device_numbers = this.device_numbers
+
+
+
       if (this.record.id == 0) {
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+        let now = new Date()
+        let hour = now.getHours()
+
+        if (hour >= 6 && hour < 12){
+          this.schedual_type = 1
+
+        }else if(hour >= 12 && hour < 18){
+
+          this.schedual_type = 2
+
+
+        }else if(hour >= 18){
+          this.schedual_type = 3
+        }
       } else {
         if (this.record.start_time == 0) {
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+          this.schedual_type = this.record.schedual_type
 
         } else {
           this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
-        }
-      }
-    },
-    created () {
-      let now = new Date()
-      let hour = now.getHours()
+          this.schedual_type = this.record.schedual_type
 
-      if (hour >= 6 && hour < 12){
-        this.schedual_type = 1
-
-      }else if(hour >= 12 && hour < 18){
-
-        this.schedual_type = 2
-
-
-      }else if(hour >= 18){
-        this.schedual_type = 3
+        }
       }
 
 
@@ -198,11 +207,11 @@
       // }
       // this.zone_beds = beds
 
-      for (let index = 0; index < this.device_numbers.length; index++) {
-        const device_number = this.device_numbers[index]
-        this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+      for (let index = 0; index < this.temp_device_numbers.length; index++) {
+        const device_number = this.temp_device_numbers[index]
+        this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
       }
-      this.zone_beds = this.device_numbers
+      this.zone_beds = this.temp_device_numbers
 
       if (this.record.id > 0) {
         for (let i = 0; i < this.special_premission.length; i++) {
@@ -253,12 +262,12 @@
                   Toast.fail(response.data.msg)
                   return false
                 } else {
-                  t.device_numbers = response.data.data.number
-                  for (let index = 0; index < t.device_numbers.length; index++) {
-                    const device_number = t.device_numbers[index]
-                    t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+                  t.temp_device_numbers = response.data.data.number
+                  for (let index = 0; index < t.temp_device_numbers.length; index++) {
+                    const device_number = t.temp_device_numbers[index]
+                    t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
                   }
-                  t.zone_beds = t.device_numbers
+                  t.zone_beds = t.temp_device_numbers
                   t.bed_id = t.zone_beds[0].id
                 }
               })
@@ -281,12 +290,12 @@
               return false
             } else {
               t.zone_beds = []
-              t.device_numbers = response.data.data.number
-              for (let index = 0; index < t.device_numbers.length; index++) {
-                const device_number = t.device_numbers[index]
-                t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+              t.temp_device_numbers = response.data.data.number
+              for (let index = 0; index < t.temp_device_numbers.length; index++) {
+                const device_number = t.temp_device_numbers[index]
+                t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
               }
-              t.zone_beds = t.device_numbers
+              t.zone_beds = t.temp_device_numbers
               t.bed_id = t.zone_beds[0].id
 
 
@@ -305,12 +314,12 @@
             Toast.fail(response.data.msg)
             return false
           } else {
-            this.device_numbers = response.data.data.number
-            for (let index = 0; index < this.device_numbers.length; index++) {
-              const device_number = this.device_numbers[index]
-              this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+            this.temp_device_numbers = response.data.data.number
+            for (let index = 0; index < this.temp_device_numbers.length; index++) {
+              const device_number = this.temp_device_numbers[index]
+              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
             }
-            this.zone_beds = this.device_numbers
+            this.zone_beds = this.temp_device_numbers
           }
         })
       },

src/pages/main/dialog/TreatmentDialog.vue

@@ -241,42 +241,45 @@ export default {
     },
 
     dialysisSummarySelectChange: function(values) {
-      if (this.dialysisSummary.summaryContent == null) {
-        this.dialysisSummary.summaryContent == "";
+      if(this.dialysisSummary.summaryContent == null){
+        this.dialysisSummary.summaryContent == ""
       }
+
       if (this.dialysisSummary.summaryContent == "") {
         this.dialysisSummary.summaryContent = values;
       } else {
-        this.dialysisSummary.summaryContent =
-          this.dialysisSummary.summaryContent + values;
+        if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
+          if (
+            this.dialysisSummary.summaryContent
+              .charAt(this.dialysisSummary.summaryContent.length - 1)
+              .indexOf("。") == -1
+          ) {
+            this.dialysisSummary.summaryContent =
+              this.dialysisSummary.summaryContent + "," + values;
+          } else {
+            this.dialysisSummary.summaryContent =
+              this.dialysisSummary.summaryContent  + values;
+          }
+        }
       }
     },
     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 {
-        this.dialysisSummary.propagandaAndEducationContent =
-          this.dialysisSummary.propagandaAndEducationContent + values;
-        // if (
-        //   this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
-        //   -1
-        // ) {
-        //   if (
-        //     this.dialysisSummary.propagandaAndEducationContent
-        //       .charAt(
-        //         this.dialysisSummary.propagandaAndEducationContent.length - 1
-        //       )
-        //       .indexOf("。") == -1
-        //   ) {
-        //     this.dialysisSummary.propagandaAndEducationContent =
-        //       this.dialysisSummary.propagandaAndEducationContent + "," + values;
-        //   } else {
-        //
-        //   }
-        // }
+        if (this.dialysisSummary.propagandaAndEducationContent.indexOf(values) == -1) {
+          if (
+            this.dialysisSummary.propagandaAndEducationContent.charAt(this.dialysisSummary.propagandaAndEducationContent.length - 1).indexOf("。") == -1) {
+            this.dialysisSummary.propagandaAndEducationContent =
+              this.dialysisSummary.propagandaAndEducationContent + "," + values;
+          } else {
+            this.dialysisSummary.propagandaAndEducationContent =
+              this.dialysisSummary.propagandaAndEducationContent + values;
+          }
+        }
       }
     },
     commitInfo: function() {

src/pages/main/today/TodayTab.vue

@@ -227,7 +227,7 @@
       :overlay="true"
       :close-on-click-overlay="false"
     >
-      <monit-dialog
+      <monit-dialog v-if="monit_dialog_reset"
         :monitor_records="monitor_records"
         :last_monitor_record="last_monitor_record"
         :patient="patient"
@@ -371,6 +371,7 @@ import {parseTime} from '@/utils'
         last_prescription:{},
         thoroug_dialog_reset: true,
         prescription_dialog_reset: true,
+        monit_dialog_reset: true,
         receiver_treatment_access: {}, // 接诊评估
         predialysis_evaluation: {}, // 透前评估
         last_predialysis_evaluation: {}, // 上次透前评估
@@ -847,11 +848,6 @@ import {parseTime} from '@/utils'
           var waitscheduals = waitstoredata.waitscheduals
           var storedata = this.$store.getters.scheduals
           var scheduals = storedata.scheduals
-
-
-
-
-
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
           var prescription = resp.data.prescription // 透析处方
@@ -882,13 +878,9 @@ import {parseTime} from '@/utils'
           var monitor_records = resp.data.monitor_records // 透析监测
           var dialysis_order = resp.data.dialysis_order // 透析记录
           var operators = resp.data.operators // 操作人
-
           var special_premission = resp.data.special_premission // 特殊权限
-
           var config = resp.data.config // 库存自动扣减配置
-
           var types = resp.data.types // 所有系统库存商品类型
-
           var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
           var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
           var last_monitor_record = resp.data.last_monitor_record
@@ -922,32 +914,15 @@ import {parseTime} from '@/utils'
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
           this.prescription = prescription == null ? {id: ''} : prescription
-          this.prescription_dialog_reset = false
-          this.$nextTick(() => {
-            this.prescription_dialog_reset = true
-          })
           this.solution = solution == null ? {id: ''} : solution
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
-
-
-
-          this.receiver_treatment_access =
-              receiver_treatment_access == null
-                ? {id: ''}
-                : receiver_treatment_access
-          this.predialysis_evaluation =
-              predialysis_evaluation == null ? {} : predialysis_evaluation
-          this.last_predialysis_evaluation =
-              last_predialysis_evaluation == null
-                ? {}
-                : last_predialysis_evaluation
-
+          this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
+          this.predialysis_evaluation = predialysis_evaluation == null ? {} : predialysis_evaluation
+          this.last_predialysis_evaluation = last_predialysis_evaluation == null ? {} : last_predialysis_evaluation
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
           this.special_premission = special_premission
           this.config = config
           this.goodTypes = types
-
-
           if (this.doctor_advices.length > 0) {
             var group = this.newAdviceGroupObject()
             var initGroupBlock = function (group, advice) {
@@ -1009,27 +984,23 @@ import {parseTime} from '@/utils'
 
           this.double_check = double_check == null ? {id: ''} : double_check
           this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
-          this.thoroug_dialog_reset = false
-          this.$nextTick(() => {
-            this.thoroug_dialog_reset = true
-          })
-          this.last_assessment_after_dislysis =
-              last_assessment_after_dislysis == null
-                ? {id: ''}
-                : last_assessment_after_dislysis
-          this.treatment_summary =
-              treatment_summary == null ? {id: ''} : treatment_summary
+          this.last_assessment_after_dislysis = last_assessment_after_dislysis == null ? {id: ''} : last_assessment_after_dislysis
+          this.treatment_summary = treatment_summary == null ? {id: ''} : treatment_summary
           this.monitor_records = monitor_records == null ? [] : monitor_records
-          this.last_monitor_record =
-              last_monitor_record == null
-                ? this.last_monitor_record
-                : last_monitor_record
-          this.dialysis_order =
-              dialysis_order == null ? {id: ''} : dialysis_order
+          this.last_monitor_record = last_monitor_record == null ? this.last_monitor_record : last_monitor_record
+          this.dialysis_order =  dialysis_order == null ? {id: ''} : dialysis_order
           this.operators = operators
           this.$refs.stat_order.setAdvices(this.doctor_advices)
           this.$refs.monitoring.setRecords(this.monitor_records)
 
+          // 强制刷新子组件
+          this.thoroug_dialog_reset = false
+          this.$nextTick(() => { this.thoroug_dialog_reset = true })
+          this.prescription_dialog_reset = false
+          this.$nextTick(() => { this.prescription_dialog_reset = true })
+          this.monit_dialog_reset = false;
+          this.$nextTick(() => { this.monit_dialog_reset = true })
+
           this.title = patient.name
 
           dialysisGlobalConfig().then(rs => {
@@ -1534,21 +1505,16 @@ import {parseTime} from '@/utils'
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
           this.prescription = prescription == null ? {id: ''} : prescription
+
+
           this.solution = solution == null ? {id: ''} : solution
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
 
 
 
-          this.receiver_treatment_access =
-            receiver_treatment_access == null
-              ? {id: ''}
-              : receiver_treatment_access
-          this.predialysis_evaluation =
-            predialysis_evaluation == null ? {} : predialysis_evaluation
-          this.last_predialysis_evaluation =
-            last_predialysis_evaluation == null
-              ? {}
-              : last_predialysis_evaluation
+          this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
+          this.predialysis_evaluation = predialysis_evaluation == null ? {} : predialysis_evaluation
+          this.last_predialysis_evaluation = last_predialysis_evaluation == null ? {} : last_predialysis_evaluation
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
           this.special_premission = special_premission
@@ -1616,28 +1582,26 @@ import {parseTime} from '@/utils'
           }
 
           this.double_check = double_check == null ? {id: ''} : double_check
-          this.assessment_after_dislysis =
-            assessment_after_dislysis == null
-              ? {id: ''}
-              : assessment_after_dislysis
-          this.last_assessment_after_dislysis =
-            last_assessment_after_dislysis == null
-              ? {id: ''}
-              : last_assessment_after_dislysis
-          this.treatment_summary =
-            treatment_summary == null ? {id: ''} : treatment_summary
+          this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
+          this.last_assessment_after_dislysis = last_assessment_after_dislysis == null ? {id: ''} : last_assessment_after_dislysis
+          this.treatment_summary =  treatment_summary == null ? {id: ''} : treatment_summary
           this.monitor_records = monitor_records == null ? [] : monitor_records
-          this.last_monitor_record =
-            last_monitor_record == null
-              ? this.last_monitor_record
-              : last_monitor_record
-          this.dialysis_order =
-            dialysis_order == null ? {id: ''} : dialysis_order
+          this.last_monitor_record = last_monitor_record == null  ? this.last_monitor_record : last_monitor_record
+          this.dialysis_order = dialysis_order == null ? {id: ''} : dialysis_order
           this.operators = operators
           this.$refs.stat_order.setAdvices(this.doctor_advices)
           this.$refs.monitoring.setRecords(this.monitor_records)
 
           this.title = patient.name
+          // 强制刷新子组件
+
+          this.thoroug_dialog_reset = false
+          this.$nextTick(() => { this.thoroug_dialog_reset = true })
+          this.prescription_dialog_reset = false
+          this.$nextTick(() => { this.prescription_dialog_reset = true })
+          this.monit_dialog_reset = false;
+          this.$nextTick(() => { this.monit_dialog_reset = true })
+
         } else {
           this.$toast({
             message: resp.msg

src/pages/privacy/index.vue

@@ -35,20 +35,19 @@
 
 
 <script>
-    export default {
-        name: "privacyPolicy"
-
-    }
+export default {
+  name: "privacy"
+};
 </script>
 
 <style lang="scss" scoped>
-  .page_privacy {
-    width: 100%;
-    margin: 0 auto;
-    height: 100%;
-    overflow-y: auto;
-    display: flex;
-    flex-direction: column;
+.page_privacy {
+  width: 100%;
+  margin: 0 auto;
+  height: 100%;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
   > div:last-child {
     flex: 1;
     overflow-y: auto;
@@ -57,24 +56,24 @@
     font-size: 0.45rem;
     padding: 0.3rem 0.37rem;
     color: $title-color;
-  @include align-items-center;
-  @include display-flex;
-  @include justify-content-between;
-  @include text-align;
+    @include align-items-center;
+    @include display-flex;
+    @include justify-content-between;
+    @include text-align;
     background: #fff;
-  .GoBack {
-    color: $main-color;
-    font-size: 0.45rem;
-  @include display-flex;
-  .iconfont {
-    color: $main-color;
-    font-size: 0.5rem;
-    margin-top: 1px;
-  @media only screen and (min-width: 768px) {
-    margin-top: 3px;
-  }
-  }
-  }
+    .GoBack {
+      color: $main-color;
+      font-size: 0.45rem;
+      @include display-flex;
+      .iconfont {
+        color: $main-color;
+        font-size: 0.5rem;
+        margin-top: 1px;
+        @media only screen and (min-width: 768px) {
+          margin-top: 3px;
+        }
+      }
+    }
   }
   .name {
     margin-right: 1.3rem;
@@ -90,5 +89,5 @@
     width: 90%;
     margin: 0 auto;
   }
-  }
+}
 </style>

src/permission.js

@@ -1,20 +1,20 @@
-import router from './router'
-import store from './store'
+import router from "./router";
+import store from "./store";
 
-const loginWhiteList = ['/'] // 登录验证白名单
+const loginWhiteList = ["/", "/privacy", "/forgetPassword"]; // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-//   next()
-//   return
+  //   next()
+  //   return
 
   if (store.getters.user.user.id == 0) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
-      next()
+      next();
     } else {
-      next({ path: '/'})
+      next({ path: "/" });
     }
   } else {
-    next()
+    next();
   }
-})
+});

src/router/index.js

@@ -77,7 +77,7 @@ export default new Router({
     },
     {
       path: "/privacy",
-      name: "privacyPolicy",
+      name: "privacy",
       component: () => import("@/pages/privacy/index")
     }
   ]

src/styles/style.scss

@@ -922,6 +922,7 @@ body {
   }
   @media only screen and (min-width: 415px) and (max-width: 767px) {
     padding-top: 186px;
+    padding-left: 0.3rem;
   }
 }
 #app {