|
@@ -17,7 +17,7 @@
|
|
|
:id="'space' + area.id"
|
|
|
:class="[
|
|
|
area.canClick ? '' : 'click-disable',
|
|
|
- selectArea.id === area.id ? 'select' : '',
|
|
|
+ selectArea.id === area.id ? (area.disabled ? 'select-disable' : 'select') : '',
|
|
|
isSetSpace ? 'use-select' : '',
|
|
|
area.disabled ? 'space-disable-box' : 'space-box-bg',
|
|
|
]"
|
|
@@ -502,7 +502,8 @@ export default defineComponent({
|
|
|
* 切换空间
|
|
|
*/
|
|
|
checkSpace(area: any) {
|
|
|
- if (area.disabled) { // 如果不在
|
|
|
+ if (area.disabled) {
|
|
|
+ // 如果不在
|
|
|
return;
|
|
|
}
|
|
|
proxyData.isSetSearchSpace = false;
|
|
@@ -688,6 +689,8 @@ export default defineComponent({
|
|
|
item.bg = mapIcon[typeName].bg;
|
|
|
item.icon = parseImgUrl("map-new-icon", item.icon);
|
|
|
item.selectIcon = parseImgUrl("map-new-icon", item.selectIcon);
|
|
|
+ } else {
|
|
|
+ item.icon = "";
|
|
|
}
|
|
|
},
|
|
|
midpoint(x1: any, y1: any, x2: any, y2: any) {
|
|
@@ -1037,10 +1040,11 @@ export default defineComponent({
|
|
|
if (!proxyData.isSetSpace) {
|
|
|
proxyData.checkSpace(proxyData.selectArea);
|
|
|
}
|
|
|
- // proxyData.selectArea = proxyData.mapData.spaceList[0];
|
|
|
- // 设置当前空间的位置
|
|
|
- console.log(" proxyData.selectArea===");
|
|
|
- console.log(proxyData.selectArea);
|
|
|
+ // if (!proxyData.selectArea.disabled) {
|
|
|
+ // proxyData.setSelectSpacePosition(proxyData.selectArea);
|
|
|
+ // } else {
|
|
|
+ // proxyData.selectArea = {};
|
|
|
+ // }
|
|
|
proxyData.setSelectSpacePosition(proxyData.selectArea);
|
|
|
}
|
|
|
// 接口返回后设置地图缩放和滚动
|
|
@@ -1145,7 +1149,9 @@ export default defineComponent({
|
|
|
},
|
|
|
// 设备模块初始化地图
|
|
|
init(item: any) {
|
|
|
- // proxyData.setDefaultSpace(item);
|
|
|
+ if (item) {
|
|
|
+ proxyData.setDefaultSpace(item);
|
|
|
+ }
|
|
|
/**
|
|
|
*缓存建筑对应的楼层
|
|
|
*/
|
|
@@ -1197,9 +1203,11 @@ export default defineComponent({
|
|
|
watch(
|
|
|
props,
|
|
|
(newProps: any) => {
|
|
|
+ let item: any = props.spaceInfo;
|
|
|
proxyData.buildingItem.buildingId = newProps.buildingId;
|
|
|
proxyData.floorItem.id = newProps.floorId;
|
|
|
// proxyData.selectArea.spaceId = newProps.spaceInfo.spaceId;
|
|
|
+ // proxyData.init(item);
|
|
|
},
|
|
|
{
|
|
|
deep: false,
|
|
@@ -1208,12 +1216,11 @@ export default defineComponent({
|
|
|
);
|
|
|
onMounted(() => {
|
|
|
let item: any = props.spaceInfo;
|
|
|
- console.log("props.spaceInfo===");
|
|
|
- console.log(proxyData.selectArea);
|
|
|
- console.log(props.spaceInfo);
|
|
|
+ console.log(item);
|
|
|
proxyData.buildingItem.buildingId = props.buildingId;
|
|
|
proxyData.floorItem.id = props.floorId;
|
|
|
- // proxyData.selectArea.spaceId = item.spaceId;
|
|
|
+ item.buildingId = props.buildingId;
|
|
|
+ item.floorId = props.floorId;
|
|
|
proxyData.init(item);
|
|
|
});
|
|
|
return {
|
|
@@ -1309,6 +1316,9 @@ export default defineComponent({
|
|
|
.select {
|
|
|
border: 2px solid rgba(77, 148, 255, 0.8);
|
|
|
}
|
|
|
+ .select-disable {
|
|
|
+ border: 2px solid rgba(77, 148, 255, 0.2);
|
|
|
+ }
|
|
|
|
|
|
.use-select {
|
|
|
border: 5px solid #ffe823;
|