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

src/pages/home/login.vue

             <ul>
               <li>
                 <span class="iconfont">&#xe78b;</span>
-                <input
-                  placeholder="请输入手机号"
-                  type="tel"
-                  class="tel"
-                  v-model="form.mobile"
-                />
+                <input placeholder="请输入手机号" type="tel" class="tel" v-model="form.mobile" />
               </li>
               <li>
                 <span class="iconfont">&#xe6c0;</span>
-                <input
-                  placeholder="请输入密码"
-                  type="password"
-                  class="tel"
-                  v-model="form.pwd"
-                />
+                <input placeholder="请输入密码" type="password" class="tel" v-model="form.pwd" />
               </li>
             </ul>
           </div>
             :disabled="loginDisable"
           >
             登录
-          </button> -->
+          </button>-->
           <button
             class="loginBtn"
             @click="submitForm"
             :class="loginDisable ? 'disableLoginBtn' : ''"
             :disabled="loginDisable"
-          >
-            登录
-          </button>
+          >登录</button>
 
           <!-- <router-link to="/forgetPassword"> -->
           <div class="newForget" style="display:none">忘记密码</div>
           <a href="">免密码登录</a>
           <a href="">忘记密码？</a>
           </div>-->
+          <div class="agree">
+            <el-checkbox v-model="agreement">
+              我已阅读并同意
+              <!-- <router-link to="/privacyPolicy"> -->
+
+              <!-- </router-link> -->
+            </el-checkbox>
+            <!-- <router-link to="/privacyPolicy"> -->
+            <span class="agreeText" @click="agree">《隐私服务协议》</span>
+            <!-- </router-link> -->
+          </div>
         </div>
       </div>
     </div>
         mobile: "",
         pwd: ""
       },
-      checked: false
+      checked: false,
+      agreement: true
     };
   },
   computed: {
     //清除cookie
     clearCookie: function() {
       this.setCookie("", "", -1); //修改2值都为空，天数为负1天就好了
+    },
+    agree() {
+      this.$router.push({ path: "/privacyPolicy" });
     }
   }
 };
 <style rel="stylesheet/scss" lang="scss" scoped>
 .container {
   // background: $white-bg;
-  background: #f5f5f5;
+  background: #fff;
   @include box-sizing;
   position: fixed;
   width: 100%;
   justify-content: space-between;
 
   .newLogin {
-    width: 90%;
-    height: 90%;
+    width: 100%;
+    height: 100%;
     margin: auto;
-    box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
-    border-radius: 14px;
+    // box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
     background: #fff;
   }
   .login {
   .remember {
     float: left;
   }
+  .agreeText {
+    color: #409eff;
+    font-size: 14px;
+  }
+}
+</style>
+
+<style lang="scss">
+.remember {
+  .el-checkbox__inner {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      width: 20px;
+      height: 20px;
+    }
+    @media only screen and (min-width: 768px) {
+      width: 20px;
+      height: 20px;
+    }
+  }
+  .el-checkbox__inner::after {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      left: 7px;
+      height: 12px;
+      width: 4px;
+    }
+
+    @media only screen and (min-width: 768px) {
+      left: 7px;
+      height: 12px;
+      width: 4px;
+    }
+  }
+  .el-checkbox__label {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      font-size: 0.45rem;
+    }
+    @media only screen and (min-width: 768px) {
+      font-size: 0.45rem;
+    }
+  }
+}
+.agree {
+  .el-checkbox__inner {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      width: 20px;
+      height: 20px;
+    }
+    @media only screen and (min-width: 768px) {
+      width: 20px;
+      height: 20px;
+    }
+  }
+  .el-checkbox__inner::after {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      left: 7px;
+      height: 12px;
+      width: 4px;
+    }
+
+    @media only screen and (min-width: 768px) {
+      left: 7px;
+      height: 12px;
+      width: 4px;
+    }
+  }
+  .el-checkbox__label {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      font-size: 0.45rem;
+    }
+    @media only screen and (min-width: 768px) {
+      font-size: 0.45rem;
+    }
+  }
+  .agreeText {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      font-size: 0.45rem;
+    }
+    @media only screen and (min-width: 768px) {
+      font-size: 0.45rem;
+    }
+  }
 }
 </style>

src/pages/home/privacyPolicy.vue

