YaolongHan 4 years ago
parent
commit
fab8aec03d
1 changed files with 4 additions and 3 deletions
  1. 4 3
      src/components/floorMap/index.vue

+ 4 - 3
src/components/floorMap/index.vue

@@ -12,7 +12,7 @@
 </template>
 <script>
 import { SFengParser } from '@saga-web/feng-map'
-import { SFloorParser, ItemOrder, ItemColor } from '@saga-web/big'
+import { SFloorParser, ItemOrder } from '@saga-web/big'
 import { FloorView } from '@/lib/FloorView'
 import { FloorScene } from '@/lib/FloorScene'
 import RoomBox from '@/views/room/index'
@@ -22,7 +22,6 @@ import { queryShops } from '@/api/equipmentList.js'
 import { STopologyParser } from '@/lib/parsers/STopologyParser'
 import { mapGetters, mapActions } from 'vuex'
 import { SImageItem, SImageShowType } from '@saga-web/graph/lib'
-import { SColor } from '@saga-web/draw/lib'
 import bus from '@/utils/bus.js'
 
 // import { uuid } from "@/components/mapClass/until";
@@ -85,6 +84,8 @@ export default {
                 }else if(this.haveFengMap == 0){
                    this.view.scene = this.scene;
                    this.readGraph()
+                }else{
+                  this.loading = false
                 }
             }, 100)
         },
@@ -144,6 +145,7 @@ export default {
                     if (this.$refs.canvasFun) {
                         this.$refs.canvasFun.everyScale = this.view.scale
                     }
+                    this.loading = false;
                     return
                 } else {
                     if (
@@ -316,7 +318,6 @@ export default {
         },
         // 清除电井关联商铺的高亮状态
         clearHightLight() {
-            ItemColor.spaceHighColor = new SColor('#f2c511');
             for (let key in this.wellMap) {
                 this.wellMap[key].forEach(item => {
                     item.highLightFlag = false