Browse Source

修改bug

csx 4 years ago
parent
commit
c71533a8bb

+ 1 - 1
build/cdn.json View File

1
 {
1
 {
2
-  "version": "1.1.2"
2
+  "version": "1.1.52"
3
 }
3
 }

+ 9 - 4
src/pages/home/login.vue View File

1
 <template>
1
 <template>
2
   <div class="container">
2
   <div class="container">
3
+
3
     <div class="newLogin">
4
     <div class="newLogin">
4
       <div class="login">
5
       <div class="login">
5
         <div class="logo">
6
         <div class="logo">
53
               <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
54
               <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
54
             <!--</el-checkbox>-->
55
             <!--</el-checkbox>-->
55
             <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
56
             <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
56
-            <!--<span class="agreeText" @click="agree">《隐私服务协议》</span>-->
57
             <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
57
             <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
58
           <!--</div>-->
58
           <!--</div>-->
59
+          <router-link to="/privacy">
60
+            <span class="agreeText">《隐私服务协议》</span>
61
+          </router-link>
62
+
59
         </div>
63
         </div>
60
       </div>
64
       </div>
61
     </div>
65
     </div>
66
+
62
   </div>
67
   </div>
63
 </template>
68
 </template>
64
 
69
 
216
     clearCookie: function() {
221
     clearCookie: function() {
217
       this.setCookie("", "", -1); //修改2值都为空,天数为负1天就好了
222
       this.setCookie("", "", -1); //修改2值都为空,天数为负1天就好了
218
     },
223
     },
219
-    agree() {
220
-      this.$router.push({ path: "/privacyPolicy" });
221
-    }
224
+    // agree() {
225
+    //   this.$router.push({ path: "/privacy" });
226
+    // }
222
   }
227
   }
223
 };
228
 };
224
 </script>
229
 </script>

+ 0 - 6
src/pages/main/add_urgent_schedule.vue View File

239
 
239
 
240
       var today = new Date();
240
       var today = new Date();
241
       this.date = parseTime(today, "{y}-{m}-{d}");
241
       this.date = parseTime(today, "{y}-{m}-{d}");
242
-
243
       var hour = today.getHours();
242
       var hour = today.getHours();
244
       if (hour > 3 && hour < 11) {
243
       if (hour > 3 && hour < 11) {
245
         this.schedule_type = 1;
244
         this.schedule_type = 1;
248
       } else {
247
       } else {
249
         this.schedule_type = 3;
248
         this.schedule_type = 3;
250
       }
249
       }
251
-
252
-
253
-
254
-
255
-
256
     },
250
     },
257
     mounted() {
251
     mounted() {
258
 
252
 

+ 17 - 15
src/pages/main/dialog/ComputerDialog.vue View File

137
     }, mounted () {
137
     }, mounted () {
138
 
138
 
139
       if (this.record.id == 0) {
139
       if (this.record.id == 0) {
140
+        let now = new Date()
141
+        let hour = now.getHours()
142
+
143
+        if (hour >= 6 && hour < 12){
144
+          this.schedual_type = 1
145
+
146
+        }else if(hour >= 12 && hour < 18){
147
+
148
+          this.schedual_type = 2
149
+
150
+
151
+        }else if(hour >= 18){
152
+          this.schedual_type = 3
153
+        }
140
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
154
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
141
       } else {
155
       } else {
142
         if (this.record.start_time == 0) {
156
         if (this.record.start_time == 0) {
143
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
157
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
144
-
158
+          this.schedual_type = this.record.schedual_type
145
         } else {
159
         } else {
146
           this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
160
           this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
161
+          this.schedual_type = this.record.schedual_type
162
+
147
         }
163
         }
148
       }
164
       }
149
     },
165
     },
150
     created () {
166
     created () {
151
-      let now = new Date()
152
-      let hour = now.getHours()
153
-
154
-      if (hour >= 6 && hour < 12){
155
-        this.schedual_type = 1
156
-
157
-      }else if(hour >= 12 && hour < 18){
158
-
159
-        this.schedual_type = 2
160
-
161
-
162
-      }else if(hour >= 18){
163
-        this.schedual_type = 3
164
-      }
165
 
167
 
166
 
168
 
167
       this.GetSchedualNumber()
169
       this.GetSchedualNumber()

+ 23 - 25
src/pages/main/dialog/TreatmentDialog.vue View File

241
     },
241
     },
242
 
242
 
243
     dialysisSummarySelectChange: function(values) {
243
     dialysisSummarySelectChange: function(values) {
244
-      if (this.dialysisSummary.summaryContent == null) {
245
-        this.dialysisSummary.summaryContent == "";
244
+      if(this.dialysisSummary.summaryContent == null){
245
+        this.dialysisSummary.summaryContent == ""
246
       }
246
       }
247
+
247
       if (this.dialysisSummary.summaryContent == "") {
248
       if (this.dialysisSummary.summaryContent == "") {
248
         this.dialysisSummary.summaryContent = values;
249
         this.dialysisSummary.summaryContent = values;
249
       } else {
250
       } else {
250
-        this.dialysisSummary.summaryContent =
251
-          this.dialysisSummary.summaryContent + values;
251
+        if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
252
+          if (this.dialysisSummary.summaryContent.charAt(this.dialysisSummary.summaryContent.length - 1).indexOf("。") == -1) {
253
+            this.dialysisSummary.summaryContent =
254
+              this.dialysisSummary.summaryContent + "," + values;
255
+          } else {
256
+            this.dialysisSummary.summaryContent =
257
+              this.dialysisSummary.summaryContent  + values;
258
+          }
259
+        }
252
       }
260
       }
253
     },
261
     },
254
     dialysisAfterTeachSelectChange: function(values) {
262
     dialysisAfterTeachSelectChange: function(values) {
255
-      if (this.dialysisSummary.propagandaAndEducationContent == null) {
256
-        this.dialysisSummary.propagandaAndEducationContent == "";
263
+      if(this.dialysisSummary.propagandaAndEducationContent == null){
264
+        this.dialysisSummary.propagandaAndEducationContent == ""
257
       }
265
       }
258
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
266
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
259
         this.dialysisSummary.propagandaAndEducationContent = values;
267
         this.dialysisSummary.propagandaAndEducationContent = values;
260
       } else {
268
       } else {
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
-        // }
269
+        if (this.dialysisSummary.propagandaAndEducationContent.indexOf(values) == -1) {
270
+          if (this.dialysisSummary.propagandaAndEducationContent.charAt(this.dialysisSummary.propagandaAndEducationContent.length - 1).indexOf("。") == -1) {
271
+            this.dialysisSummary.propagandaAndEducationContent =
272
+              this.dialysisSummary.propagandaAndEducationContent + "," + values;
273
+          } else {
274
+            this.dialysisSummary.propagandaAndEducationContent =
275
+              this.dialysisSummary.propagandaAndEducationContent + values;
276
+          }
277
+        }
280
       }
278
       }
281
     },
279
     },
282
     commitInfo: function() {
280
     commitInfo: function() {

+ 1 - 1
src/pages/privacy/index.vue View File

36
 
36
 
37
 <script>
37
 <script>
38
     export default {
38
     export default {
39
-        name: "privacyPolicy"
39
+        name: "privacy"
40
 
40
 
41
     }
41
     }
42
 </script>
42
 </script>

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

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