Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

fujunwen 4 years ago
parent
commit
a1b9cac8d5
1 changed files with 8 additions and 8 deletions
  1. 8 8
      src/components/floorMap/index.vue

+ 8 - 8
src/components/floorMap/index.vue

@@ -320,7 +320,6 @@ export default {
           queryAssetAll({ data, postParams }).then((res) => {
             this.tabData.tableData = res.data.data;
             this.eqLoading = false;
-            console.log(this.tabData);
           });
         }
         if(isShopToWell){
@@ -452,7 +451,7 @@ export default {
                 shopsnumList.findIndex((name) => name == item.data.Name) != -1
               ) {
                 item.highLightFlag = true;
-                item.zOrder = 30;
+                // item.zOrder = 30;
                 // shopsnumItemList.push(item)
               }
             });
@@ -602,7 +601,7 @@ export default {
         this.shopsList.forEach(equip=>{
           equip.shopList.forEach(shop=>{
             if(item.data.Name == shop){
-              wellId = equip.wellnum
+              wellId = equip.wellnum;
             }
           })
         })
@@ -617,9 +616,9 @@ export default {
       })
      if(wellItem){
         setTimeout(()=>{
-          this.clearHightLight();
+        this.clearHightLight();
         item.highLightFlag = true;
-        item.zOrder = 30;
+        // item.zOrder = 30;
         wellItem.selected = true;
 
         const point =  this.view.mapFromScene(wellItem.x,wellItem.y)
@@ -629,6 +628,8 @@ export default {
         }];
         this.handleClickLegendItem(wellItem,event,true)
         })
+     }else{
+         this.clearHightLight();
      }
     },
     readGraph() {
@@ -675,7 +676,6 @@ export default {
             let scpzTable = [],
               arr = [];
             scpzTable = data.Data[0].Elements.Nodes || [];
-            console.log(scpzTable);
             if (scpzTable.length > 0) {
               scpzTable.forEach((e) => {
                 if (e.Properties.ItemExplain) {
@@ -820,7 +820,7 @@ export default {
           if (this.wellMap.hasOwnProperty(location)) {
             this.wellMap[location].forEach((item) => {
               item.highLightFlag = true;
-              item.zOrder = 30;
+              // item.zOrder = 30;
             });
           } else {
             let getParams = {
@@ -849,7 +849,7 @@ export default {
                     -1
                   ) {
                     item.highLightFlag = true;
-                    item.zOrder = 30;
+                    // item.zOrder = 30;
                     shopsnumItemList.push(item);
                   }
                 });