.

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

@@ -437,7 +437,7 @@ export default class UIControl {
     coordinate.setRatio(3)
     canvas.width = canvas.width * coordinate.ratio
     canvas.height = canvas.height * coordinate.ratio
-    this.layer.renderer.autoRedraw()
+    this.layer.renderer.autoRedrawForImg()
     setTimeout(() => {
       let blobImg = this.downloadCadImg(canvas, filename)
       // 完成callback传出blob  
@@ -454,8 +454,8 @@ export default class UIControl {
   downloadCadImg(canvas, filename) {
     
     // 图片导出为 png 格式
-    var type = "png";
-    var imgData = canvas.toDataURL(type, 1);
+    var type = "image/jpeg";
+    var imgData = canvas.toDataURL(type, 3);
 
     //let blobImg = this.base64ToBlob(imgData);
     

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

@@ -25,14 +25,14 @@ export default class Draw {
         this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height)
     }
 
-    // drawBackGround(color) {
-    //     this.context.save()
-    //     this.context.fillStyle = color
-    //     this.context.fillRect(0, 0, this.context.canvas.width, this.context.canvas.height)
-    //     this.context.restore()
-    // }
-
-    drawBackGround(color) {
+    drawBackGround() {
+        this.context.save()
+        this.context.fillStyle = 'white';
+        this.context.fillRect(0,0,this.context.canvas.width,this.context.canvas.height)
+        this.context.restore()
+    }
+
+    drawFrame() {
         this.context.save()
         this.context.strokeStyle = 'black';
         const ratio =  this.context.canvas.width/297 ;
@@ -40,10 +40,6 @@ export default class Draw {
         this.context.restore()
     }
 
-    // setSVGAttr(svgId,width,height){
-
-    // }
-
     drawWall(vector) {
         let start = floorplanService.getPoint(vector.start)
         let end = floorplanService.getPoint(vector.end)
@@ -1098,10 +1094,10 @@ export default class Draw {
         this.context.restore();
 
         this.context.save()
-        this.context.font = `12px Microsoft YaHei`
+        this.context.font = 12*coordinate.ratio+`px 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.fillText(value, (geometry.center.x*coordinate.ratio-fontWidth/5), (geometry.center.y+70)*coordinate.ratio)
         this.context.restore()
     }
 

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

@@ -199,29 +199,39 @@ export default class Render {
             this.drawGeometry(customImages[key])
         }
         
-        draw.drawBackGround()
+        draw.drawFrame()
         this.redrawElements()
     }
 
     autoRedrawForImg() {
         draw.clear()
-
-        // if (this.displayPanos) {
-        //     this.drawPanos(this.layer.panos[floorplanService.currentFloor])
-        // }
+        draw.drawBackGround()
         let data = floorplanService.getFloorData()
         if (!data) {
             return
         }
+
+        let title = data.title
+        this.drawGeometry(title)
+
+        let bgImage = data.bgImage
+        this.drawGeometry(bgImage)
+
+        let compass = data.compass
+        this.drawGeometry(compass)
+
         let walls = data.walls
         for (let key in walls) {
             this.drawGeometry(walls[key])
         }
 
-        // let points = data.points
-        // for (let key in points) {
-        //     this.drawGeometry(points[key])
-        // }
+        let points = data.points
+        for (let key in points) {
+            this.drawGeometry(points[key])
+        }
+
+        //draw.drawSpecialPoint()
+
         let signs = data.signs
         for (let key in signs) {
             this.drawGeometry(signs[key])
@@ -229,10 +239,41 @@ export default class Render {
 
         let tags = data.tags
         for (let key in tags) {
-            this.drawGeometry(tags[key], null, true)
+            this.drawGeometry(tags[key])
+        }
+
+        let tables = data.tables
+        for (let key in tables) {
+            this.drawGeometry(tables[key])
         }
 
-        //this.redrawElements()
+        let rectangles = data.rectangles
+        for (let key in rectangles) {
+            this.drawGeometry(rectangles[key])
+        }
+
+        let circles = data.circles
+        for (let key in circles) {
+            this.drawGeometry(circles[key])
+        }
+
+        let arrows = data.arrows
+        for (let key in arrows) {
+            this.drawGeometry(arrows[key])
+        }
+
+        let icons = data.icons
+        for (let key in icons) {
+            this.drawGeometry(icons[key])
+        }
+
+        let customImages = data.customImages
+        for (let key in customImages) {
+            this.drawGeometry(customImages[key])
+        }
+        
+        draw.drawFrame()
+        this.redrawElements()
     }
 
     redrawCore() {