Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

src/views/authentic/Pdf.vue

@@ -46,7 +46,7 @@
             </table>
             <div class="a4_sub_title">地块四至图</div>
             <img :key="imgUrl" v-show="imgUrl" class="img-content img" style="z-index: 999" width="595" height="500" :src="imgUrl" />
-            <div :key="imgUrl" v-show="!imgUrl" class="img-content" ref="mapRef" id="mapRefId"></div>
+            <div :key="imgUrl" v-show="!imgUrl" style="width: 595px;height: 500px" class="img-content" ref="mapRef" id="mapRefId"></div>
             <div class="signature">签名:______________</div>
           </div>
         </div>
@@ -189,7 +189,7 @@ onMounted(()=>{
 })
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 $title-height:0px;
 $body-height:calc(100% - $title-height);
 
@@ -252,11 +252,10 @@ $body-height:calc(100% - $title-height);
     height: calc(100%);
     width: 100%;
     overflow-y: scroll;
+    box-sizing: border-box;
     background-color: rgba(141, 142, 142);
     padding: 10px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: center;
+
   }
 
   .a4{
@@ -264,7 +263,7 @@ $body-height:calc(100% - $title-height);
     background-color: #FFFFFF;
     width:595px;
     height:1000px;
-    margin: 5px 0px 5px 0px;
+    margin: 0 auto;
     padding: 19px 63px 19px 63px;
     font-weight: 600;
     color: #000000;
@@ -307,21 +306,8 @@ $body-height:calc(100% - $title-height);
       }
     }
     .img-content{
-      width:595px;
-      height: 500px;
       z-index: 1000;
-      .ol-viewport{
-        width:595px !important;
-        height: 500px !important;
-        .ol-layers{
-          width:595px !important;
-          height: 500px !important;
-          .ol-layer{
-            width:595px !important;
-            height: 500px !important;
-          }
-        }
-      }
+      margin: 0 auto;
     }
     .img{
       z-index: 999;
@@ -337,9 +323,6 @@ $body-height:calc(100% - $title-height);
 
 
 }
-canvas{
-  width:595px;
-  height: 500px;
-}
+
 
 </style>

src/views/authentic/pdfMap.js

@@ -91,7 +91,7 @@ class PdfMap {
         22
     );
     this.lock(false)
-    this.kmap.setLayerWkt(data.geom, data, true, [50, 50, 50, 50] )
+    this.kmap.setLayerWkt(data.geom, data, true, [120, 120, 120, 120] )
     this.kmap.addLayer(this.clickPointLayer.layer);
     this.kmap.addLayer(this.locationLayer.layer);
     this.addPoint(data)