修改bug

src/pages/home/login.vue

@@ -45,17 +45,17 @@
           <a href="">免密码登录</a>
           <a href="">忘记密码？</a>
           </div>-->
-          <div class="agree">
-            <el-checkbox v-model="agreement">
-              我已阅读并同意
-              <!-- <router-link to="/privacyPolicy"> -->
+          <!--<div class="agree">-->
+            <!--<el-checkbox v-model="agreement">-->
+              <!--我已阅读并同意-->
+              <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
 
-              <!-- </router-link> -->
-            </el-checkbox>
-            <!-- <router-link to="/privacyPolicy"> -->
-            <span class="agreeText" @click="agree">《隐私服务协议》</span>
-            <!-- </router-link> -->
-          </div>
+              <!--&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>
       </div>
     </div>

src/pages/main/add_urgent_schedule.vue

@@ -131,6 +131,7 @@
     </van-popup>
     <van-popup v-model="show_bed_picker" position="bottom" class="popup">
       <van-picker
+        ref="picker"
         :columns="zone_device_options"
         value-key="number"
         @change="didChangeBed"
@@ -138,6 +139,7 @@
     </van-popup>
     <van-popup v-model="show_sch_type_picker" position="bottom" class="popup">
       <van-picker
+        ref="schedule"
         :columns="schedule_types"
         value-key="text"
         @change="didChangeSchType"
@@ -234,7 +236,7 @@
         return "";
       }
     },created(){
-      console.log(this.$refs.schedule_picker)
+
       var today = new Date();
       this.date = parseTime(today, "{y}-{m}-{d}");
 
@@ -351,6 +353,7 @@
       selectSchTypeAction: function() {
         this.$refs.sch_type_field.blur();
         this.show_sch_type_picker = true;
+
       },
 
       didChangePatient: function(picker, patient, index) {
@@ -436,6 +439,7 @@
       },
 
       submitAction: function() {
+
         if (this.patient_id == 0 || this.mode_id == 0 || this.device_id == 0) {
           Toast.fail("请选择班次、床位等");
           return;
@@ -481,7 +485,6 @@
             this.loading = false;
             var resp = rs.data;
             if (resp.state == 1) {
-              console.log(resp.data);
               var patient = resp.data.patient;
               var schedule = resp.data.schedule;
               this.$router.push({

src/pages/main/dialog/TreatmentDialog.vue

@@ -244,25 +244,11 @@ export default {
       if (this.dialysisSummary.summaryContent == null) {
         this.dialysisSummary.summaryContent == "";
       }
-
       if (this.dialysisSummary.summaryContent == "") {
         this.dialysisSummary.summaryContent = values;
       } else {
-        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;
-            this.dialysisSummary.summaryContent =
-              this.dialysisSummary.summaryContent + values;
-          }
-        }
+        this.dialysisSummary.summaryContent =
+          this.dialysisSummary.summaryContent + values;
       }
     },
     dialysisAfterTeachSelectChange: function(values) {
@@ -272,24 +258,25 @@ export default {
       if (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;
-          }
-        }
+        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 {
+        //
+        //   }
+        // }
       }
     },
     commitInfo: function() {

src/pages/main/today/dialysisComputer.vue

@@ -64,9 +64,8 @@ export default {
       if (this.record == null || this.record.id == "") {
         return "-";
       }
-      return this.device_number_map[this.record.bed_id] == null
-        ? ""
-        : this.device_number_map[this.record.bed_id].number;
+      return this.device_number_map[this.record.bed_id] == null ? '' : this.device_number_map[this.record.bed_id].zone_name + "-"+this.device_number_map[this.record.bed_id].number
+
     },
     nurse: function() {
       if (this.record == null || this.record.id == "") {

src/pages/home/privacyPolicy.vue → src/pages/privacy/index.vue

@@ -34,14 +34,21 @@
 </template>
 
 
+<script>
+    export default {
+        name: "privacyPolicy"
+
+    }
+</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;
@@ -50,24 +57,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;
@@ -83,5 +90,5 @@
     width: 90%;
     margin: 0 auto;
   }
-}
+  }
 </style>

src/router/index.js

@@ -76,9 +76,9 @@ export default new Router({
       component: () => import("@/pages/personal/ChangePassword")
     },
     {
-      path: "/privacyPolicy",
+      path: "/privacy",
       name: "privacyPolicy",
-      component: () => import("@/pages/home/privacyPolicy")
+      component: () => import("@/pages/privacy/index")
     }
   ]
 });