+<template>
+  <div class="page_privacy">
+    <h1 class="title">
+      <div class="GoBack" @click="$router.go(-1)">
+        <span class="iconfont">&#xe720;</span>返回
+      </div>
+      <span class="name">隐私声明</span>
+      <div class="GoBack"></div>
+    </h1>
+    <div class="boxList">
+      <div class="privacyTitle">声明</div>
+      <div class="privacyBox">
+        <p>本软件尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本软件会按照本隐私权政策的规定使用和披露您的个人信息。但本软件将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本软件不会将这些信息对外披露或向第三方提供。本软件会不时更新本隐私权政策。您在同意本软件服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本软件服务使用协议不可分割的一部分。</p>
+        <br />
+        <p>1.适用范围</p>
+        <p>a)在您使用本软件网络服务，本软件自动接收并记录的您的手机上的信息，包括但不限于您的健康数据、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据；</p>
+        <br />
+        <p>2.信息的使用</p>
+        <p>a)在获得您的数据之后，本软件会将其上传至服务器，以生成您的排行榜数据，以便您能够更好地使用服务。</p>
+        <br />
+        <p>3.信息披露</p>
+        <p>a)本软件不会将您的信息披露给不受信任的第三方。</p>
+        <p>b)根据法律的有关规定，或者行政或司法机构的要求，向第三方或者行政、司法机构披露；</p>
+        <p>c)如您出现违反中国有关法律、法规或者相关规则的情况，需要向第三方披露；</p>
+        <br />
+        <p>4.信息存储和交换</p>
+        <p>本软件收集的有关您的信息和资料将保存在本软件及（或）其关联公司的服务器上，这些信息和资料可能传送至您所在国家、地区或本软件收集信息和资料所在地的境外并在境外被访问、存储和展示。</p>
+        <br />
+        <p>5.信息安全</p>
+        <p>a)在使用本软件网络服务进行网上交易时，您不可避免的要向交易对方或潜在的交易对方披露自己的个人信息，如联络方式或者邮政地址。请您妥善保护自己的个人信息，仅在必要的情形下向他人提供。如您发现自己的个人信息泄密，请您立即联络本软件客服，以便本软件采取相应措施。</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+
+<style lang="scss" scoped>
+.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;
+  }
+  .title {
+    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;
+    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;
+        }
+      }
+    }
+  }
+  .name {
+    margin-right: 1.3rem;
+    font-size: 0.5rem;
+  }
+  .privacyTitle {
+    font-size: 0.6rem;
+    text-align: center;
+    margin-top: 0.4rem;
+  }
+  .privacyBox {
+    font-size: 0.45rem;
+    width: 90%;
+    margin: 0 auto;
+  }
+}
+</style>

src/pages/main/DetailsPage.vue

               :key="i"
               :class="index == i ? 'active' : ''"
               @click="ClickTab(i)"
-            >
-              {{ item }}
-            </li>
+            >{{ item }}</li>
           </ul>
         </div>
 
                   <span class="iconfont">2018-01-01&#xe74a;</span>
         </div>-->
         <div class="print" style="float: right; display:none">
-          <el-button
-            size="mini"
-            type="primary"
-            @click="print"
-            icon="el-icon-printer"
-            >打印</el-button
-          >
+          <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
         </div>
       </div>
 
       <div class="Tab">
         <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
