Browse Source

修改bug

张保健 5 years ago
parent
commit
94bbc20a51

+ 1 - 1
src/pages/main/DialysisArea.vue View File

346
   mounted() {
346
   mounted() {
347
     this.timer = window.setInterval(() => {
347
     this.timer = window.setInterval(() => {
348
       setTimeout(this.requestDialysisScheduals(), 0);
348
       setTimeout(this.requestDialysisScheduals(), 0);
349
-    }, 30000);
349
+    }, 12000);
350
   },
350
   },
351
   beforeDestroy() {
351
   beforeDestroy() {
352
     clearInterval(this.timer);
352
     clearInterval(this.timer);

+ 204 - 204
src/pages/main/WaitingArea.vue View File

101
 </template>
101
 </template>
102
 
102
 
103
 <script>
103
 <script>
104
-import PatientBox from "./PatientBox";
105
-import { getWaitingScheduals } from "@/api/dialysis";
106
-import { parseTime } from "@/utils";
107
-import { Popover } from "vux";
108
-import { Toast } from "vant";
104
+import PatientBox from './PatientBox'
105
+import { getWaitingScheduals } from '@/api/dialysis'
106
+import { parseTime } from '@/utils'
107
+import { Popover } from 'vux'
108
+import { Toast } from 'vant'
109
 
109
 
110
 import {
110
 import {
111
   getSelectedAreaDataConfigList,
111
   getSelectedAreaDataConfigList,
114
   setSelectedTimesDataConfigList,
114
   setSelectedTimesDataConfigList,
115
   setWaitTypeSelectedConfig,
115
   setWaitTypeSelectedConfig,
116
   getWaitTypeSelectedConfig
116
   getWaitTypeSelectedConfig
117
-} from "@/utils/data_config";
117
+} from '@/utils/data_config'
118
 
118
 
119
 export default {
119
 export default {
120
-  name: "WaitingArea",
120
+  name: 'WaitingArea',
121
   components: {
121
   components: {
122
     PatientBox,
122
     PatientBox,
123
     Popover
123
     Popover
124
   },
124
   },
125
-  inject: ["reload"],
126
-  data() {
125
+  inject: ['reload'],
126
+  data () {
127
     return {
127
     return {
128
       loading: false,
128
       loading: false,
129
       menuList: [
129
       menuList: [
130
-        { value: "1", label: "全部", count: 0 },
131
-        { value: "3", label: "待开处方", count: 0 },
132
-        { value: "2", label: "待称重", count: 0 }
130
+        { value: '1', label: '全部', count: 0 },
131
+        { value: '3', label: '待开处方', count: 0 },
132
+        { value: '2', label: '待称重', count: 0 }
133
       ],
133
       ],
134
 
134
 
135
       select_index: 0,
135
       select_index: 0,
139
       networkStates: true,
139
       networkStates: true,
140
       scheduals: [],
140
       scheduals: [],
141
 
141
 
142
-      zone_options: [{ value: 0, text: "全部分区" }],
142
+      zone_options: [{ value: 0, text: '全部分区' }],
143
       zone_scheduals: [],
143
       zone_scheduals: [],
144
 
144
 
145
       time_options: [
145
       time_options: [
146
-        { value: 0, text: "全部班" },
147
-        { value: 1, text: "上午" },
148
-        { value: 2, text: "下午" },
149
-        { value: 3, text: "晚上" }
146
+        { value: 0, text: '全部班' },
147
+        { value: 1, text: '上午' },
148
+        { value: 2, text: '下午' },
149
+        { value: 3, text: '晚上' }
150
       ],
150
       ],
151
 
151
 
152
       zone_options_visible: false,
152
       zone_options_visible: false,
153
       time_options_visible: false
153
       time_options_visible: false
154
-    };
154
+    }
155
   },
155
   },
156
   props: {
156
   props: {
157
     search_keyword: {
157
     search_keyword: {
159
     }
159
     }
160
   },
160
   },
161
   computed: {
161
   computed: {
162
-    filtedScheduals: function() {
163
-      var search_keyword = this.search_keyword;
162
+    filtedScheduals: function () {
163
+      var search_keyword = this.search_keyword
164
       if (this.search_keyword.length > 0) {
164
       if (this.search_keyword.length > 0) {
165
-        var scheduals = [];
165
+        var scheduals = []
166
         for (let index = 0; index < this.scheduals.length; index++) {
166
         for (let index = 0; index < this.scheduals.length; index++) {
167
-          const schedual = this.scheduals[index];
167
+          const schedual = this.scheduals[index]
168
           if (
168
           if (
169
             schedual.patient.name.indexOf(search_keyword) != -1 ||
169
             schedual.patient.name.indexOf(search_keyword) != -1 ||
170
             schedual.patient.dialysis_no.indexOf(search_keyword) != -1
170
             schedual.patient.dialysis_no.indexOf(search_keyword) != -1
171
           ) {
171
           ) {
172
-            scheduals.push(schedual);
172
+            scheduals.push(schedual)
173
           }
173
           }
174
         }
174
         }
175
-        return this.processScheduals(scheduals);
175
+        return this.processScheduals(scheduals)
176
       }
176
       }
177
       //
177
       //
178
       if (this.zone_selected != 0) {
178
       if (this.zone_selected != 0) {
183
         //     return [zone_scheduals]
183
         //     return [zone_scheduals]
184
         //   }
184
         //   }
185
         // }
185
         // }
186
-        var zone_name = this.zone_options[this.zone_selected].text;
187
-        var schedules = [];
188
-        var filtedSchedules = [];
186
+        var zone_name = this.zone_options[this.zone_selected].text
187
+        var schedules = []
188
+        var filtedSchedules = []
189
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
189
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
190
-          const scheduleInfo = this.zone_scheduals[o_i];
191
-          var originSchedules = scheduleInfo.scheduals;
190
+          const scheduleInfo = this.zone_scheduals[o_i]
191
+          var originSchedules = scheduleInfo.scheduals
192
 
192
 
193
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
193
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
194
-            const schedule = originSchedules[s_i];
194
+            const schedule = originSchedules[s_i]
195
             if (this.zone_selected == 0) {
195
             if (this.zone_selected == 0) {
196
               if (
196
               if (
197
                 this.time_selected == 0 ||
197
                 this.time_selected == 0 ||
198
                 schedule.schedule_type == this.time_selected
198
                 schedule.schedule_type == this.time_selected
199
               ) {
199
               ) {
200
-                filtedSchedules.push(schedule);
200
+                filtedSchedules.push(schedule)
201
               }
201
               }
202
             } else {
202
             } else {
203
               if (
203
               if (
208
                   this.time_selected == 0 ||
208
                   this.time_selected == 0 ||
209
                   schedule.schedule_type == this.time_selected
209
                   schedule.schedule_type == this.time_selected
210
                 ) {
210
                 ) {
211
-                  filtedSchedules.push(schedule);
211
+                  filtedSchedules.push(schedule)
212
                 }
212
                 }
213
               }
213
               }
214
             }
214
             }
220
           //   });
220
           //   });
221
           // }
221
           // }
222
         }
222
         }
223
-        console.log(filtedSchedules);
224
-        return this.processScheduals(filtedSchedules);
223
+        console.log(filtedSchedules)
224
+        return this.processScheduals(filtedSchedules)
225
       }
225
       }
226
 
226
 
227
       if (this.time_selected != 0) {
227
       if (this.time_selected != 0) {
228
-        var zone_name = this.zone_options[this.zone_selected].text;
229
-        var schedules = [];
230
-        var filtedSchedules = [];
228
+        var zone_name = this.zone_options[this.zone_selected].text
229
+        var schedules = []
230
+        var filtedSchedules = []
231
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
231
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
232
-          const scheduleInfo = this.zone_scheduals[o_i];
233
-          var originSchedules = scheduleInfo.scheduals;
232
+          const scheduleInfo = this.zone_scheduals[o_i]
233
+          var originSchedules = scheduleInfo.scheduals
234
 
234
 
235
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
235
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
236
-            const schedule = originSchedules[s_i];
236
+            const schedule = originSchedules[s_i]
237
             if (this.zone_selected == 0) {
237
             if (this.zone_selected == 0) {
238
               if (
238
               if (
239
                 this.time_selected == 0 ||
239
                 this.time_selected == 0 ||
240
                 schedule.schedule_type == this.time_selected
240
                 schedule.schedule_type == this.time_selected
241
               ) {
241
               ) {
242
-                filtedSchedules.push(schedule);
242
+                filtedSchedules.push(schedule)
243
               }
243
               }
244
             } else {
244
             } else {
245
               if (
245
               if (
250
                   this.time_selected == 0 ||
250
                   this.time_selected == 0 ||
251
                   schedule.schedule_type == this.time_selected
251
                   schedule.schedule_type == this.time_selected
252
                 ) {
252
                 ) {
253
-                  filtedSchedules.push(schedule);
253
+                  filtedSchedules.push(schedule)
254
                 }
254
                 }
255
               }
255
               }
256
             }
256
             }
262
           //   });
262
           //   });
263
           // }
263
           // }
264
         }
264
         }
265
-        console.log(filtedSchedules);
266
-        return this.processScheduals(filtedSchedules);
265
+        console.log(filtedSchedules)
266
+        return this.processScheduals(filtedSchedules)
267
       }
267
       }
