guoxiaohuan 4 년 전
부모
커밋
92a09cb542
6개의 변경된 파일50개의 추가작업 그리고 17개의 파일을 삭제
  1. 4 3
      src/components/floorMap/canvasFun.vue
  2. 21 3
      src/components/floorMap/index.vue
  3. 1 0
      src/main.js
  4. 1 0
      src/main.ts
  5. 22 0
      src/store/index.js
  6. 1 11
      src/views/equipment/index.vue

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

@@ -15,10 +15,10 @@
             <div class='small-block' @click='showText'>
                 <i>
                     <el-tooltip v-if='isShow' effect='dark' content='隐藏店铺名称' placement='top'>
-                        <img src='../../assets/imgs/er.png' alt />
+                        <img src='../../assets/imgs/yl.png' alt />
                     </el-tooltip>
                     <el-tooltip v-else effect='dark' content='显示店铺名称' placement='top'>
-                        <img src='../../assets/imgs/yl.png' alt />
+                        <img src='../../assets/imgs/er.png' alt />
                     </el-tooltip>
                 </i>
             </div>
@@ -102,7 +102,8 @@ export default {
             this.isShow = !this.isShow
             this.$emit('showText', this.isShow)
         }
-    }
+    },
+    mounted() {}
 }
 </script>
 <style lang="less" scoped>

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

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

+ 1 - 0
src/main.js

@@ -44,6 +44,7 @@ router.beforeEach((to, from, next) => __awaiter(void 0, void 0, void 0, function
     if (!store.state.isrequestAuth) {
         yield store.dispatch('getUserInfo', username);
         yield store.dispatch('getFloors');
+        yield store.dispatch('getBrand');
     }
     next();
 }));

+ 1 - 0
src/main.ts

@@ -37,6 +37,7 @@ router.beforeEach(async (to, from, next) => {
     if (!store.state.isrequestAuth) {
         await store.dispatch('getUserInfo', username)
         await store.dispatch('getFloors')
+        await store.dispatch('getBrand')
     }
     next()
 })

+ 22 - 0
src/store/index.js

@@ -1,6 +1,8 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import { login, queryFloor, queryfmapID } from '@/api/login.js'
+import { queryBrand } from '@/api/public.js'
+
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
@@ -22,6 +24,7 @@ export default new Vuex.Store({
         scpzTable: [], //土建系统图例展示
         legendTable: [], //除土建系统图例展示
         remarksText: '', //备注
+        bunkObj: {}, // 铺位名称
     },
     getters: {
         floorsArr: (state) => state.floorsArr,
@@ -34,6 +37,7 @@ export default new Vuex.Store({
         scpzTable: (state) => state.scpzTable,
         legendTable: (state) => state.legendTable,
         remarksText: (state) => state.remarksText,
+        bunkObj: (state) => state.bunkObj,
     },
     mutations: {
         // 设置是否登陆校验
@@ -79,6 +83,9 @@ export default new Vuex.Store({
         SETREMARKSTEXT(state, data) {
             state.remarksText = data
         },
+        SETBUNKOBJ(state, data) {
+            state.bunkObj = data
+        },
     },
     actions: {
         // 获取项目列表、userId
@@ -109,6 +116,21 @@ export default new Vuex.Store({
                 context.commit('SETMAPID', `${context.state.plazaId}_${res.mapVersion}`)
             })
         },
+        async getBrand(context) {
+            let data = {
+                plazaId: context.state.plazaId,
+            }
+            await queryBrand({ data }).then((res) => {
+                let obj = {}
+                if (res.data.data) {
+                    let Data = res.data.data
+                    Data.forEach((i) => {
+                        obj[i.bunkdesc] = i
+                    })
+                }
+                context.commit('SETBUNKOBJ', obj)
+            })
+        },
     },
     modules: {},
 })

+ 1 - 11
src/views/equipment/index.vue

@@ -54,7 +54,7 @@ import floorMap from '@/components/floorMap/index.vue'
 import eqDialog from './eqDialog'
 import editList from '@/components/edit.vue'
 import { system } from '@/utils/plugins/components.js'
-import { queryPic, queryBrand } from '@/api/public.js'
+import { queryPic } from '@/api/public.js'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -82,15 +82,6 @@ export default {
     },
     components: { floorList, eqDialog, floorMap, editList },
     methods: {
-        query() {
-            let data = {
-                plazaId: '1000423'
-            }
-            // let postParams = []
-            queryBrand({ data }).then(res => {
-                console.log(res)
-            })
-        },
         // 查询tab页
         tabSyatem(item) {
             this.systemId = item.id
@@ -160,7 +151,6 @@ export default {
         this.everySystem = this.system[0].children
         this.init()
         this.$refs.floorMap.init(this.floorInfo.gname)
-        this.query()
     },
     computed: {
         ...mapGetters(['floorsArr', 'plazaId'])