-        <dialysis-tab
-          v-show="index == 1"
-          title="透析"
-          v-on:records="jump(val)"
-        ></dialysis-tab>
+        <dialysis-tab v-show="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
         <today-tab ref="today" v-show="index == 2" title="今日"></today-tab>
       </div>
     </div>
         margin-right: 3.6rem;
       }
       @media only screen and (min-width: 415px) and (max-width: 767px) {
-        margin-right: 4rem;
+        margin-right: 3.6rem;
       }
       @media only screen and (min-width: 768px) {
         margin-right: 4rem;

src/pages/main/DialysisArea.vue

   mounted() {
     this.timer = window.setInterval(() => {
       setTimeout(this.requestDialysisScheduals(), 0);
-    }, 30000);
+    }, 12000);
   },
   beforeDestroy() {
     clearInterval(this.timer);

src/pages/main/PatientBox.vue

           <div class="right">
             <h3 class="name">
               {{ patient.patient.name }}
-              <span class="el-icon-bell yztx" v-if="getStatus(patient)"
-                >医嘱</span
-              >
+              <span class="yztx" v-if="getStatus(patient)">医嘱</span>
               <span class="yc" v-show="isAbnormal(patient)">异常</span>
             </h3>
             <span class="num"
         </div>
         <div
           class="online"
-          style="flex:1.3;"
+          style="flex:1.1;"
           v-show="computeState(patient) != 4"
         >
           <p :class="stateColor(patient)">{{ stateText(patient) }}</p>
         height: 1rem;
         border-radius: 50%;
         float: left;
-        margin: 0 0.3rem 0 0;
+        margin: 0 0.2rem 0 0;
       }
       .right {
         float: left;
           @media only screen and (max-width: 415px) {
             font-size: 0.45rem;
           }
+          @media only screen and (min-width: 416px) and (max-width: 767px) {
+            font-size: 0.4rem;
+          }
           .yc {
             background: #ff7979;
             color: #fff;
   padding: 3px 10px;
   background-color: #f56c6c;
   color: #fff;
-  border-radius: 15px;
+  border-radius: 3px;
   font-size: 0.32rem;
   @media only screen and (max-width: 415px) {
     font-size: 0.34rem !important;

src/pages/main/WaitingArea.vue

 </template>
 
 <script>
-import PatientBox from "./PatientBox";
-import { getWaitingScheduals } from "@/api/dialysis";
-import { parseTime } from "@/utils";
-import { Popover } from "vux";
-import { Toast } from "vant";
+import PatientBox from './PatientBox'
+import { getWaitingScheduals } from '@/api/dialysis'
+import { parseTime } from '@/utils'
+import { Popover } from 'vux'
+import { Toast } from 'vant'
 
 import {
   getSelectedAreaDataConfigList,
   setSelectedTimesDataConfigList,
   setWaitTypeSelectedConfig,
   getWaitTypeSelectedConfig
-} from "@/utils/data_config";
+} from '@/utils/data_config'
 
 export default {
-  name: "WaitingArea",
+  name: 'WaitingArea',
   components: {
     PatientBox,
     Popover
   },
-  inject: ["reload"],
-  data() {
+  inject: ['reload'],
+  data () {
     return {
       loading: false,
       menuList: [
-        { value: "1", label: "全部", count: 0 },
-        { value: "3", label: "待开处方", count: 0 },
-        { value: "2", label: "待称重", count: 0 }
+        { value: '1', label: '全部', count: 0 },
+        { value: '3', label: '待开处方', count: 0 },
+        { value: '2', label: '待称重', count: 0 }
       ],
 
       select_index: 0,
       networkStates: true,
       scheduals: [],
 
-      zone_options: [{ value: 0, text: "全部分区" }],
+      zone_options: [{ value: 0, text: '全部分区' }],
       zone_scheduals: [],
 
       time_options: [
-        { value: 0, text: "全部班" },
-        { value: 1, text: "上午" },
-        { value: 2, text: "下午" },
-        { value: 3, text: "晚上" }
+        { value: 0, text: '全部班' },
+        { value: 1, text: '上午' },
+        { value: 2, text: '下午' },
+        { value: 3, text: '晚上' }
       ],
 
       zone_options_visible: false,
       time_options_visible: false
-    };
+    }
   },
   props: {
     search_keyword: {
     }
   },
   computed: {
-    filtedScheduals: function() {
-      var search_keyword = this.search_keyword;
+    filtedScheduals: function () {
+      var search_keyword = this.search_keyword
       if (this.search_keyword.length > 0) {
-        var scheduals = [];
+        var scheduals = []
         for (let index = 0; index < this.scheduals.length; index++) {
-          const schedual = this.scheduals[index];
+          const schedual = this.scheduals[index]
           if (
             schedual.patient.name.indexOf(search_keyword) != -1 ||
             schedual.patient.dialysis_no.indexOf(search_keyword) != -1
           ) {
-            scheduals.push(schedual);
+            scheduals.push(schedual)
           }
         }
-        return this.processScheduals(scheduals);
+        return this.processScheduals(scheduals)
       }
       //
       if (this.zone_selected != 0) {
         //     return [zone_scheduals]
         //   }
         // }
-        var zone_name = this.zone_options[this.zone_selected].text;
-        var schedules = [];
-        var filtedSchedules = [];
+        var zone_name = this.zone_options[this.zone_selected].text
+        var schedules = []
+        var filtedSchedules = []
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
-          const scheduleInfo = this.zone_scheduals[o_i];
-          var originSchedules = scheduleInfo.scheduals;
+          const scheduleInfo = this.zone_scheduals[o_i]
+          var originSchedules = scheduleInfo.scheduals
 
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-            const schedule = originSchedules[s_i];
+            const schedule = originSchedules[s_i]
             if (this.zone_selected == 0) {
               if (
                 this.time_selected == 0 ||
                 schedule.schedule_type == this.time_selected
               ) {
-                filtedSchedules.push(schedule);
+                filtedSchedules.push(schedule)
               }
             } else {
               if (
                   this.time_selected == 0 ||
                   schedule.schedule_type == this.time_selected
                 ) {
-                  filtedSchedules.push(schedule);
+                  filtedSchedules.push(schedule)
                 }
               }
             }
           //   });
           // }
         }
-        console.log(filtedSchedules);
-        return this.processScheduals(filtedSchedules);
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules)
       }
 
       if (this.time_selected != 0) {
-        var zone_name = this.zone_options[this.zone_selected].text;
-        var schedules = [];
-        var filtedSchedules = [];
+        var zone_name = this.zone_options[this.zone_selected].text
+        var schedules = []
+        var filtedSchedules = []
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
-          const scheduleInfo = this.zone_scheduals[o_i];
-          var originSchedules = scheduleInfo.scheduals;
+          const scheduleInfo = this.zone_scheduals[o_i]
+          var originSchedules = scheduleInfo.scheduals
 
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-            const schedule = originSchedules[s_i];
+            const schedule = originSchedules[s_i]
             if (this.zone_selected == 0) {
               if (
                 this.time_selected == 0 ||
                 schedule.schedule_type == this.time_selected
               ) {
-                filtedSchedules.push(schedule);
+                filtedSchedules.push(schedule)
               }
             } else {
               if (
                   this.time_selected == 0 ||
                   schedule.schedule_type == this.time_selected
                 ) {
-                  filtedSchedules.push(schedule);
+                  filtedSchedules.push(schedule)
                 }
               }
             }
           //   });
           // }
         }
-        console.log(filtedSchedules);
-        return this.processScheduals(filtedSchedules);
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules)
       }
 