268
 
268
 
269
-      var zone_selected = this.zone_selected;
270
-      var timetype_selected = this.time_selected;
271
-      var assessment_before_dislysis_count = 0;
272
-      var prescription_count = 0;
269
+      var zone_selected = this.zone_selected
270
+      var timetype_selected = this.time_selected
271
+      var assessment_before_dislysis_count = 0
272
+      var prescription_count = 0
273
       if (zone_selected != 0 || timetype_selected != 0) {
273
       if (zone_selected != 0 || timetype_selected != 0) {
274
         var zone_name =
274
         var zone_name =
275
-          zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
276
-        var schedules = [];
277
-        var filtedSchedules = [];
275
+          zone_selected == 0 ? '' : this.zone_options[zone_selected].text
276
+        var schedules = []
277
+        var filtedSchedules = []
278
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
278
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
279
-          const scheduleInfo = this.zone_scheduals[o_i];
280
-          var originSchedules = scheduleInfo.scheduals;
279
+          const scheduleInfo = this.zone_scheduals[o_i]
280
+          var originSchedules = scheduleInfo.scheduals
281
 
281
 
282
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
282
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
283
-            const schedule = originSchedules[s_i];
283
+            const schedule = originSchedules[s_i]
284
             if (
284
             if (
285
               zone_name.length == 0 ||
285
               zone_name.length == 0 ||
286
               (zone_name.length > 0 &&
286
               (zone_name.length > 0 &&
290
                 timetype_selected == 0 ||
290
                 timetype_selected == 0 ||
291
                 schedule.schedule_type == timetype_selected
291
                 schedule.schedule_type == timetype_selected
292
               ) {
292
               ) {
293
-                filtedSchedules.push(schedule);
293
+                filtedSchedules.push(schedule)
294
               }
294
               }
295
             }
295
             }
296
           }
296
           }
