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/dev.env.js

@@ -4,9 +4,9 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
    //http://api.xt.test.sgjyun.com http://localhost:9529
-   // BASE_API: '"http://api.xt.test.sgjyun.com"'
+   BASE_API: '"http://api.xt.test.sgjyun.com"'
   // BASE_API: '"https://api.xt.kuyicloud.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/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/RecordPage.vue

@@ -352,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/PrescriptionDialog.vue

@@ -830,7 +830,7 @@
       lastInputFocus: function (event) {
         var input = event.target
         event.currentTarget.select();
-   
+
         setTimeout(function () {
           input.style.marginBottom = '2rem'
           input.parentNode.scrollIntoView()
@@ -1288,7 +1288,8 @@
             }else{
               this.zhiShow = true
               this.totalShow = true
-              this.huShow  = true 
+              this.huShow  = true
+             
             }
           }
         }

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/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

@@ -413,7 +413,10 @@ body {
   .Dialog {
     font-size: 0.36rem;
     width: 11.8rem;
-    @media only screen and (min-width: 415px) and (max-width: 737px) {
+    @media only screen and (min-width: 415px) and (max-width: 500px) {
+      width: 10.8rem !important;
+    }
+    @media only screen and (min-width: 501px) and (max-width: 737px) {
       width: 12.8rem !important;
     }
     @media only screen and (min-width: 376px) and (max-width: 415px) {