-      var zone_selected = this.zone_selected;
-      var timetype_selected = this.time_selected;
-      var assessment_before_dislysis_count = 0;
-      var prescription_count = 0;
+      var zone_selected = this.zone_selected
+      var timetype_selected = this.time_selected
+      var assessment_before_dislysis_count = 0
+      var prescription_count = 0
       if (zone_selected != 0 || timetype_selected != 0) {
         var zone_name =
-          zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
-        var schedules = [];
-        var filtedSchedules = [];
+          zone_selected == 0 ? '' : this.zone_options[zone_selected].text
+        var schedules = []
+        var filtedSchedules = []
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
-          const scheduleInfo = this.zone_scheduals[o_i];
-          var originSchedules = scheduleInfo.scheduals;
+          const scheduleInfo = this.zone_scheduals[o_i]
+          var originSchedules = scheduleInfo.scheduals
 
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-            const schedule = originSchedules[s_i];
+            const schedule = originSchedules[s_i]
             if (
               zone_name.length == 0 ||
               (zone_name.length > 0 &&
                 timetype_selected == 0 ||
                 schedule.schedule_type == timetype_selected
               ) {
-                filtedSchedules.push(schedule);
+                filtedSchedules.push(schedule)
               }
             }
           }
           // }
         }
 
-        console.log(filtedSchedules);
-        return this.processScheduals(filtedSchedules);
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules)
 
         if (this.select_index == 2) {
-          var scheduals = [];
+          var scheduals = []
           for (let index = 0; index < this.scheduals.length; index++) {
-            const schedual = this.scheduals[index];
+            const schedual = this.scheduals[index]
             if (
               schedual.assessment_before_dislysis == null ||
               schedual.assessment_before_dislysis.weight_before == 0
                 this.cur_zone_selected > 0 &&
                 schedual.device_number.zone.id != this.cur_zone_selected
               ) {
-                continue;
+                continue
               }
               if (
                 timetype_selected > 0 &&
                 schedual.schedule_type != timetype_selected
               ) {
-                continue;
+                continue
               }
-              scheduals.push(schedual);
+              scheduals.push(schedual)
             }
           }
-          return this.processScheduals(scheduals);
+          return this.processScheduals(scheduals)
           // return scheduals;
         } else if (this.select_index == 1) {
-          var scheduals = [];
+          var scheduals = []
           for (let index = 0; index < this.scheduals.length; index++) {
-            const schedual = this.scheduals[index];
+            const schedual = this.scheduals[index]
             if (
               schedual.prescription == null ||
               schedual.prescription.creater == 0
                 this.cur_zone_selected > 0 &&
                 schedual.device_number.zone.id != this.cur_zone_selected
               ) {
-                continue;
+                continue
               }
               if (
                 timetype_selected > 0 &&
                 schedual.schedule_type != timetype_selected
               ) {
-                continue;
+                continue
               }
-              scheduals.push(schedual);
+              scheduals.push(schedual)
             }
           }
           // return scheduals;