302
           // }
302
           // }
303
         }
303
         }
304
 
304
 
305
-        console.log(filtedSchedules);
306
-        return this.processScheduals(filtedSchedules);
305
+        console.log(filtedSchedules)
306
+        return this.processScheduals(filtedSchedules)
307
 
307
 
308
         if (this.select_index == 2) {
308
         if (this.select_index == 2) {
309
-          var scheduals = [];
309
+          var scheduals = []
310
           for (let index = 0; index < this.scheduals.length; index++) {
310
           for (let index = 0; index < this.scheduals.length; index++) {
311
-            const schedual = this.scheduals[index];
311
+            const schedual = this.scheduals[index]
312
             if (
312
             if (
313
               schedual.assessment_before_dislysis == null ||
313
               schedual.assessment_before_dislysis == null ||
314
               schedual.assessment_before_dislysis.weight_before == 0
314
               schedual.assessment_before_dislysis.weight_before == 0
317
                 this.cur_zone_selected > 0 &&
317
                 this.cur_zone_selected > 0 &&
318
                 schedual.device_number.zone.id != this.cur_zone_selected
318
                 schedual.device_number.zone.id != this.cur_zone_selected
319
               ) {
319
               ) {
320
-                continue;
320
+                continue
321
               }
321
               }
322
               if (
322
               if (
323
                 timetype_selected > 0 &&
323
                 timetype_selected > 0 &&
324
                 schedual.schedule_type != timetype_selected
324
                 schedual.schedule_type != timetype_selected
325
               ) {
325
               ) {
326
-                continue;
326
+                continue
327
               }
327
               }
328
-              scheduals.push(schedual);
328
+              scheduals.push(schedual)
329
             }
329
             }
330
           }
330
           }
331
-          return this.processScheduals(scheduals);
331
+          return this.processScheduals(scheduals)
332
           // return scheduals;
332
           // return scheduals;
