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

src/api/ghss/ghxz.js

@@ -72,4 +72,12 @@ export function GetTemplateFactorList(params) {
         method: 'get',
         params
     })
+}
+// 选址报告接口
+export function DownloadReport(params) {
+    return request({
+        url: '/analyse/fzss/DownloadReport',
+        method: 'get',
+        params
+    })
 }

src/components/Query/clickQuery/CockpitVector.vue

@@ -2,21 +2,20 @@
   <div class="CockpitVectorBox">
 
     <div class="cockpit_vector">
-      <div class="list_vector list_vector_multi" v-for="(item, index ) in store.state.vectorData" :key="index"
-        v-if="shouldDisplayItem(item)">
-        <!-- <div class="filed_box">
-          {{ item.name }}
-        </div>
-        :
-        <div class="filed_box">
-          {{ item.value }}
-        </div> -->
-
-        <div>
-          <div class="left_info filed_box">{{ item.name }}</div>
-          <div class="right_info filed_box">{{ item.value }}</div>
-        </div>
-      </div>
+
+      <el-table :header-cell-style="{
+        background: 'rgba(10, 25, 38, 0.6)',
+        color: '#66b1ff',
+        fontSize: '14px',
+        fontFamily: 'Microsoft YaHei',
+        fontWeight: '400',
+      }" :data="store.state.vectorData.filter(item => item.name !== 'id' && item.name !== 'geom' && item.name !== 'type')" style="width: 100%" >
+
+        <el-table-column show-overflow-tooltip="true" prop="name" label="属性" width="90">
+        </el-table-column>
+        <el-table-column show-overflow-tooltip="true" prop="value" label="属性值">
+        </el-table-column>
+      </el-table>
     </div>
   </div>
 </template>