-          return this.processScheduals(scheduals);
+          return this.processScheduals(scheduals)
         } else {
           // return this.zone_scheduals;
-          var scheduals = [];
+          var scheduals = []
           for (let index = 0; index < this.scheduals.length; index++) {
-            const schedual = this.scheduals[index];
+            const schedual = this.scheduals[index]
             if (schedual.dialysis_order == null) {
               if (
                 this.cur_zone_selected > 0 &&
                 schedual.device_number.zone.id != this.cur_zone_selected
               ) {
-                continue;
+                continue
               }
               if (
                 timetype_selected > 0 &&
                 schedual.schedule_type != timetype_selected
               ) {
-                continue;
+                continue
               }
-              scheduals.push(schedual);
+              scheduals.push(schedual)
             }
           }
           // return scheduals;
-          return this.processScheduals(scheduals);
+          return this.processScheduals(scheduals)
         }
       }
 
       if (this.select_index == 2) {
-        var scheduals = [];
+        var scheduals = []
         for (let index = 0; index < this.scheduals.length; index++) {
-          const schedual = this.scheduals[index];
+          const schedual = this.scheduals[index]
           if (
             schedual.assessment_before_dislysis == null ||
             schedual.assessment_before_dislysis.weight_before == 0
           ) {
-            scheduals.push(schedual);
+            scheduals.push(schedual)
           }
         }
-        return this.processScheduals(scheduals);
+        return this.processScheduals(scheduals)
         // return scheduals;
       } else if (this.select_index == 1) {
-        var scheduals = [];
+        var scheduals = []
         for (let index = 0; index < this.scheduals.length; index++) {
-          const schedual = this.scheduals[index];
+          const schedual = this.scheduals[index]
           if (
             schedual.prescription == null ||
             schedual.prescription.creater == 0
           ) {
-            scheduals.push(schedual);
+            scheduals.push(schedual)
           }
         }
         // return scheduals;
-        return this.processScheduals(scheduals);
+        return this.processScheduals(scheduals)
       } else {
         // return this.zone_scheduals;
-        var scheduals = [];
+        var scheduals = []
         for (let index = 0; index < this.scheduals.length; index++) {
-          const schedual = this.scheduals[index];
+          const schedual = this.scheduals[index]
           if (schedual.dialysis_order == null) {
-            scheduals.push(schedual);
+            scheduals.push(schedual)
           }
         }
         // return scheduals;
-        return this.processScheduals(scheduals);
+        return this.processScheduals(scheduals)
       }
     }
   },
-  created() {
-    var area = getSelectedAreaDataConfigList();
-    var time = getSelectedTimesDataConfigList();
-    var type = getWaitTypeSelectedConfig();
+  created () {
+    var area = getSelectedAreaDataConfigList()
+    var time = getSelectedTimesDataConfigList()
+    var type = getWaitTypeSelectedConfig()
 
     if (area != null) {
-      this.zone_options_visible = false;
-      this.zone_selected = parseInt(area);
-      this.select_index = -1;
+      this.zone_options_visible = false
+      this.zone_selected = parseInt(area)
+      this.select_index = -1
     }
 
     if (time != null) {
-      this.time_selected = parseInt(time);
-      this.select_index = -1;
-      this.time_options_visible = false;
+      this.time_selected = parseInt(time)
+      this.select_index = -1
+      this.time_options_visible = false
     }
     if (type != null) {
-      this.select_index = parseInt(type);
+      this.select_index = parseInt(type)
     }
-
-    var storedata = this.$store.getters.waitscheduals;
-    var scheduals = storedata.waitscheduals;
+    
+    var storedata = this.$store.getters.waitscheduals
+    var scheduals = storedata.waitscheduals
     if (Object.keys(storedata).length > 0) {
-      var totalCount = scheduals.length;
-      var prescription_count = 0;
-      var assessment_before_dislysis_count = 0;
+      var totalCount = scheduals.length
+      var prescription_count = 0
+      var assessment_before_dislysis_count = 0
       for (let index = 0; index < scheduals.length; index++) {
-        const schedual = scheduals[index];
+        const schedual = scheduals[index]
         if (schedual.assessment_before_dislysis == null) {
-          assessment_before_dislysis_count += 1;
+          assessment_before_dislysis_count += 1
         }
         if (schedual.prescription == null) {
-          prescription_count += 1;
+          prescription_count += 1
         }
       }
-      this.menuList[2].count = assessment_before_dislysis_count;
-      this.menuList[1].count = prescription_count;
-      this.scheduals = scheduals;
+      this.menuList[2].count = assessment_before_dislysis_count
+      this.menuList[1].count = prescription_count
+      this.scheduals = scheduals
 
-      this.zone_options = this.makeZones(scheduals);
-      this.zone_scheduals = this.processScheduals(scheduals);
+      this.zone_options = this.makeZones(scheduals)
+      this.zone_scheduals = this.processScheduals(scheduals)
     } else {
-      this.requestScheduals();
+      this.requestScheduals()
     }
   },
-  mounted() {
+  mounted () {
     this.timer = window.setInterval(() => {
-      setTimeout(this.requestScheduals(), 0);
-    }, 30000);
+      setTimeout(this.requestScheduals(), 0)
+    }, 12000)
   },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(this.timer);
