|
@@ -78,89 +78,101 @@ export default defineComponent({
|
|
|
},
|
|
|
getFile(e: any) {
|
|
|
console.log(e.target.files);
|
|
|
- let files:any=e.target.files
|
|
|
- for(let i=0;i<files.length;i++){
|
|
|
- let fileSelect: any = files[i]
|
|
|
- let name: any = fileSelect.name;
|
|
|
- name = name.split(".")[0];
|
|
|
- // this.fileName = fileSelect.name;
|
|
|
- let reader: any = new FileReader();
|
|
|
- if (typeof FileReader === "undefined") {
|
|
|
- console.log("您的浏览器不支持FileReader接口");
|
|
|
- return;
|
|
|
- }
|
|
|
- reader.readAsText(fileSelect, "gb2312"); //注意读取中文的是用这个编码,不是utf-8
|
|
|
- // const _this = this;
|
|
|
- reader.onload = function () {
|
|
|
- // console.log(reader.result);
|
|
|
- let result: any = reader.result;
|
|
|
- // _this.$nextTick(() => {
|
|
|
- // _this.voiceContent = reader.result;
|
|
|
- // });
|
|
|
- // proxyData.handleStr(result);
|
|
|
- proxyData.handPoint(result, name);
|
|
|
- };
|
|
|
+ let files: any = e.target.files;
|
|
|
+ for (let i = 0; i < files.length; i++) {
|
|
|
+ let fileSelect: any = files[i];
|
|
|
+ let name: any = fileSelect.name;
|
|
|
+ name = name.split(".")[0];
|
|
|
+ // this.fileName = fileSelect.name;
|
|
|
+ let reader: any = new FileReader();
|
|
|
+ if (typeof FileReader === "undefined") {
|
|
|
+ console.log("您的浏览器不支持FileReader接口");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ reader.readAsText(fileSelect, "gb2312"); //注意读取中文的是用这个编码,不是utf-8
|
|
|
+ // const _this = this;
|
|
|
+ reader.onload = function () {
|
|
|
+ // console.log(reader.result);
|
|
|
+ let result: any = reader.result;
|
|
|
+ // _this.$nextTick(() => {
|
|
|
+ // _this.voiceContent = reader.result;
|
|
|
+ // });
|
|
|
+ // proxyData.handleStr(result);
|
|
|
+ proxyData.handPoint(result, name);
|
|
|
+ };
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
handPoint(result: any, name: any) {
|
|
|
result = result.replace(/\"/g, "");
|
|
|
let nameArr: any = name.split("-");
|
|
|
let arr: any = result.split(/[(\r\n)\r\n]+/);
|
|
|
- let pointObj: any = {
|
|
|
- spaceId: nameArr[0].toString(),
|
|
|
- localName:nameArr[0].toString(),
|
|
|
- canClick:true,
|
|
|
- pointArr: [],
|
|
|
- devicePoint: [],
|
|
|
- circlePoint: [],
|
|
|
- logPointArr: [],
|
|
|
- };
|
|
|
+ if (nameArr && nameArr[0] == "B3") {
|
|
|
+ arr.map((item: any) => {
|
|
|
+ if (item) {
|
|
|
+ let itemArr: any = item.split(",");
|
|
|
+ let obj: any = {
|
|
|
+ width: itemArr[0],
|
|
|
+ height: itemArr[1],
|
|
|
+ };
|
|
|
+ console.log(obj)
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ let pointObj: any = {
|
|
|
+ spaceId: nameArr[0].toString(),
|
|
|
+ localName: nameArr[0].toString(),
|
|
|
+ canClick: true,
|
|
|
+ pointArr: [],
|
|
|
+ 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);
|
|
|
+ // 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 {
|
|
|
- pointObj.pointArr.push(obj);
|
|
|
+ if (index <= 1) {
|
|
|
+ pointObj.logPointArr.push(obj);
|
|
|
+ } else if (index <= 4) {
|
|
|
+ pointObj.devicePoint.push(obj);
|
|
|
+ } else {
|
|
|
+ pointObj.pointArr.push(obj);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ });
|
|
|
+ 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);
|
|
|
}
|
|
|
- });
|
|
|
- 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);
|
|
|
}
|
|
|
- localStorage.setItem("spaceList", JSON.stringify(spaceList));
|
|
|
- console.log(spaceList);
|
|
|
},
|
|
|
// 处理坐标
|
|
|
handleStr(mapstr: any) {
|