Merge branch 'master' of http://192.168.0.115:3000/bill/public-fuse

src/view/case/draw/board/editCAD/Controls/UIControl.js

@@ -394,6 +394,8 @@ export default class UIControl {
         wallService.deleteWallCorner(item.vectorId);
       } else if (item.type == VectorType.CustomImage) {
         floorplanService.deleteCustomImage(item.vectorId);
+      } else if (item.type == VectorType.BgImage) {
+        floorplanService.deleteBgImage();
       }
       history.save();
       this.layer.renderer.autoRedraw();

src/view/case/draw/board/editCAD/History/Change.js

@@ -547,17 +547,17 @@ export default class Change {
     const bgImage = floorplanService.getBgImage();
     const lastBgImage = this.lastData.bgImage;
     let item = {};
-    if (!lastBgImage&&!bgImage) {
+    if ((!lastBgImage||!lastBgImage.url)&&(!bgImage||!bgImage.geoType)) {
       return;
     }
-    else if (!lastBgImage&&bgImage) {
+    else if ((!lastBgImage||!lastBgImage.url)&&(bgImage&&bgImage.geoType)) {
       item = {
         handle: HistoryEvents.AddBgImage,
         bgImage: historyUtil.getDataForBgImage(bgImage),
       };
       this.elements.bgImage = item;
     } 
-    else if(lastBgImage&&!bgImage){
+    else if((lastBgImage&&lastBgImage.url)&&(!bgImage||!bgImage.geoType)){
       item = {
         handle: HistoryEvents.DeleteBgImage,
         bgImage: historyUtil.getDataForBgImage(this.lastData.bgImage),

src/view/case/draw/board/editCAD/History/History.js

@@ -545,7 +545,7 @@ export default class History {
                 let vBgImage = await bgImageService.createBgImage(itemForBgImage.bgImage.url,itemForBgImage.bgImage.center, itemForBgImage.bgImage.id)
                 historyUtil.assignBgImageFromBgImage(vBgImage, itemForBgImage.bgImage)
             } else if (itemForBgImage.handle == HistoryEvents.DeleteBgImage) {
-                floorplanService.deleteBgImage(itemForBgImage.bgImage.id)
+                floorplanService.deleteBgImage()
             } else if (itemForBgImage.handle == HistoryEvents.ModifyBgImage) {
                 const currentBgImage = itemForBgImage.curBgImage
                 let preBgImage = floorplanService.getBgImage(itemForBgImage.curBgImage.id)

src/view/case/draw/board/editCAD/Load.js

@@ -8,15 +8,13 @@ import { arrowService } from './Service/ArrowService.js'
 import { iconService } from './Service/IconService.js'
 import { tableService } from './Service/TableService.js'
 import { customImageService } from './Service/CustomImageService.js'
+import { bgImageService } from './Service/BgImageService.js'
 
 export default class Load {
     constructor(layer) {
         this.layer = layer
         this.version = 'v1.1'
         this.vectorsJson = null
-        // 保存当前的数据
-        this.saveFloors = []
-        this.newVectorId = null
     }
 
     async load(floorsData) {
@@ -28,13 +26,13 @@ export default class Load {
             //添加指南针
             const compass = floorplanService.createCompass()
             floorplanService.addCompass(compass)
-            //添加背景图片
-            const bgImage = floorplanService.createBgImage()
-            floorplanService.addBgImage(bgImage)
-            if(bgImage.url){
-                const imageData = await floorplanService.loadImageData(bgImage.url)
-                bgImage.setImageData(imageData)
-            }
+            // //添加背景图片
+            // const bgImage = floorplanService.createBgImage()
+            // floorplanService.addBgImage(bgImage)
+            // if(bgImage.url){
+            //     const imageData = await floorplanService.loadImageData(bgImage.url)
+            //     bgImage.setImageData(imageData)
+            // }
             return;
         }
         floorplanService.setCurrentId(floorsData.currentId)
@@ -112,7 +110,7 @@ export default class Load {
             const compass = floorplanService.createCompass(floor.compass.angle, floor.compass.vectorId, i)
             floorplanService.addCompass(compass)
             
-  
+            await bgImageService.createBgImage(floor.bgImage.url)
         }
     }
 

src/view/case/draw/board/editCAD/Renderer/Draw.js

@@ -1096,6 +1096,13 @@ export default class Draw {
         this.context.fill();
         this.context.stroke();
         this.context.restore();
+
+        this.context.save()
+        this.context.font = `12px Microsoft YaHei`
+        let value = '角度：'+geometry.angle
+        let fontWidth = this.context.measureText(value).width
+        this.context.fillText(value, geometry.center.x-fontWidth/4, geometry.center.y+70)
+        this.context.restore()
     }
 
     setCanvasStyle(style) {

src/view/case/draw/board/editCAD/Service/BgImageService.js

@@ -19,8 +19,8 @@ export default class BgImageService {
         return bgImage
     }
 
-    deleteBgImage(bgImageId) {
-        floorplanService.deleteBgImage(bgImageId)
+    deleteBgImage() {
+        floorplanService.deleteBgImage()
     }
 
     setBgImageInfo(bgImageInfo) {