-    });
+  beforeDestroy () {
+    clearInterval(this.timer)
+    this.timer = null
+    this.$once('hook:beforeDestroy', () => {
+      clearInterval(this.timer)
+    })
   },
   methods: {
-    processScheduals: function(scheduals) {
-      var zoneMap = {};
-      var schedualMap = {};
-      var assessment_before_dislysis_count = 0;
-      var prescription_count = 0;
+    processScheduals: function (scheduals) {
+      var zoneMap = {}
+      var schedualMap = {}
+      var assessment_before_dislysis_count = 0
+      var prescription_count = 0
       for (let index = 0; index < scheduals.length; index++) {
-        const schedual = scheduals[index];
+        const schedual = scheduals[index]
         if (schedualMap[schedual.device_number.zone.id] == null) {
-          schedualMap[schedual.device_number.zone.id] = [];
+          schedualMap[schedual.device_number.zone.id] = []
         }
         if (this.select_index == 1) {
           if (
             schedual.prescription == null ||
             schedual.prescription.creater == 0
           ) {
-            schedualMap[schedual.device_number.zone.id].push(schedual);
-            prescription_count++;
+            schedualMap[schedual.device_number.zone.id].push(schedual)
+            prescription_count++
           }
         } else if (this.select_index == 2) {
           if (
             schedual.assessment_before_dislysis == null ||
             schedual.assessment_before_dislysis.weight_before == 0
           ) {
-            schedualMap[schedual.device_number.zone.id].push(schedual);
-            assessment_before_dislysis_count++;
+            schedualMap[schedual.device_number.zone.id].push(schedual)
+            assessment_before_dislysis_count++
           }
         } else {
           if (schedual.dialysis_order == null) {
-            schedualMap[schedual.device_number.zone.id].push(schedual);
+            schedualMap[schedual.device_number.zone.id].push(schedual)
           }
         }
         if (zoneMap[schedual.device_number.zone.id] == null) {
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
         }
       }
 
       if (this.select_index == 1) {
-        this.menuList[1].count = prescription_count;
+        this.menuList[1].count = prescription_count
       }
       if (this.select_index == 2) {
-        this.menuList[2].count = assessment_before_dislysis_count;
+        this.menuList[2].count = assessment_before_dislysis_count
       }
 
-      var zones = [];
+      var zones = []
       // zones.push({ value: 0, text: "全部分区" })
       for (var zoneId in zoneMap) {
-        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
+        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name })
       }
 
-      zones = zones.sort(function(a, b) {
-        return a.id > b.id;
-      });
+      zones = zones.sort(function (a, b) {
+        return a.id > b.id
+      })
       // this.zones = zones
 
-      var zone_scheduals = [];
+      var zone_scheduals = []
       for (let index = 0; index < zones.length; index++) {
-        const zone = zones[index];
-        var scheduals = schedualMap[zone.id];
+        const zone = zones[index]
+        var scheduals = schedualMap[zone.id]
         zone_scheduals.push({
           zone_id: zone.id,
           zone_name: zone.name,
 
           scheduals: scheduals
-        });
+        })
       }
       // this.zone_scheduals = zone_scheduals;
-      return zone_scheduals;
+      return zone_scheduals
     },