333
         } else if (this.select_index == 1) {
333
         } else if (this.select_index == 1) {
334
-          var scheduals = [];
334
+          var scheduals = []
335
           for (let index = 0; index < this.scheduals.length; index++) {
335
           for (let index = 0; index < this.scheduals.length; index++) {
336
-            const schedual = this.scheduals[index];
336
+            const schedual = this.scheduals[index]
337
             if (
337
             if (
338
               schedual.prescription == null ||
338
               schedual.prescription == null ||
339
               schedual.prescription.creater == 0
339
               schedual.prescription.creater == 0
342
                 this.cur_zone_selected > 0 &&
342
                 this.cur_zone_selected > 0 &&
343
                 schedual.device_number.zone.id != this.cur_zone_selected
343
                 schedual.device_number.zone.id != this.cur_zone_selected
344
               ) {
344
               ) {
345
-                continue;
345
+                continue
346
               }
346
               }
347
               if (
347
               if (
348
                 timetype_selected > 0 &&
348
                 timetype_selected > 0 &&
349
                 schedual.schedule_type != timetype_selected
349
                 schedual.schedule_type != timetype_selected
350
               ) {
350
               ) {
351
-                continue;
351
+                continue
352
               }
352
               }
353
-              scheduals.push(schedual);
353
+              scheduals.push(schedual)
354
             }
354
             }
355
           }
355
           }
356
           // return scheduals;
356
           // return scheduals;
357
-          return this.processScheduals(scheduals);
357
+          return this.processScheduals(scheduals)
358
         } else {
358
         } else {
359
           // return this.zone_scheduals;
359
           // return this.zone_scheduals;
360
-          var scheduals = [];
360
+          var scheduals = []
361
           for (let index = 0; index < this.scheduals.length; index++) {
361
           for (let index = 0; index < this.scheduals.length; index++) {
362
-            const schedual = this.scheduals[index];
362
+            const schedual = this.scheduals[index]
363
             if (schedual.dialysis_order == null) {
363
             if (schedual.dialysis_order == null) {
364
               if (
364
               if (
365
                 this.cur_zone_selected > 0 &&
365
                 this.cur_zone_selected > 0 &&
366
                 schedual.device_number.zone.id != this.cur_zone_selected
366
                 schedual.device_number.zone.id != this.cur_zone_selected
367
               ) {
367
               ) {
368
-                continue;
368
+                continue
369
               }
369
               }
370
               if (
370
               if (
371
                 timetype_selected > 0 &&
371
                 timetype_selected > 0 &&
372
                 schedual.schedule_type != timetype_selected
372
                 schedual.schedule_type != timetype_selected
373
               ) {
373
               ) {
374
-                continue;
374
+                continue
375
               }
375
               }
376
-              scheduals.push(schedual);
376
+              scheduals.push(schedual)
377
             }
377
             }
378
           }
378
           }
379
           // return scheduals;
379
           // return scheduals;
380
-          return this.processScheduals(scheduals);
380
+          return this.processScheduals(scheduals)
381
         }
381
         }
382
       }
382
       }
383
 
383
 
384
       if (this.select_index == 2) {
384
       if (this.select_index == 2) {
385
-        var scheduals = [];
385
+        var scheduals = []
386
         for (let index = 0; index < this.scheduals.length; index++) {
386
         for (let index = 0; index < this.scheduals.length; index++) {
387
-          const schedual = this.scheduals[index];
387
+          const schedual = this.scheduals[index]
388
           if (
388
           if (
389
             schedual.assessment_before_dislysis == null ||
389
             schedual.assessment_before_dislysis == null ||
390
             schedual.assessment_before_dislysis.weight_before == 0
390
             schedual.assessment_before_dislysis.weight_before == 0
391
           ) {
391
           ) {
392
-            scheduals.push(schedual);
392
+            scheduals.push(schedual)
393
           }
393
           }
394
         }
394
         }
395
-        return this.processScheduals(scheduals);
395
+        return this.processScheduals(scheduals)
396
         // return scheduals;
396
         // return scheduals;
397
       } else if (this.select_index == 1) {
397
       } else if (this.select_index == 1) {
398
-        var scheduals = [];
398
+        var scheduals = []
399
         for (let index = 0; index < this.scheduals.length; index++) {
399
         for (let index = 0; index < this.scheduals.length; index++) {
400
-          const schedual = this.scheduals[index];
400
+          const schedual = this.scheduals[index]
401
           if (
401
           if (
402
             schedual.prescription == null ||
402
             schedual.prescription == null ||
403
             schedual.prescription.creater == 0
403
             schedual.prescription.creater == 0
404
           ) {
404
           ) {
405
-            scheduals.push(schedual);
405
+            scheduals.push(schedual)
406
           }
406
           }
407
         }
407
         }
408
         // return scheduals;
408
         // return scheduals;
409
-        return this.processScheduals(scheduals);
409
+        return this.processScheduals(scheduals)
410
       } else {
410
       } else {
411
         // return this.zone_scheduals;
411
         // return this.zone_scheduals;
412
-        var scheduals = [];
412
+        var scheduals = []
413
         for (let index = 0; index < this.scheduals.length; index++) {
413
         for (let index = 0; index < this.scheduals.length; index++) {
414
-          const schedual = this.scheduals[index];
414
+          const schedual = this.scheduals[index]
415
           if (schedual.dialysis_order == null) {
415
           if (schedual.dialysis_order == null) {
416
-            scheduals.push(schedual);
416
+            scheduals.push(schedual)
417
           }
417
           }
418
         }
418
         }
419
         // return scheduals;
419
         // return scheduals;
420
-        return this.processScheduals(scheduals);
420
+        return this.processScheduals(scheduals)
421
       }
421
       }
