|
@@ -17,7 +17,7 @@ import { FloorView } from '@/lib/FloorView'
|
|
import { FloorScene } from '@/lib/FloorScene'
|
|
import { FloorScene } from '@/lib/FloorScene'
|
|
import RoomBox from '@/views/room/index'
|
|
import RoomBox from '@/views/room/index'
|
|
import canvasFun from '@/components/floorMap/canvasFun'
|
|
import canvasFun from '@/components/floorMap/canvasFun'
|
|
-import { readGroup, queryStatis } from '@/api/public'
|
|
|
|
|
|
+import { readGroup, queryStatis, queryBrand } from '@/api/public'
|
|
import { STopologyParser } from '@/lib/parsers/STopologyParser'
|
|
import { STopologyParser } from '@/lib/parsers/STopologyParser'
|
|
import { mapGetters, mapActions } from 'vuex'
|
|
import { mapGetters, mapActions } from 'vuex'
|
|
import { SImageItem } from '@saga-web/graph/lib'
|
|
import { SImageItem } from '@saga-web/graph/lib'
|
|
@@ -61,14 +61,15 @@ export default {
|
|
},
|
|
},
|
|
components: { RoomBox, canvasFun },
|
|
components: { RoomBox, canvasFun },
|
|
computed: {
|
|
computed: {
|
|
- ...mapGetters(['plazaId', 'fmapID', 'haveFengMap'])
|
|
|
|
|
|
+ ...mapGetters(['plazaId', 'fmapID', 'haveFengMap', 'bunkObj'])
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
...mapActions(['getfmapID']),
|
|
...mapActions(['getfmapID']),
|
|
init(floorid) {
|
|
init(floorid) {
|
|
- this.loading = true
|
|
|
|
|
|
+ // this.loading = true
|
|
this.floorid = floorid
|
|
this.floorid = floorid
|
|
this.mapSize()
|
|
this.mapSize()
|
|
|
|
+ this.$refs.canvasFun.isShow = false
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
if (this.haveFengMap) {
|
|
if (this.haveFengMap) {
|
|
this.clearGraphy()
|
|
this.clearGraphy()
|
|
@@ -81,6 +82,16 @@ export default {
|
|
}
|
|
}
|
|
}, 100)
|
|
}, 100)
|
|
},
|
|
},
|
|
|
|
+ // 铺位
|
|
|
|
+ query(arr) {
|
|
|
|
+ let data = {
|
|
|
|
+ plazaId: '1001145'
|
|
|
|
+ }
|
|
|
|
+ // let postParams = arr
|
|
|
|
+ queryBrand({ data }).then(res => {
|
|
|
|
+ console.log(res)
|
|
|
|
+ })
|
|
|
|
+ },
|
|
parserData(floor) {
|
|
parserData(floor) {
|
|
if (floor == 'g80') {
|
|
if (floor == 'g80') {
|
|
// 屋顶
|
|
// 屋顶
|
|
@@ -106,6 +117,11 @@ export default {
|
|
this.fParser.spaceList.forEach(t => {
|
|
this.fParser.spaceList.forEach(t => {
|
|
// t.selectable = true;
|
|
// t.selectable = true;
|
|
this.scene.addItem(t)
|
|
this.scene.addItem(t)
|
|
|
|
+ if (t.data.Name && this.bunkObj[t.data.Name]) {
|
|
|
|
+ t.name = this.bunkObj[t.data.Name].detailtype
|
|
|
|
+ } else {
|
|
|
|
+ t.name = ''
|
|
|
|
+ }
|
|
})
|
|
})
|
|
this.fParser.wallList.forEach(t => this.scene.addItem(t))
|
|
this.fParser.wallList.forEach(t => this.scene.addItem(t))
|
|
this.fParser.virtualWallList.forEach(t => this.scene.addItem(t))
|
|
this.fParser.virtualWallList.forEach(t => this.scene.addItem(t))
|
|
@@ -223,6 +239,7 @@ export default {
|
|
let scale = this.view.scale
|
|
let scale = this.view.scale
|
|
this.view.scaleByPoint(val / scale, this.canvasWidth / 2, this.canvasHeight / 2)
|
|
this.view.scaleByPoint(val / scale, this.canvasWidth / 2, this.canvasHeight / 2)
|
|
},
|
|
},
|
|
|
|
+ // 小眼睛控制显示铺位名称
|
|
showText(val) {
|
|
showText(val) {
|
|
// this.topologyParser.zoneLegendList.forEach(t => {
|
|
// this.topologyParser.zoneLegendList.forEach(t => {
|
|
// t.showText = val
|
|
// t.showText = val
|
|
@@ -302,6 +319,7 @@ export default {
|
|
mounted() {
|
|
mounted() {
|
|
this.mapSize()
|
|
this.mapSize()
|
|
this.getEvent()
|
|
this.getEvent()
|
|
|
|
+ console.log('bunkObjbunkObjbunkObj', this.bunkObj)
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
this.urlMsg = {
|
|
this.urlMsg = {
|