-    reloads: function() {
-      this.reload();
+    reloads: function () {
+      this.reload()
     },
-    handleAllChange: function(tabIndex) {
-      this.select_index = tabIndex;
-      this.zone_selected = 0;
-      this.time_selected = 0;
+    handleAllChange: function (tabIndex) {
+      this.select_index = tabIndex
+      this.zone_selected = 0
+      this.time_selected = 0
     },
-    menuTabClick: function(tabIndex) {
-      this.select_index = tabIndex;
-      this.zone_selected = 0;
-      this.time_selected = 0;
-      setSelectedAreaDataConfigList(this.zone_selected);
-      setSelectedTimesDataConfigList(this.time_selected);
-      setWaitTypeSelectedConfig(tabIndex);
+    menuTabClick: function (tabIndex) {
+      this.select_index = tabIndex
+      this.zone_selected = 0
+      this.time_selected = 0
+      setSelectedAreaDataConfigList(this.zone_selected)
+      setSelectedTimesDataConfigList(this.time_selected)
+      setWaitTypeSelectedConfig(tabIndex)
     },
-    handleZoneChange: function(index, zone) {
-      this.zone_options_visible = false;
-      this.zone_selected = index;
-      this.cur_zone_selected = zone.value;
+    handleZoneChange: function (index, zone) {
+      this.zone_options_visible = false
+      this.zone_selected = index
+      this.cur_zone_selected = zone.value
       // this.select_index = -1;
-      setSelectedAreaDataConfigList(index.toString());
+      setSelectedAreaDataConfigList(index.toString())
     },
-    handleTimeChange: function(index) {
-      this.time_selected = index;
+    handleTimeChange: function (index) {
+      this.time_selected = index
       // this.select_index = -1;
-      this.time_options_visible = false;
-      setSelectedTimesDataConfigList(index.toString());
+      this.time_options_visible = false
+      setSelectedTimesDataConfigList(index.toString())
     },
 
-    requestScheduals() {
+    requestScheduals () {
       // this.loading = true;
-      var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
+      var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
       getWaitingScheduals({ date: date })
         .then(rs => {
-          var resp = rs.data;
+          var resp = rs.data
           if (resp.state == 1) {
-            this.loading = false;
+            this.loading = false
 
-            var scheduals = resp.data.scheduals;
-            this.$store.dispatch("SetWaitScheduals", {
+            var scheduals = resp.data.scheduals
+            this.$store.dispatch('SetWaitScheduals', {
               waitscheduals: scheduals
-            });
-            var totalCount = scheduals.length;
-            var prescription_count = 0;
-            var assessment_before_dislysis_count = 0;
+            })
+            var totalCount = scheduals.length
+            var prescription_count = 0
+            var assessment_before_dislysis_count = 0
             for (let index = 0; index < scheduals.length; index++) {
-              const schedual = scheduals[index];
+              const schedual = scheduals[index]
               if (schedual.assessment_before_dislysis == null) {
-                assessment_before_dislysis_count += 1;
+                assessment_before_dislysis_count += 1
               }
               if (schedual.prescription == null) {
-                prescription_count += 1;
+                prescription_count += 1
               }
             }
-            this.menuList[2].count = assessment_before_dislysis_count;
-            this.menuList[1].count = prescription_count;
-            this.scheduals = scheduals;
+            this.menuList[2].count = assessment_before_dislysis_count
+            this.menuList[1].count = prescription_count
+            this.scheduals = scheduals
 
-            this.zone_options = this.makeZones(scheduals);
-            this.zone_scheduals = this.processScheduals(scheduals);
+            this.zone_options = this.makeZones(scheduals)
+            this.zone_scheduals = this.processScheduals(scheduals)
           } else {
-            this.loading = false;
+            this.loading = false
 
             this.$toast({
               message: resp.msg
-            });
+            })
           }
         })
         .catch(error => {
-          this.loading = false;
+          this.loading = false
 
-          //超时之后在这里捕抓错误信息.
+          // 超时之后在这里捕抓错误信息.
           if (error.response) {
-            this.networkStates = false;
+            this.networkStates = false
           } else if (error.request) {
-            this.networkStates = false;
+            this.networkStates = false
             // if(error.request.readyState == 4 && error.request.status == 0){
             //   //我在这里重新请求
             //   this.networkStates = false
             // }
           } else {
-            this.networkStates = false;
+            this.networkStates = false
           }
-        });
+        })
     },
-    makeZones: function(scheduals) {
-      var zoneMap = {};
+    makeZones: function (scheduals) {
+      var zoneMap = {}
       for (let index = 0; index < scheduals.length; index++) {
-        const schedual = scheduals[index];
+        const schedual = scheduals[index]
         if (zoneMap[schedual.device_number.zone.id] == null) {
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
         }
       }
 
-      var zones = [];
-      zones.push({ value: 0, text: "全部分区" });
+      var zones = []
+      zones.push({ value: 0, text: '全部分区' })
 
       for (var zoneId in zoneMap) {
-        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name });
+        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name })
       }
 
       // zones = zones.sort(function (a, b) {
       //   return a.value > b.value
       // })
