Browse Source

修改bug

csx 4 years ago
parent
commit
181e705e78

+ 1 - 1
build/cdn.json View File

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

+ 2 - 2
config/prod.env.js View File

1
 "use strict";
1
 "use strict";
2
 module.exports = {
2
 module.exports = {
3
   NODE_ENV: '"production"',
3
   NODE_ENV: '"production"',
4
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
4
+  BASE_API: '"https://api.xt.kuyicloud.com"'
5
 
5
 
6
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
6
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
7
   // http://api.xt.test.sgjyun.com
7
   // http://api.xt.test.sgjyun.com
8
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
8
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
9
 };
9
 };

+ 7 - 8
src/pages/home/login.vue View File

56
             <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
56
             <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
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>
59
+            <span  class="agreeText" @click="agree()">《隐私服务协议》</span>
60
+
62
 
61
 
63
         </div>
62
         </div>
64
       </div>
63
       </div>
136
       });
135
       });
137
     },
136
     },
138
     to: function() {
137
     to: function() {
139
-      this.$router.push({ path: "/forgetPassword" });
138
+      this.$router.push({ path: "/privacy" });
140
     },
139
     },
141
     submitForm() {
140
     submitForm() {
142
       const self = this;
141
       const self = this;
220
     //清除cookie
219
     //清除cookie
221
     clearCookie: function() {
220
     clearCookie: function() {
222
       this.setCookie("", "", -1); //修改2值都为空,天数为负1天就好了
221
       this.setCookie("", "", -1); //修改2值都为空,天数为负1天就好了
223
-    },
224
-    // agree() {
225
-    //   this.$router.push({ path: "/privacy" });
226
-    // }
222
+    }, agree() {
223
+      this.$router.push({ path: "/privacy" });
224
+
225
+    }
227
   }
226
   }
228
 };
227
 };
229
 </script>
228
 </script>

+ 29 - 22
src/pages/main/dialog/ComputerDialog.vue View File

100
         zone_beds: [], // 该排班的区里的床位
100
         zone_beds: [], // 该排班的区里的床位
101
         creator: 0,
101
         creator: 0,
102
         template_id: 0,
102
         template_id: 0,
103
+        temp_device_numbers:[],
103
         blood_drawing:100,
104
         blood_drawing:100,
104
         schedual_type:0,
105
         schedual_type:0,
105
         schedules_type: [
106
         schedules_type: [
136
       },
137
       },
137
     }, mounted () {
138
     }, mounted () {
138
 
139
 
140
+
141
+    },
142
+    created () {
143
+      this.temp_device_numbers = this.device_numbers
144
+
145
+
146
+
139
       if (this.record.id == 0) {
147
       if (this.record.id == 0) {
148
+        this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
140
         let now = new Date()
149
         let now = new Date()
141
         let hour = now.getHours()
150
         let hour = now.getHours()
142
 
151
 
151
         }else if(hour >= 18){
160
         }else if(hour >= 18){
152
           this.schedual_type = 3
161
           this.schedual_type = 3
153
         }
162
         }
154
-        this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
155
       } else {
163
       } else {
156
         if (this.record.start_time == 0) {
164
         if (this.record.start_time == 0) {
157
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
165
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
158
           this.schedual_type = this.record.schedual_type
166
           this.schedual_type = this.record.schedual_type
167
+
159
         } else {
168
         } else {
160
           this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
169
           this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
161
           this.schedual_type = this.record.schedual_type
170
           this.schedual_type = this.record.schedual_type
162
 
171
 
163
         }
172
         }
164
       }
173
       }