@@ -44,9 +43,6 @@ export default {
   watch: {},
   //方法集合
   methods: {
-    shouldDisplayItem(item) {  
-      return item.name !== 'geom' && item.name !== 'id' && item.name !== 'type'&& item.name !== 'create_time'&& item.name !== 'val1';  
-    },
     build_data(geojson) {
       geojson.coordinates.forEach((res) => {
         const twoDArray = res[0];
@@ -148,7 +144,7 @@ export default {
   position: absolute;
   top: 6rem;
   width: 20rem;
-  height: 35rem;
+  height: 37rem;
   overflow: auto;
   overflow-x: hidden;
   // z-index: -1;
@@ -231,12 +227,39 @@ export default {
   border-bottom: 1px solid #CCC;
 }
 
-.filed_box {
-  display: inline-block;
+
+/deep/ .el-table tr {
+  background: rgba(10, 25, 38, 0.5) !important;
+}
+
+/deep/ .el-table td.el-table__cell,
+.el-table th.el-table__cell.is-leaf {
+  background: rgba(10, 25, 38, 0.5) !important;
+
+  border-bottom: 0px solid #EBEEF5;
+}
+
+
+.el-table {
+  color: #fff;
+  background: rgba(10, 25, 38, 0.5) !important;
+}
+
+/deep/ .el-table__fixed-right::before,
+.el-table__fixed::before {
+
+  background: rgba(10, 25, 38, 0.9) !important;
+
 }
-.left_info{
-  border: #CCC 1px solid;
-}.right_info{
-  border: #CCC 1px solid;
+
+/deep/ .el-table__fixed-right-patch {
+  background: rgba(10, 25, 38, 0.9) !important;
+
+}
+
+/deep/ .el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background: rgba(10, 25, 38, 0) !important;
 }
 </style>

src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -57,26 +57,8 @@ export default {
         draw_vector_tdgy_gy_jd(data) {
             // tdsy.remove();
             data.forEach((res) => {
-
                 res.type = this.title
-
-                if (res.geom.type == "MultiPolygon") {
-                    console.log("多面");
-
-                    res.geom.coordinates.forEach((res_coordinates) => {
-                        let arrayt = [];
-                        if (res_coordinates.length == 1) {
-                            arrayt = res_coordinates[0]
-                        } else {
-                            arrayt = res_coordinates
-                        }
-
-                        const twoDArray = arrayt;
-                        const oneDArray = twoDArray.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []);
-                        tdsy.add(res, oneDArray);
-                    })
-                } else {
-                    console.log("单面");
+                if (res.geom) {
                     res.geom.coordinates.forEach((res_coordinates) => {
                         let arrayt = [];
                         if (res_coordinates.length == 1) {
@@ -90,7 +72,6 @@ export default {
                         tdsy.add(res, oneDArray);
                     })
                 }
-
             })
         },
 
@@ -325,7 +306,6 @@ export default {
                 obj.endTime = undefined
             }
             let data = await QueryList(obj);
-            console.log('data: ', data);
             data.data.map((res) => {
                 if (res.geom) {
                     res.geom = wellknown.parse(res.geom.split(";")[1]);
@@ -345,12 +325,12 @@ export default {
     watch: {
         cockpit_vector(newVal, oldVal) {
             this.title = newVal.title
-            if (newVal.tableData.length <= 0) {
-                this.tableData = []
-            }
             if (newVal.tableData.length > 0) {
+
                 this.active_dableData = newVal.tableData
                 this.tableData = newVal.tableData
+                this.init_vector()
+
             } else {
                 this.init_vector()
             }

src/views/cockpit/gdbh.vue

@@ -667,8 +667,6 @@ export default {
         }
       });
       this.vector_data = data.data;
-      console.log('this.vector_data: ', this.vector_data);
-
     },
     async init_jcpg_hz(params) {
 

src/views/cockpit/tdsy.vue

@@ -1153,7 +1153,6 @@ export default {
       //     columns:["项目名称","土地用途","出让面积(公顷）","土地使用权","土地座落","批准文号","批准机关"],
       //   })
       // }
-
       store.setCockpit_vector({
         title: "土地供应完成项目",
         tableData: this.vector_data,
@@ -1183,7 +1182,7 @@ export default {
       });
       this.vector_data = data.data;
     },
-    draw_vector_hysyq(){
+    draw_vector_hysyq() {
 
     }
   },
@@ -1612,6 +1611,6 @@ export default {
 }
 
 .cursor {
-      cursor: pointer;
-  }
+  cursor: pointer;
+}
 </style>

src/views/complianceAnalysis/components/lsjl.vue

@@ -78,7 +78,7 @@ import parse from "wellknown";
 import { GetPage, Delect } from "@/api/ghss/hgxfx.js";
 import { Message, MessageBox } from "element-ui";
 import { rest } from "lodash";
-import { GetXzResList, DelXzRes } from "../../../api/ghss/ghxz.js";
+import { GetXzResList, DelXzRes ,DownloadReport} from "../../../api/ghss/ghxz.js";
 let dataSources;
 export default {
   props: {
@@ -120,7 +120,8 @@ export default {
   },
   methods: {
     report(item) {
-      window.open(item.fxbg.replace(".docx", ".pdf"), "_blank");
+      // window.open(item.fxbg.replace(".docx", ".pdf"), "_blank");
+      window.open(window.axiosURI + '/analyse/fzss/DownloadReport?filePath=&'+`${item.fxbg}`);
     },
     del(item) {
       MessageBox.confirm(

src/views/siteselection/components/fzxz.vue

@@ -180,7 +180,7 @@ export default {
         // xzmj: [{ required: true, message: "请绘制选址范围" }],
         xmmc: [
           { required: true, message: "请输入项目名称", trigger: "blur" },
-          { min: 3, max: 10, message: "长度在 3 到 5 个字符", trigger: "blur" },
+          { min: 1,message: "请输入至少为一个字符的项目名称", trigger: "blur" },
         ],
         // jsdw: [{ required: true, message: "请输入建设单位", trigger: "blur" }],
         // xmlx: [{ required: true, message: "请输入项目类型", trigger: "blur" }],