-      return zones;
+      return zones
     }
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/main/dialog/OrdersDialog.vue

 }
 .table {
   width: 1200px;
-  @media only screen and (max-width: 767px) {
+  @media only screen and (max-width: 415px) {
       width: 850px;
     }
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      width: 1000px;
+    }
   tr {
     th {
       background: $main-color;

src/pages/main/dialog/PlaneDialog.vue

       type: Object
     }
   },
-  mounted() {
+  mounted() {debugger
     if (this.record.id == "") {
       //没有上下机记录
       this.end_time_str =

src/pages/main/dialog/PrescriptionDialog.vue

               this.zhiShow = true
               this.totalShow = true
               this.huShow  = true 
-              console.log("a")
             }
           }
         }

src/pages/main/dialog/TwoMenu.vue

   @media only screen and (max-width: 812px) {
     min-height: 8rem !important;
   }
-  @media only screen and (min-width: 415px) and (max-width: 737px) {
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
     max-height: 12.6rem !important;
   }
   ul {

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

         <div style="overflow: hidden;">
           <div class="cell" style="margin-top: 0;">
             <label>医嘱类型</label>
-            <el-input
-              class="typeInput"
-              ref="advice_type"
-              value="临时"
-              disabled
-            ></el-input>
+            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
           </div>
           <div class="cell" style="margin-top: 0;">
             <label>开始时间</label>
             <label>开嘱时间 {{ record_date_str }}</label>
           </div>
         </div>
-        <div
-          id="newDialogContent"
-          class="DialogContent choose"
-          style="height: 6.2rem;"
-        >
+        <div id="newDialogContent" class="DialogContent choose" style="height: 6.2rem;">
           <div class="newAddTable">
             <table class="table">
               <tr>
                 >
                   <td
                     style="text-align: left; padding-left: 5px; padding-right: 5px;"
-                  >
-                    {{ advice.title }}
-                  </td>
-                  <td v-if="advice.advice_desc">
-                    {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
-                  </td>
+                  >{{ advice.title }}</td>
+                  <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</td>
                   <td v-if="advice.prescribing_number">
                     {{ advice.prescribing_number
                     }}{{ advice.prescribing_number_unit }}
                   </td>
                   <td v-else></td>
-                  <td v-if="advice.single_dose">
-                    {{ advice.single_dose }} {{ advice.single_dose_unit }}
-                  </td>
+                  <td
+                    v-if="advice.single_dose"
+                  >{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
                   <td v-else></td>
                   <td>{{ advice.delivery_way }}</td>
                   <td>{{ advice.execution_frequency }}</td>
                 >
                   <td
                     style="text-align: left; padding-right: 5px; padding-left: 25px;"
-                  >
-                    {{ subdrug.title }}
-                  </td>
-                  <td>
-                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
-                  </td>
+                  >{{ subdrug.title }}</td>
+                  <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
                   <td>
                     <span v-if="subdrug.prescribing_number">
                       {{ subdrug.prescribing_number
       parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
   },
   methods: {
+    ok() {
+      // alert(1);
+      // this.$refs.start_time_picker.close();
+      console.log(this.$refs.start_time_picker);
+    },
     backAction: function() {
       this.$emit("back-action");
     },
     didSelectStartTime: function(time) {
       this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
       console.log(".");
+      console.log(this.$refs.start_time_picker);
     },
     didSelectTemplateAdvice: function(resp_advices) {
       this.show_dialog_key = 0;

src/pages/main/today/TodayTab.vue

       // this.scrollToView('monitoring')
     },
 
-    closeDialysisOff: function (assessment_after_dislysis) {
+    closeDialysisOff: function (assessment_after_dislysis) {debugger
       this.closeDialog(7)
       if (assessment_after_dislysis != undefined) {
         this.assessment_after_dislysis = assessment_after_dislysis

src/router/index.js

 import Vue from "vue";
 import Router from "vue-router";
 
-
 Vue.use(Router);
 
 export default new Router({
       path: "/changePassword",
       name: "changePassword",
       component: () => import("@/pages/personal/ChangePassword")
+    },
+    {
+      path: "/privacyPolicy",
+      name: "privacyPolicy",
+      component: () => import("@/pages/home/privacyPolicy")
     }
   ]
 });

src/styles/style.scss

           width: 4.2rem;
         }
         @media only screen and (min-width: 415px) and (max-width: 767px) {
-          width: 6rem;
+          width: 5.6rem;
           font-size: 0.4rem;
         }
         @media only screen and (min-width: 768px) {