Prechádzať zdrojové kódy

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

zhulizhen1111 4 rokov pred
rodič
commit
cc3d7e3c7e
2 zmenil súbory, kde vykonal 30 pridanie a 15 odobranie
  1. 28 14
      src/components/floorMap/index.vue
  2. 2 1
      src/store/index.js

+ 28 - 14
src/components/floorMap/index.vue

@@ -87,6 +87,7 @@ export default {
                 tableData: [],
                 pointData: []
             },
+            activeItem: null,
             showBtnWell: false
         }
     },
@@ -116,9 +117,11 @@ export default {
             this.tabData = {tableData: [], pointData: []};
             this.showBtnWell = false;
             this.visible = false;
+            this.activeItem = null;
             console.log(item)
             if (item.data.AttachObjectIds && item.data.AttachObjectIds.length) {
                 const e = events[0];
+                this.activeItem = item;
                 item.data.AttachObjectIds.forEach(v => {
                     if (v.type == "Image") {
                         this.tabData.tableData.push(v);
@@ -147,13 +150,21 @@ export default {
                             this.showBtnWell = true;
                         } else {
                             if (this.tabData.pointData.length == 1) { //不是电井并且只绑定了一个位置(跳详情)
-
+                                if (this.tabData.pointData[0].id)
+                                this.$refs.boxRoom.open({ name: item.name, type: this.type, location: this.tabData.pointData[0].id });
                             } else {
                                 this.visible = true;
                             }
                         }
-
                     } else if (this.tabData.tableData.length && this.tabData.pointData.length) { //既绑定了设备又绑定了位置
+                        if (
+                            item.data.GraphElementId == '100050' ||
+                            item.data.GraphElementId == '100055' ||
+                            item.data.GraphElementId == '100056' ||
+                            item.data.GraphElementId == '100057'
+                        ) { //判断是否为电井
+                            this.showBtnWell = true;
+                        }
                         this.visible = true;
                     }
                 })
@@ -166,7 +177,10 @@ export default {
         // 查看浮层设备详情
         handleClickEquipDetail(equip) {},
         // 查看浮层位置详情
-        handleClickPointDeatil(point) {},
+        handleClickPointDeatil(point) {
+            if (point.id && this.activeItem)
+            this.$refs.boxRoom.open({ name: this.activeItem.name, type: this.type, location: point.id });
+        },
         handleClickHightLight(pointData) {
             this.clearHightLight();
             pointData.forEach(point => {
@@ -405,17 +419,17 @@ export default {
                 let selectItem1 = ev[0][0],
                     location = selectItem1.data.AttachObjectIds[0] ? selectItem1.data.AttachObjectIds[0].id : ''
                 // 空间类型都可打开弹窗(除防火分区 编号100131,商管办公室 编号100112,铺装石材 编号100129)
-                if (selectItem1.data.GraphElementType == 'Zone') {
-                    if (
-                        selectItem1.data.GraphElementId != '100131' &&
-                        selectItem1.data.GraphElementId != '100112' &&
-                        selectItem1.data.GraphElementId != '100129'
-                    ) {
-                        if (location) {
-                            this.$refs.boxRoom.open({ name: selectItem1.name, type: this.type, location: location })
-                        }
-                    }
-                }
+                // if (selectItem1.data.GraphElementType == 'Zone') {
+                //     if (
+                //         selectItem1.data.GraphElementId != '100131' &&
+                //         selectItem1.data.GraphElementId != '100112' &&
+                //         selectItem1.data.GraphElementId != '100129'
+                //     ) {
+                //         if (location) {
+                //             this.$refs.boxRoom.open({ name: selectItem1.name, type: this.type, location: location })
+                //         }
+                //     }
+                // }
                 // // 选中电井设置电井关联的商铺高亮
                 // this.setHightLight(ev[0])
             } 

+ 2 - 1
src/store/index.js

@@ -14,7 +14,8 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        ssoToken: 'admin:liujiandong',
+        // ssoToken: 'admin:liujiandong',
+        ssoToken: 'admin:liulin34',
         // ssoToken: '',
         // ssoToken: null,
         plazaName: '',