422
     }
422
     }
423
   },
423
   },
424
-  created() {
425
-    var area = getSelectedAreaDataConfigList();
426
-    var time = getSelectedTimesDataConfigList();
427
-    var type = getWaitTypeSelectedConfig();
424
+  created () {
425
+    var area = getSelectedAreaDataConfigList()
426
+    var time = getSelectedTimesDataConfigList()
427
+    var type = getWaitTypeSelectedConfig()
428
 
428
 
429
     if (area != null) {
429
     if (area != null) {
430
-      this.zone_options_visible = false;
431
-      this.zone_selected = parseInt(area);
432
-      this.select_index = -1;
430
+      this.zone_options_visible = false
431
+      this.zone_selected = parseInt(area)
432
+      this.select_index = -1
433
     }
433
     }
434
 
434
 
435
     if (time != null) {
435
     if (time != null) {
436
-      this.time_selected = parseInt(time);
437
-      this.select_index = -1;
438
-      this.time_options_visible = false;
436
+      this.time_selected = parseInt(time)
437
+      this.select_index = -1
438
+      this.time_options_visible = false
439
     }
439
     }
440
     if (type != null) {
440
     if (type != null) {
441
-      this.select_index = parseInt(type);
441
+      this.select_index = parseInt(type)
442
     }
442
     }
443
-
444
-    var storedata = this.$store.getters.waitscheduals;
445
-    var scheduals = storedata.waitscheduals;
443
+    
444
+    var storedata = this.$store.getters.waitscheduals
445
+    var scheduals = storedata.waitscheduals
446
     if (Object.keys(storedata).length > 0) {
446
     if (Object.keys(storedata).length > 0) {
447
-      var totalCount = scheduals.length;
448
-      var prescription_count = 0;
449
-      var assessment_before_dislysis_count = 0;
447
+      var totalCount = scheduals.length
448
+      var prescription_count = 0
449
+      var assessment_before_dislysis_count = 0
450
       for (let index = 0; index < scheduals.length; index++) {
450
       for (let index = 0; index < scheduals.length; index++) {
451
-        const schedual = scheduals[index];
451
+        const schedual = scheduals[index]
452
         if (schedual.assessment_before_dislysis == null) {
452
         if (schedual.assessment_before_dislysis == null) {
453
-          assessment_before_dislysis_count += 1;
453
+          assessment_before_dislysis_count += 1
454
         }
454
         }
455
         if (schedual.prescription == null) {
455
         if (schedual.prescription == null) {
456
-          prescription_count += 1;
456
+          prescription_count += 1
457
         }
457
         }
458
       }
458
       }
459
-      this.menuList[2].count = assessment_before_dislysis_count;
460
-      this.menuList[1].count = prescription_count;
461
-      this.scheduals = scheduals;
459
+      this.menuList[2].count = assessment_before_dislysis_count
460
+      this.menuList[1].count = prescription_count
461
+      this.scheduals = scheduals
462
 
462
 
463
-      this.zone_options = this.makeZones(scheduals);
464
-      this.zone_scheduals = this.processScheduals(scheduals);
463
+      this.zone_options = this.makeZones(scheduals)
464
+      this.zone_scheduals = this.processScheduals(scheduals)
465
     } else {
465
     } else {
466
-      this.requestScheduals();
466
+      this.requestScheduals()
467
     }
467
     }
468
   },
468
   },
469
-  mounted() {
469
+  mounted () {
470
     this.timer = window.setInterval(() => {
470
     this.timer = window.setInterval(() => {
471
-      setTimeout(this.requestScheduals(), 0);
472
-    }, 30000);
471
+      setTimeout(this.requestScheduals(), 0)
472
+    }, 12000)
473
   },
473
   },
474
-  beforeDestroy() {
475
-    clearInterval(this.timer);
476
-    this.timer = null;
477
-    this.$once("hook:beforeDestroy", () => {
478
-      clearInterval(this.timer);
479
-    });
474
+  beforeDestroy () {
475
+    clearInterval(this.timer)
476
+    this.timer = null
477
+    this.$once('hook:beforeDestroy', () => {
478
+      clearInterval(this.timer)
479
+    })
480
   },
480
   },
