|
@@ -102,23 +102,60 @@ export default defineComponent({
|
|
|
result = result.replace(/\"/g, "");
|
|
|
let nameArr: any = name.split("-");
|
|
|
let arr: any = result.split(/[(\r\n)\r\n]+/);
|
|
|
- let p: any = localStorage.getItem("ponit");
|
|
|
- let objArr: any = JSON.parse(p) || {};
|
|
|
let pointObj: any = {
|
|
|
spaceId: nameArr[0].toString(),
|
|
|
+ localName:nameArr[0].toString(),
|
|
|
+ canClick:true,
|
|
|
pointArr: [],
|
|
|
- circularPoints: [],
|
|
|
+ devicePoint: [],
|
|
|
+ circlePoint: [],
|
|
|
logPointArr: [],
|
|
|
};
|
|
|
+
|
|
|
+ // debugger
|
|
|
arr.map((item: any, index: any) => {
|
|
|
if (item) {
|
|
|
let itemArr: any = item.split(",");
|
|
|
+ let obj: any = {
|
|
|
+ left: itemArr[0],
|
|
|
+ top: itemArr[1],
|
|
|
+ };
|
|
|
+ if (nameArr[1]) {
|
|
|
+ pointObj.circlePoint.push(obj);
|
|
|
+ } else {
|
|
|
+ if (index <= 1) {
|
|
|
+ pointObj.logPointArr.push(obj);
|
|
|
+ } else if (index <= 4) {
|
|
|
+ pointObj.devicePoint.push(obj);
|
|
|
+ } else {
|
|
|
+ pointObj.pointArr.push(obj);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
- proxyData.allObj.objArr = objArr;
|
|
|
- localStorage.setItem("ponit", JSON.stringify(proxyData.allObj.objArr));
|
|
|
- proxyData.initCanvas();
|
|
|
+ let str: any = localStorage.getItem("spaceList");
|
|
|
+ let spaceList: any = str ? JSON.parse(str) : [];
|
|
|
+ let flag: any = false;
|
|
|
+ spaceList.map((item: any) => {
|
|
|
+ if (nameArr[1] && item.spaceId === nameArr[1]) {
|
|
|
+ item.circlePoint = pointObj.circlePoint;
|
|
|
+ flag = true;
|
|
|
+ } else {
|
|
|
+ if( item.spaceId === nameArr[0]){
|
|
|
+ // debugger
|
|
|
+ // pointObj.circlePoint = item.circlePoint;
|
|
|
+ item.logPointArr = pointObj.logPointArr;
|
|
|
+ item.devicePoint = pointObj.devicePoint;
|
|
|
+ item.pointArr = pointObj.pointArr;
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ if (!flag) {
|
|
|
+ spaceList.push(pointObj);
|
|
|
+ }
|
|
|
+ localStorage.setItem("spaceList", JSON.stringify(spaceList));
|
|
|
+ console.log(spaceList);
|
|
|
},
|
|
|
// 处理坐标
|
|
|
handleStr(mapstr: any) {
|