Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/DialysisArea.vue

@@ -294,51 +294,51 @@ export default {
 
     var storedata = this.$store.getters.scheduals
     var scheduals = storedata.scheduals
-    if (Object.keys(storedata).length > 0) {
-      var zoneMap = {}
-      var schedualMap = {}
-      for (let index = 0; index < scheduals.length; index++) {
-        const schedual = scheduals[index]
-        if (schedual.dialysis_order == null) {
-          continue
-        }
-        if (schedualMap[schedual.device_number.zone.name] == null) {
-          schedualMap[schedual.device_number.zone.name] = []
-        }
-        schedualMap[schedual.device_number.zone.name].push(schedual)
-        if (zoneMap[schedual.device_number.zone.name] == null) {
-          zoneMap[schedual.device_number.zone.name] =
-            schedual.device_number.zone
-        }
-      }
+    // if (Object.keys(storedata).length > 0) {
+    //   var zoneMap = {}
+    //   var schedualMap = {}
+    //   for (let index = 0; index < scheduals.length; index++) {
+    //     const schedual = scheduals[index]
+    //     if (schedual.dialysis_order == null) {
+    //       continue
+    //     }
+    //     if (schedualMap[schedual.device_number.zone.name] == null) {
+    //       schedualMap[schedual.device_number.zone.name] = []
+    //     }
+    //     schedualMap[schedual.device_number.zone.name].push(schedual)
+    //     if (zoneMap[schedual.device_number.zone.name] == null) {
+    //       zoneMap[schedual.device_number.zone.name] =
+    //         schedual.device_number.zone
+    //     }
+    //   }
 
-      var zones = []
-      zones.push({ value: 0, text: '全部分区' })
-      for (var zoneName in zoneMap) {
-        zones.push({ value: zoneMap[zoneName].id, text: zoneName })
-      }
+    //   var zones = []
+    //   zones.push({ value: 0, text: '全部分区' })
+    //   for (var zoneName in zoneMap) {
+    //     zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+    //   }
 
-      zones = zones.sort(function (a, b) {
-        return a.value > b.value
-      })
-      this.zones = zones
+    //   zones = zones.sort(function (a, b) {
+    //     return a.value > b.value
+    //   })
+    //   this.zones = zones
 
-      var dialysis_scheduals = []
-      for (let index = 0; index < zones.length; index++) {
-        const zone = zones[index]
-        var scheduals = schedualMap[zone.text]
-        if (scheduals == null) {
-          continue
-        }
-        dialysis_scheduals.push({
-          zone_name: zone.text,
-          scheduals: scheduals
-        })
-      }
-      this.dialysis_scheduals = dialysis_scheduals
-    } else {
+    //   var dialysis_scheduals = []
+    //   for (let index = 0; index < zones.length; index++) {
+    //     const zone = zones[index]
+    //     var scheduals = schedualMap[zone.text]
+    //     if (scheduals == null) {
+    //       continue
+    //     }
+    //     dialysis_scheduals.push({
+    //       zone_name: zone.text,
+    //       scheduals: scheduals
+    //     })
+    //   }
+    //   this.dialysis_scheduals = dialysis_scheduals
+    // } else {
       this.requestDialysisScheduals()
-    }
+    // }
   },
   mounted () {
     this.timer = window.setInterval(() => {