481
   methods: {
481
   methods: {
482
-    processScheduals: function(scheduals) {
483
-      var zoneMap = {};
484
-      var schedualMap = {};
485
-      var assessment_before_dislysis_count = 0;
486
-      var prescription_count = 0;
482
+    processScheduals: function (scheduals) {
483
+      var zoneMap = {}
484
+      var schedualMap = {}
485
+      var assessment_before_dislysis_count = 0
486
+      var prescription_count = 0
487
       for (let index = 0; index < scheduals.length; index++) {
487
       for (let index = 0; index < scheduals.length; index++) {
488
-        const schedual = scheduals[index];
488
+        const schedual = scheduals[index]
489
         if (schedualMap[schedual.device_number.zone.id] == null) {
489
         if (schedualMap[schedual.device_number.zone.id] == null) {
490
-          schedualMap[schedual.device_number.zone.id] = [];
490
+          schedualMap[schedual.device_number.zone.id] = []
491
         }
491
         }
492
         if (this.select_index == 1) {
492
         if (this.select_index == 1) {
493
           if (
493
           if (
494
             schedual.prescription == null ||
494
             schedual.prescription == null ||
495
             schedual.prescription.creater == 0
495
             schedual.prescription.creater == 0
496
           ) {
496
           ) {
497
-            schedualMap[schedual.device_number.zone.id].push(schedual);
498
-            prescription_count++;
497
+            schedualMap[schedual.device_number.zone.id].push(schedual)
498
+            prescription_count++
499
           }
499
           }
500
         } else if (this.select_index == 2) {
500
         } else if (this.select_index == 2) {
501
           if (
501
           if (
502
             schedual.assessment_before_dislysis == null ||
502
             schedual.assessment_before_dislysis == null ||
503
             schedual.assessment_before_dislysis.weight_before == 0
503
             schedual.assessment_before_dislysis.weight_before == 0
504
           ) {
504
           ) {
505
-            schedualMap[schedual.device_number.zone.id].push(schedual);
506
-            assessment_before_dislysis_count++;
505
+            schedualMap[schedual.device_number.zone.id].push(schedual)
506
+            assessment_before_dislysis_count++
507
           }
507
           }
508
         } else {
508
         } else {
509
           if (schedual.dialysis_order == null) {
509
           if (schedual.dialysis_order == null) {
510
-            schedualMap[schedual.device_number.zone.id].push(schedual);
510
+            schedualMap[schedual.device_number.zone.id].push(schedual)
511
           }
511
           }
512
         }
512
         }
513
         if (zoneMap[schedual.device_number.zone.id] == null) {
513
         if (zoneMap[schedual.device_number.zone.id] == null) {
514
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
514
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
515
         }
515
         }
516
       }
516
       }
517
 
517
 
518
       if (this.select_index == 1) {
518
       if (this.select_index == 1) {
519
-        this.menuList[1].count = prescription_count;
519
+        this.menuList[1].count = prescription_count
520
       }
520
       }
521
       if (this.select_index == 2) {
521
       if (this.select_index == 2) {
522
-        this.menuList[2].count = assessment_before_dislysis_count;
522
+        this.menuList[2].count = assessment_before_dislysis_count
523
       }
523
       }
524
 
524
 
525
-      var zones = [];
525
+      var zones = []
526
       // zones.push({ value: 0, text: "全部分区" })
526
       // zones.push({ value: 0, text: "全部分区" })
527
       for (var zoneId in zoneMap) {
527
       for (var zoneId in zoneMap) {
528
-        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
528
+        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name })
529
       }
529
       }
530
 
530
 
531
-      zones = zones.sort(function(a, b) {
532
-        return a.id > b.id;
533
-      });
531
+      zones = zones.sort(function (a, b) {
532
+        return a.id > b.id
533
+      })
534
       // this.zones = zones
534
       // this.zones = zones
535
 
535
 
536
-      var zone_scheduals = [];
536
+      var zone_scheduals = []
537
       for (let index = 0; index < zones.length; index++) {
537
       for (let index = 0; index < zones.length; index++) {
538
-        const zone = zones[index];
539
-        var scheduals = schedualMap[zone.id];
538
+        const zone = zones[index]
539
+        var scheduals = schedualMap[zone.id]
540
         zone_scheduals.push({
540
         zone_scheduals.push({
541
           zone_id: zone.id,
541
           zone_id: zone.id,
542
           zone_name: zone.name,
542
           zone_name: zone.name,
543
 
543
 
544
           scheduals: scheduals
544
           scheduals: scheduals
545
-        });
545
+        })
546
       }
546
       }
547
       // this.zone_scheduals = zone_scheduals;
547
       // this.zone_scheduals = zone_scheduals;
548
-      return zone_scheduals;
548
+      return zone_scheduals
549
     },
549
     },
