宅基地调查

src/api/homesteadSurvey/index.js

@@ -68,9 +68,9 @@ export function delTask(id) {
   })
 }
 // 查询附件上传配置列表
-export function listAttachmentConfig(query) {
+export function sysConfig(query) {
   return request({
-    url: '/system/attachmentConfig/list',
+    url: '/system/config/list',
     method: 'get',
     params: query
   })

src/api/homesteadSurvey/zjdzd.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查-宅基地宗地列表
 export function listZjdzd(query) {
   return request({
-    url: '/houseSurvey/zjdzd/list',
+    url: '/houseSurvey/zjdzd/searchList',
     method: 'get',
     params: query
   })

src/views/homesteadSurvey/add.vue

@@ -2464,7 +2464,7 @@
   import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
-  import { listAttachmentConfig} from "@/api/homesteadSurvey/index";
+  import { sysConfig} from "@/api/homesteadSurvey/index";
   import { Notify, Dialog, Toast } from 'vant';
   export default {
     name: "homesteadAdd",
@@ -2639,6 +2639,9 @@
         jzqkOptions:[],
         // 土地等级字典
         tddjOptions:[],
+
+        // 图片上传路径
+        baseUrl:"",
       };
     },
     created(){
@@ -2777,16 +2780,9 @@
     methods: {
       getBaseUrl(){
         let params={
-          parentId: null,
-          processKey: null,
-          nodeStatus: null,
-          fileType: null,
-          fileTypeName: null,
-          configLevel: null,
-          nodeStatusName: null,
-          businessType: null}
-        listAttachmentConfig(params).then(response => {
-          console.log(response)
+          configKey: "system.attachment.url"}
+        sysConfig(params).then(response => {
+          this.baseUrl = response.rows[0].configValue
         })
       },
       // 验证
@@ -2812,6 +2808,7 @@
           "deptId" : this.item.deptId
         }
         listNh(params).then((response) => {
+          console.log(response)
           this.syqrnhdmlist = response.rows
         });
       },
@@ -3349,7 +3346,7 @@
             if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""&&this.form.zjdxctp.length>0){
               let li = this.form.zjdxctp.split(",");
               li.map(res => {
-                this.fileListzjd.push({"url":location.protocol+"//"+location.host+process.env.VUE_APP_BASE_API+res,"baseUrl":res})
+                this.fileListzjd.push({"url":this.baseUrl+res,"baseUrl":res})
               })
             }
 
@@ -3443,7 +3440,6 @@
           }
           listZrz(params).then(response => {
             this.zrzlist = response.rows;
-            this.fwlist = []
           });
           listNmfw(params).then(r => {
             this.fwlist = r.rows
@@ -4134,7 +4130,9 @@
       },
       searchCommit(){
         this.showesign = true
-        this.resultImg = location.protocol+"//"+location.host+process.env.VUE_APP_BASE_API+this.form.dzqm
+        if(this.form.dzqm!=null&&this.form.dzqm!=""){
+          this.resultImg = this.baseUrl+this.form.dzqm
+        }
       },
       searchCommit1(){
         this.form.houseDataConfirmStatus = "CONFIRMED"

src/views/homesteadSurvey/list.vue

@@ -1140,7 +1140,6 @@
 </template>
 
 <script>
-    import { currentLocation,} from "@/api/homestead/index";
     import {listZjdzd,getQueryLand,getZjdzd} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
@@ -1209,7 +1208,6 @@
           // 户内成员列表
           hncylist:[],
           currentRate:20,
-          geoJson:null,
           // 使用权人
           nhform:[],
           // 户主列表
@@ -1305,12 +1303,6 @@
         };
       },
       mounted(){
-        currentLocation().then((res) => {
-          if (res.code == 200) {
-            let content = res.data;
-            this.geoJson = content.geoJson;
-          }
-        });
       },
       created(){
         this.getDicts("zjlx").then(response => {
@@ -1892,6 +1884,7 @@
               }
             });
           }else{
+             console.log(1)
                let params = {
                  "deptId" : this.item.deptId,
                  "pageNum": 1,