165
-    },
166
-    created () {
167
 
174
 
168
 
175
 
169
       this.GetSchedualNumber()
176
       this.GetSchedualNumber()
200
       // }
207
       // }
201
       // this.zone_beds = beds
208
       // this.zone_beds = beds
202
 
209
 
203
-      for (let index = 0; index < this.device_numbers.length; index++) {
204
-        const device_number = this.device_numbers[index]
205
-        this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
210
+      for (let index = 0; index < this.temp_device_numbers.length; index++) {
211
+        const device_number = this.temp_device_numbers[index]
212
+        this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
206
       }
213
       }
207
-      this.zone_beds = this.device_numbers
214
+      this.zone_beds = this.temp_device_numbers
208
 
215
 
209
       if (this.record.id > 0) {
216
       if (this.record.id > 0) {
210
         for (let i = 0; i < this.special_premission.length; i++) {
217
         for (let i = 0; i < this.special_premission.length; i++) {
255
                   Toast.fail(response.data.msg)
262
                   Toast.fail(response.data.msg)
256
                   return false
263
                   return false
257
                 } else {
264
                 } else {
258
-                  t.device_numbers = response.data.data.number
259
-                  for (let index = 0; index < t.device_numbers.length; index++) {
260
-                    const device_number = t.device_numbers[index]
261
-                    t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
265
+                  t.temp_device_numbers = response.data.data.number
266
+                  for (let index = 0; index < t.temp_device_numbers.length; index++) {
267
+                    const device_number = t.temp_device_numbers[index]
268
+                    t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
262
                   }
269
                   }
263
-                  t.zone_beds = t.device_numbers
270
+                  t.zone_beds = t.temp_device_numbers
264
                   t.bed_id = t.zone_beds[0].id
271
                   t.bed_id = t.zone_beds[0].id
265
                 }
272
                 }
266
               })
273
               })
283
               return false
290
               return false
284
             } else {
291
             } else {
285
               t.zone_beds = []
292
               t.zone_beds = []
286
-              t.device_numbers = response.data.data.number
287
-              for (let index = 0; index < t.device_numbers.length; index++) {
288
-                const device_number = t.device_numbers[index]
289
-                t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
293
+              t.temp_device_numbers = response.data.data.number
294
+              for (let index = 0; index < t.temp_device_numbers.length; index++) {
295
+                const device_number = t.temp_device_numbers[index]
296
+                t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
290
               }
297
               }
291
-              t.zone_beds = t.device_numbers
298
+              t.zone_beds = t.temp_device_numbers
292
               t.bed_id = t.zone_beds[0].id
299
               t.bed_id = t.zone_beds[0].id
293
 
300
 
294
 
301
 
307
             Toast.fail(response.data.msg)
314
             Toast.fail(response.data.msg)
308
             return false
315
             return false
309
           } else {
316
           } else {
310
-            this.device_numbers = response.data.data.number
311
-            for (let index = 0; index < this.device_numbers.length; index++) {
312
-              const device_number = this.device_numbers[index]
313
-              this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
317
+            this.temp_device_numbers = response.data.data.number
318
+            for (let index = 0; index < this.temp_device_numbers.length; index++) {
319
+              const device_number = this.temp_device_numbers[index]
320
+              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
314
             }
321
             }
315
-            this.zone_beds = this.device_numbers
322
+            this.zone_beds = this.temp_device_numbers
316
           }
323
           }
317
         })
324
         })
318
       },
325
       },

+ 7 - 2
src/pages/main/dialog/TreatmentDialog.vue View File

249
         this.dialysisSummary.summaryContent = values;
249
         this.dialysisSummary.summaryContent = values;
250
       } else {
250
       } else {
251
         if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
251
         if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
252
-          if (this.dialysisSummary.summaryContent.charAt(this.dialysisSummary.summaryContent.length - 1).indexOf("。") == -1) {
252
+          if (
253
+            this.dialysisSummary.summaryContent
254
+              .charAt(this.dialysisSummary.summaryContent.length - 1)
255
+              .indexOf("。") == -1
256
+          ) {
253
             this.dialysisSummary.summaryContent =
257
             this.dialysisSummary.summaryContent =
254
               this.dialysisSummary.summaryContent + "," + values;
258
               this.dialysisSummary.summaryContent + "," + values;
255
           } else {
259
           } else {
267
         this.dialysisSummary.propagandaAndEducationContent = values;
271
         this.dialysisSummary.propagandaAndEducationContent = values;
268
       } else {
272
       } else {
269
         if (this.dialysisSummary.propagandaAndEducationContent.indexOf(values) == -1) {
273
         if (this.dialysisSummary.propagandaAndEducationContent.indexOf(values) == -1) {
270
-          if (this.dialysisSummary.propagandaAndEducationContent.charAt(this.dialysisSummary.propagandaAndEducationContent.length - 1).indexOf("。") == -1) {
274
+          if (
275
+            this.dialysisSummary.propagandaAndEducationContent.charAt(this.dialysisSummary.propagandaAndEducationContent.length - 1).indexOf("。") == -1) {
271
             this.dialysisSummary.propagandaAndEducationContent =
276
             this.dialysisSummary.propagandaAndEducationContent =
272
               this.dialysisSummary.propagandaAndEducationContent + "," + values;
277
               this.dialysisSummary.propagandaAndEducationContent + "," + values;
273
           } else {
278
           } else {