提交

src/views/newIncident.vue

@@ -1706,6 +1706,25 @@ export default {
       // };
       // localStorage.setItem("place", JSON.stringify(place));
     },
+    getBranchData() {
+      this.$http
+        .post("service/user/data/fetchDataList/branch", {
+          idx: 0,
+          sum: 1000,
+        })
+        .then(res => {
+          let data = res.data.list;
+          for (let i = 0; i < data.length; i++) {
+            this.placeSelectData.push({
+              text: data[i].hosName,
+              value: data[i].id,
+              children: []
+            });
+          }
+          console.log(this.placeSelectData,'校区');
+          this.getAreaData();
+        });
+    },
     getAreaData() {
       this.$http
         .post("service/user/data/fetchDataList/area", {
@@ -1717,18 +1736,22 @@ export default {
         })
         .then(res => {
           this.initAreaList = JSON.parse(JSON.stringify(res.data.list));
-          var data = res.data.list;
-          for (var i = 0; i < data.length; i++) {
-            this.placeSelectData.push({
-              text: data[i].area,
-              value: data[i].id,
-              children: []
-            });
+          let data = res.data.list;
+          for (let i = 0; i < data.length; i++) {
+            for (let j = 0; j < this.placeSelectData.length; j++) {
+              if (data[i].branch == this.placeSelectData[j].value) {
+                this.placeSelectData[j].children.push({
+                  text: data[i].area,
+                  value: data[i].id
+                });
+              }
+            }
           }
+          console.log(this.placeSelectData,'区域');
+          this.getPlaceData();
         });
     },
     getPlaceData() {
-      var that = this;
       this.$http
         .post("service/user/data/fetchDataList/place", {
           idx: 0,
@@ -1737,27 +1760,49 @@ export default {
             wechatAreaId: ""
           }
         })
-        .then(function(res) {
-          var data = res.data.list;
-          for (var i = 0; i < data.length; i++) {
-            for (var j = 0; j < that.placeSelectData.length; j++) {
-              if (data[i].area.id == that.placeSelectData[j].value) {
-                that.placeSelectData[j].children.push({
-                  text: data[i].place,
-                  value: data[i].id
-                });
-              }
+        .then((res) => {
+          let data = res.data.list;
+          // for (let i = 0; i < data.length; i++) {
+          //   for (let j = 0; j < this.placeSelectData.length; j++) {
+          //     if (data[i].area.id == this.placeSelectData[j].value) {
+          //       this.placeSelectData[j].children.push({
+          //         text: data[i].place,
+          //         value: data[i].id
+          //       });
+          //     }
+          //   }
+          // }
+          // const collectionArea = {};
+          // data.forEach((v) => {
+          //   if(collectionArea[v.area.id]){
+          //     collectionArea[v.area.id].push(v);
+          //   }else{
+          //     collectionArea[v.area.id] = [v];
+          //   }
+          // })
+          console.log(data, 'data');
+          this.placeSelectData = [];
+          const collectionBranch = {};
+          data.forEach((v) => {
+            if(collectionBranch[v.area.branch]){
+              collectionBranch[v.area.branch].push(v);
+            }else{
+              this.placeSelectData.push({text:v.area.branchName, value: v.area.branch, children: []})
+              collectionBranch[v.area.branch] = [v];
             }
-          }
+          })
 
-          that.placePicker = that.$createCascadePicker({
+          // this.placeSelectData.forEach(v => {
+          //   v.children = collectionBranch[v.value];
+          // })
+
+          console.log(collectionBranch,'collectionBranch集合');
+          console.log(this.placeSelectData,'地点');
+          this.placePicker = this.$createCascadePicker({
             title: "区域地点选择",
-            data: that.placeSelectData,
-            // selectedIndex: localStorage.getItem("place")
-            //   ? JSON.parse(localStorage.getItem("place")).index
-            //   : [0, 0],
+            data: this.placeSelectData,
             selectedIndex: [0, 0],
-            onSelect: that.selectPlaceHandler
+            onSelect: this.selectPlaceHandler
           });
         });
     },
@@ -1875,7 +1920,6 @@ export default {
     this.getsjnum();
     // 事件分类
     this.getIncidentcategory();
-    this.getAreaData();
     this.getPlaceData();
     // 获取故障地点
     // this.getFaultLocation();