Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/echartsTemplate/pie.vue

@@ -204,6 +204,7 @@ export default {
         option.series[0].center = ["25%", "50%"];
         option.legend.height = "100%";
         option.legend.top = "center";
+        option.legend.left = "50%";
         option.legend.orient = "vertical";
       }
       option.legend.right = cartData.legend_right || "2%";

src/views/siteselection/components/xzjg.vue

@@ -14,7 +14,8 @@
     <div class="box-sizing" style="height: 47%; width: 100%">
       <div class="title block-title">
         意向地块 （{{ bgList ? bgList.length : 0 }}）
-        <span @click="download" class="export">导出报告</span>
+        <span @click="download(false)" class="export">预览报告</span>
+        <span @click="download(true)" class="export">导出报告</span>
       </div>
       <div class="bxCon" style="height: 90%">
         <el-collapse accordion v-model="activeNames">
@@ -226,7 +227,7 @@ export default {
         this.loadGeoJSON(parse(this.tempObj.geom), "#ff0000", "all");
       }
     },
-    download() {
+    download(isdown) {
       var that = this;
 
       let dkIds = [];
@@ -243,11 +244,16 @@ export default {
         });
         DownloadLandReport({ bsm: this.$props.rwBsm, dkIds: dkIds }).then(
           (res) => {
-            window.open(
-              window.axiosURI +
-                "/analyse/fzss/DownloadReport?filePath=" +
-                `${res.data.fxbg}`
-            );
+            if (isdown)
+              window.open(
+                `${window.axiosURI}/analyse/fzss/DownloadReport?filePath=${res.data.fxbg}`
+              );
+            else {
+              window.open(
+                `${window.axiosURI}/analyse/fzss/ShowReport?filePath=${res.data.fxbgPdf}`,
+                "_blank"
+              );
+            }
             that.loading.close();
           }
         );
@@ -591,6 +597,7 @@ export default {
       height: 28px;
       line-height: 28px;
       float: right;
+      margin-left: 10px;
     }
   }