Browse Source

修改bug

csx 5 years ago
parent
commit
ab9d46593f

+ 10 - 10
src/pages/home/login.vue View File

45
           <a href="">免密码登录</a>
45
           <a href="">免密码登录</a>
46
           <a href="">忘记密码?</a>
46
           <a href="">忘记密码?</a>
47
           </div>-->
47
           </div>-->
48
-          <div class="agree">
49
-            <el-checkbox v-model="agreement">
50
-              我已阅读并同意
51
-              <!-- <router-link to="/privacyPolicy"> -->
48
+          <!--<div class="agree">-->
49
+            <!--<el-checkbox v-model="agreement">-->
50
+              <!--我已阅读并同意-->
51
+              <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
52
 
52
 
53
-              <!-- </router-link> -->
54
-            </el-checkbox>
55
-            <!-- <router-link to="/privacyPolicy"> -->
56
-            <span class="agreeText" @click="agree">《隐私服务协议》</span>
57
-            <!-- </router-link> -->
58
-          </div>
53
+              <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
54
+            <!--</el-checkbox>-->
55
+            <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
56
+            <!--<span class="agreeText" @click="agree">《隐私服务协议》</span>-->
57
+            <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
58
+          <!--</div>-->
59
         </div>
59
         </div>
60
       </div>
60
       </div>
61
     </div>
61
     </div>

+ 5 - 2
src/pages/main/add_urgent_schedule.vue View File

131
     </van-popup>
131
     </van-popup>
132
     <van-popup v-model="show_bed_picker" position="bottom" class="popup">
132
     <van-popup v-model="show_bed_picker" position="bottom" class="popup">
133
       <van-picker
133
       <van-picker
134
+        ref="picker"
134
         :columns="zone_device_options"
135
         :columns="zone_device_options"
135
         value-key="number"
136
         value-key="number"
136
         @change="didChangeBed"
137
         @change="didChangeBed"
138
     </van-popup>
139
     </van-popup>
139
     <van-popup v-model="show_sch_type_picker" position="bottom" class="popup">
140
     <van-popup v-model="show_sch_type_picker" position="bottom" class="popup">
140
       <van-picker
141
       <van-picker
142
+        ref="schedule"
141
         :columns="schedule_types"
143
         :columns="schedule_types"
142
         value-key="text"
144
         value-key="text"
143
         @change="didChangeSchType"
145
         @change="didChangeSchType"
234
         return "";
236
         return "";
235
       }
237
       }