550
-    reloads: function() {
551
-      this.reload();
550
+    reloads: function () {
551
+      this.reload()
552
     },
552
     },
553
-    handleAllChange: function(tabIndex) {
554
-      this.select_index = tabIndex;
555
-      this.zone_selected = 0;
556
-      this.time_selected = 0;
553
+    handleAllChange: function (tabIndex) {
554
+      this.select_index = tabIndex
555
+      this.zone_selected = 0
556
+      this.time_selected = 0
557
     },
557
     },
558
-    menuTabClick: function(tabIndex) {
559
-      this.select_index = tabIndex;
560
-      this.zone_selected = 0;
561
-      this.time_selected = 0;
562
-      setSelectedAreaDataConfigList(this.zone_selected);
563
-      setSelectedTimesDataConfigList(this.time_selected);
564
-      setWaitTypeSelectedConfig(tabIndex);
558
+    menuTabClick: function (tabIndex) {
559
+      this.select_index = tabIndex
560
+      this.zone_selected = 0
561
+      this.time_selected = 0
562
+      setSelectedAreaDataConfigList(this.zone_selected)
563
+      setSelectedTimesDataConfigList(this.time_selected)
564
+      setWaitTypeSelectedConfig(tabIndex)
565
     },
565
     },
566
-    handleZoneChange: function(index, zone) {
567
-      this.zone_options_visible = false;
568
-      this.zone_selected = index;
569
-      this.cur_zone_selected = zone.value;
566
+    handleZoneChange: function (index, zone) {
567
+      this.zone_options_visible = false
568
+      this.zone_selected = index
569
+      this.cur_zone_selected = zone.value
570
       // this.select_index = -1;
570
       // this.select_index = -1;
571
-      setSelectedAreaDataConfigList(index.toString());
571
+      setSelectedAreaDataConfigList(index.toString())
572
     },
572
     },
573
-    handleTimeChange: function(index) {
574
-      this.time_selected = index;
573
+    handleTimeChange: function (index) {
574
+      this.time_selected = index
575
       // this.select_index = -1;
575
       // this.select_index = -1;
576
-      this.time_options_visible = false;
577
-      setSelectedTimesDataConfigList(index.toString());
576
+      this.time_options_visible = false
577
+      setSelectedTimesDataConfigList(index.toString())
578
     },
578
     },
579
 
579
 
580
-    requestScheduals() {
580
+    requestScheduals () {
581
       // this.loading = true;
581
       // this.loading = true;
582
-      var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
582
+      var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
583
       getWaitingScheduals({ date: date })
583
       getWaitingScheduals({ date: date })
584
         .then(rs => {
584
         .then(rs => {
585
-          var resp = rs.data;
585
+          var resp = rs.data
586
           if (resp.state == 1) {
586
           if (resp.state == 1) {
587
-            this.loading = false;
587
+            this.loading = false
588
 
588
 
589
-            var scheduals = resp.data.scheduals;
590
-            this.$store.dispatch("SetWaitScheduals", {
589
+            var scheduals = resp.data.scheduals
590
+            this.$store.dispatch('SetWaitScheduals', {
591
               waitscheduals: scheduals
591
               waitscheduals: scheduals
592
-            });
593
-            var totalCount = scheduals.length;
594
-            var prescription_count = 0;
595
-            var assessment_before_dislysis_count = 0;
592
+            })
593
+            var totalCount = scheduals.length
594
+            var prescription_count = 0
595
+            var assessment_before_dislysis_count = 0
596
             for (let index = 0; index < scheduals.length; index++) {
596
             for (let index = 0; index < scheduals.length; index++) {
597
-              const schedual = scheduals[index];
597
+              const schedual = scheduals[index]
598
               if (schedual.assessment_before_dislysis == null) {
598
               if (schedual.assessment_before_dislysis == null) {
599
-                assessment_before_dislysis_count += 1;
599
+                assessment_before_dislysis_count += 1
600
               }
600
               }
601
               if (schedual.prescription == null) {
601
               if (schedual.prescription == null) {
602
-                prescription_count += 1;
602
+                prescription_count += 1
603
               }
603
               }
604
             }
604
             }
605
-            this.menuList[2].count = assessment_before_dislysis_count;
606
-            this.menuList[1].count = prescription_count;
607
-            this.scheduals = scheduals;
605
+            this.menuList[2].count = assessment_before_dislysis_count
606
+            this.menuList[1].count = prescription_count
607
+            this.scheduals = scheduals
608
 
608
 
609
-            this.zone_options = this.makeZones(scheduals);
610
-            this.zone_scheduals = this.processScheduals(scheduals);
609
+            this.zone_options = this.makeZones(scheduals)
610
+            this.zone_scheduals = this.processScheduals(scheduals)
611
           } else {
611
           } else {
612
-            this.loading = false;
612
+            this.loading = false
613
 
613
 
614
             this.$toast({
614
             this.$toast({
615
               message: resp.msg
615
               message: resp.msg
616
-            });
616
+            })
617
           }
617
           }
618
         })
618
         })
619
         .catch(error => {
619
         .catch(error => {
620
-          this.loading = false;
620
+          this.loading = false
621
 
621
 
622
-          //超时之后在这里捕抓错误信息.
622
+          // 超时之后在这里捕抓错误信息.
623
           if (error.response) {
623
           if (error.response) {
624
-            this.networkStates = false;
624
+            this.networkStates = false
625
           } else if (error.request) {
625
           } else if (error.request) {
626
-            this.networkStates = false;
626
+            this.networkStates = false
627
             // if(error.request.readyState == 4 && error.request.status == 0){
627
             // if(error.request.readyState == 4 && error.request.status == 0){
628
             //   //我在这里重新请求
628
             //   //我在这里重新请求
629
             //   this.networkStates = false
629
             //   this.networkStates = false
630
             // }
630
             // }
631
           } else {
631
           } else {
632
-            this.networkStates = false;
632
+            this.networkStates = false
633
           }
633
           }
634
-        });
634
+        })
635
     },
635
     },
