Parcourir la source

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

yunxing il y a 4 ans
Parent
commit
ab1df831ba
2 fichiers modifiés avec 0 ajouts et 12 suppressions
  1. 0 7
      src/components/Legend/src/legend.vue
  2. 0 5
      src/views/equipment/fenbuPic.vue

+ 0 - 7
src/components/Legend/src/legend.vue

@@ -153,7 +153,6 @@ export default {
                 const hit = this.floors.find(i => i.gname == item.id)
                 return !hit
             })
-            console.log(this.floorSelectAble)
         },
         testClick(data) {},
         // 编辑备注
@@ -215,7 +214,6 @@ export default {
                         this.floorName = el.name
                     }
                 })
-                console.log(this.floorName)
             }
 
             let FloorID = this.floor ? this.floor : this.$cookie.get('floorMapId') || 'f1'
@@ -225,11 +223,9 @@ export default {
             let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
-            console.log(data)
             window.open(url, true)
         },
         isShow2() {
-            //console.log(this.isShow2)
             this.show2 = !this.show2
         },
         handleSwich(val) {
@@ -321,10 +317,7 @@ export default {
         }
     },
     mounted() {
-        console.log(this.floors)
-        console.log(this.floorSelect)
         if (this.floors.length > 0) {
-            
             this.formatFloor()
         }
     }

+ 0 - 5
src/views/equipment/fenbuPic.vue

@@ -49,11 +49,6 @@ export default {
         getFloorData() {
             let postParams = {
                 Distinct: true,
-<<<<<<< HEAD
-                Filters: `projectId =${this.$store.state.plazaId}; categoryId='XFBFYCFL';isPub=true`,
-=======
-                Filters: `projectId =${this.$store.state.plazaId};categoryId='XTYLT';isPub=true`,
->>>>>>> 4fc95b05ad81abc33c44ac2be3ffca29d9da58fe
                 PageNumber: 1,
                 PageSize: 500,
                 Projection: ['floorId']