|
@@ -129,7 +129,7 @@ export default defineComponent({
|
|
|
// 数据格式化
|
|
|
formSpaceData() {
|
|
|
proxyData.spaceArr.map((item: any) => {
|
|
|
- item.devicePoint.map((dev: any) => {
|
|
|
+ item.devicePointArr.map((dev: any) => {
|
|
|
dev.left = dev.left * 1;
|
|
|
dev.top = proxyData.floorObj.height - dev.top;
|
|
|
// dev.top = dev.top;
|
|
@@ -144,12 +144,12 @@ export default defineComponent({
|
|
|
dev.top = proxyData.floorObj.height - dev.top;
|
|
|
// dev.top = dev.top;
|
|
|
});
|
|
|
- item.circlePoint.map((dev: any) => {
|
|
|
+ item.circlePointArr.map((dev: any) => {
|
|
|
dev.left = dev.left * 1;
|
|
|
dev.top = proxyData.floorObj.height - dev.top;
|
|
|
// dev.top = dev.top;
|
|
|
});
|
|
|
- item.detailPoint.map((dev: any) => {
|
|
|
+ item.detailPointArr.map((dev: any) => {
|
|
|
dev.left = dev.left * 1;
|
|
|
dev.top = proxyData.floorObj.height - dev.top;
|
|
|
// dev.top = dev.top;
|
|
@@ -183,9 +183,9 @@ export default defineComponent({
|
|
|
localName: nameArr[0] ? nameArr[0].toString() : "",
|
|
|
canClick: nameArr[2] && nameArr[2] == "unc" ? false : true,
|
|
|
pointArr: [],
|
|
|
- devicePoint: [],
|
|
|
- circlePoint: [],
|
|
|
- detailPoint: [],
|
|
|
+ devicePointArr: [],
|
|
|
+ circlePointArr: [],
|
|
|
+ detailPointArr: [],
|
|
|
logoPointArr: [],
|
|
|
};
|
|
|
|
|
@@ -197,20 +197,22 @@ export default defineComponent({
|
|
|
top: itemArr[1],
|
|
|
};
|
|
|
if (pointObj.canClick && nameArr[2] && nameArr[2] == "c") {
|
|
|
- pointObj.circlePoint.push(obj);
|
|
|
+ pointObj.circlePointArr.push(obj);
|
|
|
} else if (
|
|
|
!pointObj.canClick &&
|
|
|
- nameArr[2] &&
|
|
|
- nameArr[2] == "c"
|
|
|
+ nameArr[3] &&
|
|
|
+ nameArr[3] == "c"
|
|
|
) {
|
|
|
- pointObj.circlePoint.push(obj);
|
|
|
+ pointObj.circlePointArr.push(obj);
|
|
|
+ } else if (!pointObj.canClick) {
|
|
|
+ pointObj.pointArr.push(obj);
|
|
|
} else {
|
|
|
if (index < 1) {
|
|
|
- pointObj.devicePoint.push(obj);
|
|
|
+ pointObj.detailPointArr.push(obj);
|
|
|
} else if (index < 2) {
|
|
|
pointObj.logoPointArr.push(obj);
|
|
|
} else if (index < 3) {
|
|
|
- pointObj.detailPoint.push(obj);
|
|
|
+ pointObj.devicePointArr.push(obj);
|
|
|
} else {
|
|
|
pointObj.pointArr.push(obj);
|
|
|
}
|
|
@@ -221,12 +223,12 @@ export default defineComponent({
|
|
|
let flag: any = false;
|
|
|
proxyData.spaceArr.map((item: any) => {
|
|
|
if (nameArr[1] && item.spaceId === nameArr[1]) {
|
|
|
- item.circlePoint = pointObj.circlePoint;
|
|
|
+ item.circlePointArr = pointObj.circlePointArr;
|
|
|
flag = true;
|
|
|
} else {
|
|
|
if (item.spaceId === nameArr[0]) {
|
|
|
item.logoPointArr = pointObj.logoPointArr;
|
|
|
- item.devicePoint = pointObj.devicePoint;
|
|
|
+ item.devicePointArr = pointObj.devicePointArr;
|
|
|
item.pointArr = pointObj.pointArr;
|
|
|
flag = true;
|
|
|
}
|