Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

src/pages/ol/demo/index.vue

@@ -740,7 +740,7 @@ export default {
       this.$http({
         url: this.$http.adornUrl('/sysDictionary/getSubSystemDicList'),
         method: 'get',
-        params: { stationId: this.checkedData.sId }
+        params: {}
       }).then((data) => {
         if (data && data.code === 0) {
           this.systemList = data.list
@@ -751,7 +751,7 @@ export default {
       this.$http({
         url: this.$http.adornUrl('/sysDictionary/getResourceTypeDicList'),
         method: 'get',
-        params: { stationId: this.checkedData.sId }
+        params: {}
       }).then((data) => {
         if (data && data.code === 0) {
           this.iconNameListBottom = JSON.parse(JSON.stringify(data.list))
@@ -822,8 +822,13 @@ export default {
                 return
               }
               this.isFlag(this.treeData, this.checkedData.tierId)
-              if (this.treeData[0]) {
-                this.$refs.tree.setCurrentNode(this.treeData[0].children[0])
+              if (this.treeData) {
+                this.treeData.forEach((el) => {
+                  if (el.id === id) {
+                    this.$refs.tree.setCurrentNode(el.children[0])
+                  }
+                })
+
                 this.defaultExpandedKeys = [this.checkedData.tierId]
                 this.checkedData.tierName = this.mapList[0].name
                 this.stationMap = this.mapList[0]
@@ -942,7 +947,7 @@ export default {
       let name = node.name
       let id = node.id
       this.isFlag(this.treeData, id)
-      if (node.level !== 7) {
+      if (node.level !== 6) {
         this.regionMouse = {
           x: 0,
           y: 0,
@@ -957,7 +962,11 @@ export default {
 
       //每次选择节点都先清空资源位
       console.log('选中节点的层级', node)
-      if (node.level === 4) {
+      if (node.level === 3) {
+        //切换根节点
+        this.map = {}
+        this.initStation(id)
+      } else if (node.level === 4) {
         this.map.removeLayer(this.boxVectorLayer)
 
         this.boxBean = []
@@ -972,18 +981,18 @@ export default {
         this.changeImgControl(id)
         this.changeVectorLayer(this.list)
 
-        if (
-          this.checkedData.tierId &&
-          this.checkedData.tierName &&
-          (this.checkedData.tierName.indexOf('站台') != -1 ||
-            this.checkedData.tierName.indexOf('站厅') != -1)
-        ) {
-          if (this.checkedData.tierName.indexOf('站台') != -1) {
-            this.sendMessage(this.lineId, this.stationId, null, 2)
-          } else if (this.checkedData.tierName.indexOf('站厅') != -1) {
-            this.sendMessage(this.lineId, this.stationId, null, 3)
-          }
-        }
+        // if (
+        //   this.checkedData.tierId &&
+        //   this.checkedData.tierName &&
+        //   (this.checkedData.tierName.indexOf('站台') != -1 ||
+        //     this.checkedData.tierName.indexOf('站厅') != -1)
+        // ) {
+        //   if (this.checkedData.tierName.indexOf('站台') != -1) {
+        //     this.sendMessage(this.lineId, this.stationId, null, 2)
+        //   } else if (this.checkedData.tierName.indexOf('站厅') != -1) {
+        //     this.sendMessage(this.lineId, this.stationId, null, 3)
+        //   }
+        // }
       } else if (node.level === 5) {
         this.map.removeLayer(this.boxVectorLayer)
 
@@ -1052,7 +1061,7 @@ export default {
             this.mapClick(feature, that.list[i], false)
           }
         }
-        this.checkedData.resourceId == id
+        this.checkedData.resourceId = id
         this.checkedData.tierId = node.tierId
 
         this.activeChooseResourceBox(id)