636
-    makeZones: function(scheduals) {
637
-      var zoneMap = {};
636
+    makeZones: function (scheduals) {
637
+      var zoneMap = {}
638
       for (let index = 0; index < scheduals.length; index++) {
638
       for (let index = 0; index < scheduals.length; index++) {
639
-        const schedual = scheduals[index];
639
+        const schedual = scheduals[index]
640
         if (zoneMap[schedual.device_number.zone.id] == null) {
640
         if (zoneMap[schedual.device_number.zone.id] == null) {
641
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
641
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
642
         }
642
         }
643
       }
643
       }
644
 
644
 
645
-      var zones = [];
646
-      zones.push({ value: 0, text: "全部分区" });
645
+      var zones = []
646
+      zones.push({ value: 0, text: '全部分区' })
647
 
647
 
648
       for (var zoneId in zoneMap) {
648
       for (var zoneId in zoneMap) {
649
-        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name });
649
+        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name })
650
       }
650
       }
651
 
651
 
652
       // zones = zones.sort(function (a, b) {
652
       // zones = zones.sort(function (a, b) {
653
       //   return a.value > b.value
653
       //   return a.value > b.value
654
       // })
654
       // })
655
-      return zones;
655
+      return zones
656
     }
656
     }
657
   }
657
   }
658
-};
658
+}
659
 </script>
659
 </script>
660
 
660
 
661
 <style style="stylesheet/scss" lang="scss" scoped>
661
 <style style="stylesheet/scss" lang="scss" scoped>

+ 1 - 1
src/pages/main/dialog/MonitDialog.vue View File

567
         this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate
567
         this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate
568
           ? resp.monitor.ultrafiltration_rate
568
           ? resp.monitor.ultrafiltration_rate
569
           : "";
569
           : "";
570
-        this.form.ultrafiltration_volume = "";
570
+        this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume?resp.monitor.ultrafiltration_volume:"";
571
         this.form.sodium_concentration = resp.monitor.sodium_concentration
571
         this.form.sodium_concentration = resp.monitor.sodium_concentration
572
           ? resp.monitor.sodium_concentration
572
           ? resp.monitor.sodium_concentration
573
           : "";
573
           : "";

+ 1 - 1
src/pages/main/dialog/PlaneDialog.vue View File

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

+ 1 - 1
src/pages/main/today/TodayTab.vue View File

1324
       // this.scrollToView('monitoring')
1324
       // this.scrollToView('monitoring')
1325
     },
1325
     },
1326
 
1326
 
1327
-    closeDialysisOff: function (assessment_after_dislysis) {
1327
+    closeDialysisOff: function (assessment_after_dislysis) {debugger
1328
       this.closeDialog(7)
1328
       this.closeDialog(7)
1329
       if (assessment_after_dislysis != undefined) {
1329
       if (assessment_after_dislysis != undefined) {
1330
         this.assessment_after_dislysis = assessment_after_dislysis
1330
         this.assessment_after_dislysis = assessment_after_dislysis