236
     },created(){
238
     },created(){
237
-      console.log(this.$refs.schedule_picker)
239
+
238
       var today = new Date();
240
       var today = new Date();
239
       this.date = parseTime(today, "{y}-{m}-{d}");
241
       this.date = parseTime(today, "{y}-{m}-{d}");
240
 
242
 
351
       selectSchTypeAction: function() {
353
       selectSchTypeAction: function() {
352
         this.$refs.sch_type_field.blur();
354
         this.$refs.sch_type_field.blur();
353
         this.show_sch_type_picker = true;
355
         this.show_sch_type_picker = true;
356
+
354
       },
357
       },
355
 
358
 
356
       didChangePatient: function(picker, patient, index) {
359
       didChangePatient: function(picker, patient, index) {
436
       },
439
       },
437
 
440
 
438
       submitAction: function() {
441
       submitAction: function() {
442
+
439
         if (this.patient_id == 0 || this.mode_id == 0 || this.device_id == 0) {
443
         if (this.patient_id == 0 || this.mode_id == 0 || this.device_id == 0) {
440
           Toast.fail("请选择班次、床位等");
444
           Toast.fail("请选择班次、床位等");
441
           return;
445
           return;
481
             this.loading = false;
485
             this.loading = false;
482
             var resp = rs.data;
486
             var resp = rs.data;
483
             if (resp.state == 1) {
487
             if (resp.state == 1) {
484
-              console.log(resp.data);
485
               var patient = resp.data.patient;
488
               var patient = resp.data.patient;
486
               var schedule = resp.data.schedule;
489
               var schedule = resp.data.schedule;
487
               this.$router.push({
490
               this.$router.push({

+ 21 - 34
src/pages/main/dialog/TreatmentDialog.vue View File

244
       if (this.dialysisSummary.summaryContent == null) {
244
       if (this.dialysisSummary.summaryContent == null) {
245
         this.dialysisSummary.summaryContent == "";
245
         this.dialysisSummary.summaryContent == "";
246
       }
246
       }
247
-
248
       if (this.dialysisSummary.summaryContent == "") {
247
       if (this.dialysisSummary.summaryContent == "") {
249
         this.dialysisSummary.summaryContent = values;
248
         this.dialysisSummary.summaryContent = values;
250
       } else {
249
       } else {
251
-        if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
252
-          if (
253
-            this.dialysisSummary.summaryContent
254
-              .charAt(this.dialysisSummary.summaryContent.length - 1)
255
-              .indexOf("。") == -1
256
-          ) {
257
-            this.dialysisSummary.summaryContent =
258
-              this.dialysisSummary.summaryContent + "," + values;
259
-          } else {
260
-            this.dialysisSummary.summaryContent =
261
-              this.dialysisSummary.summaryContent + "," + values;
262
-            this.dialysisSummary.summaryContent =
263
-              this.dialysisSummary.summaryContent + values;
264
-          }
265
-        }
250
+        this.dialysisSummary.summaryContent =
251
+          this.dialysisSummary.summaryContent + values;
266
       }
252
       }
267
     },
253
     },
268
     dialysisAfterTeachSelectChange: function(values) {
254
     dialysisAfterTeachSelectChange: function(values) {
272
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
258
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
273
         this.dialysisSummary.propagandaAndEducationContent = values;
259
         this.dialysisSummary.propagandaAndEducationContent = values;
274
       } else {
260
       } else {
275
-        if (
276
-          this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
277
-          -1
278
-        ) {
279
-          if (
280
-            this.dialysisSummary.propagandaAndEducationContent
281
-              .charAt(
282
-                this.dialysisSummary.propagandaAndEducationContent.length - 1
283
-              )
284
-              .indexOf("。") == -1
285
-          ) {
286
-            this.dialysisSummary.propagandaAndEducationContent =
287
-              this.dialysisSummary.propagandaAndEducationContent + "," + values;
288
-          } else {
289
-            this.dialysisSummary.propagandaAndEducationContent =
290
-              this.dialysisSummary.propagandaAndEducationContent + values;
291
-          }
292
-        }
261
+        this.dialysisSummary.propagandaAndEducationContent =
262
+          this.dialysisSummary.propagandaAndEducationContent + values;
263
+        // if (
264
+        //   this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
265
+        //   -1
266
+        // ) {
267
+        //   if (
268
+        //     this.dialysisSummary.propagandaAndEducationContent
269
+        //       .charAt(
270
+        //         this.dialysisSummary.propagandaAndEducationContent.length - 1
271
+        //       )
272
+        //       .indexOf("。") == -1
273
+        //   ) {
274
+        //     this.dialysisSummary.propagandaAndEducationContent =
275
+        //       this.dialysisSummary.propagandaAndEducationContent + "," + values;
276
+        //   } else {
277
+        //
278
+        //   }
279
+        // }
293
       }
280
       }
294
     },
281
     },
295
     commitInfo: function() {
282
     commitInfo: function() {

+ 2 - 3
src/pages/main/today/dialysisComputer.vue View File

64
       if (this.record == null || this.record.id == "") {
64
       if (this.record == null || this.record.id == "") {
65
         return "-";
65
         return "-";
66
       }
66
       }
67
-      return this.device_number_map[this.record.bed_id] == null
68
-        ? ""
69
-        : this.device_number_map[this.record.bed_id].number;
67
+      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
68
+
70
     },
69
     },
71
     nurse: function() {
70
     nurse: function() {
72
       if (this.record == null || this.record.id == "") {
71
       if (this.record == null || this.record.id == "") {

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

34
 </template>
34
 </template>
35
 
35
 
36
 
36
 
37
+<script>
38
+    export default {
39
+        name: "privacyPolicy"
40
+
41
+    }
42
+</script>
43
+
37
 <style lang="scss" scoped>
44
 <style lang="scss" scoped>
38
-.page_privacy {
39
-  width: 100%;
40
-  margin: 0 auto;
41
-  height: 100%;
42
-  overflow-y: auto;
43
-  display: flex;
44
-  flex-direction: column;
45
+  .page_privacy {
46
+    width: 100%;
47
+    margin: 0 auto;
48
+    height: 100%;
49
+    overflow-y: auto;
50
+    display: flex;
51
+    flex-direction: column;
45
   > div:last-child {
52
   > div:last-child {
46
     flex: 1;
53
     flex: 1;
47
     overflow-y: auto;
54
     overflow-y: auto;
50
     font-size: 0.45rem;
57
     font-size: 0.45rem;
51
     padding: 0.3rem 0.37rem;
58
     padding: 0.3rem 0.37rem;
52
     color: $title-color;
59
     color: $title-color;
53
-    @include align-items-center;
54
-    @include display-flex;
55
-    @include justify-content-between;
56
-    @include text-align;
60
+  @include align-items-center;
61
+  @include display-flex;
62
+  @include justify-content-between;
63
+  @include text-align;
57
     background: #fff;
64
     background: #fff;
58
-    .GoBack {
59
-      color: $main-color;
60
-      font-size: 0.45rem;
61
-      @include display-flex;
62
-      .iconfont {
63
-        color: $main-color;
64
-        font-size: 0.5rem;
65
-        margin-top: 1px;
66
-        @media only screen and (min-width: 768px) {
67
-          margin-top: 3px;
68
-        }
69
-      }
70
-    }
65
+  .GoBack {
66
+    color: $main-color;
67
+    font-size: 0.45rem;
68
+  @include display-flex;
69
+  .iconfont {
70
+    color: $main-color;
71
+    font-size: 0.5rem;
72
+    margin-top: 1px;
73
+  @media only screen and (min-width: 768px) {
74
+    margin-top: 3px;
75
+  }
76
+  }
77
+  }
71
   }
78
   }
72
   .name {
79
   .name {
73
     margin-right: 1.3rem;
80
     margin-right: 1.3rem;
83
     width: 90%;
90
     width: 90%;
84
     margin: 0 auto;
91
     margin: 0 auto;
85
   }
92
   }
86
-}
93
+  }
87
 </style>
94
 </style>

+ 2 - 2
src/router/index.js View File

76
       component: () => import("@/pages/personal/ChangePassword")
76
       component: () => import("@/pages/personal/ChangePassword")
77
     },
77
     },
78
     {
78
     {
79
-      path: "/privacyPolicy",
79
+      path: "/privacy",
80
       name: "privacyPolicy",
80
       name: "privacyPolicy",
81
-      component: () => import("@/pages/home/privacyPolicy")
81
+      component: () => import("@/pages/privacy/index")
82
     }
82
     }
83
   ]
83
   ]
84
 });
84
 });