From cc419c3176f1697e28df3e5789a8381d828f04bb Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Thu, 11 May 2023 15:12:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=B8=A4=E6=B8=85=E4=B8=89=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 2 +- src/router/index.js | 12 ++++++------ src/views/homestead/login.vue | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/permission.js b/src/permission.js index efbbcd81..909d89ae 100644 --- a/src/permission.js +++ b/src/permission.js @@ -177,7 +177,7 @@ const whiteList = [ // '/agriculturalTrusteeship/billDetail4',//买家选购-订单详情 // '/agriculturalTrusteeship/evaluate',//买家选购-服务评价 - '/plotPremisesMobile/index',//两清三化 + '/plotPremisesMobile/index',//闲置资源 ] diff --git a/src/router/index.js b/src/router/index.js index 6aa5ccd0..40d2e911 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -416,12 +416,12 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/user/supply/supplyAdd'], resolve) }, - //两清三化宅基地 + //闲置资源宅基地 { path: '/homestead/index', name: 'homesteadIndex', meta: { - title: '两清三化宅基地', + title: '闲置资源宅基地', hidden: true, }, component: (resolve) => require(['@/views/homestead/index'], resolve) @@ -435,12 +435,12 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/homestead/login'], resolve) }, - //两清三化宅基地 + //闲置资源宅基地 { path: '/authenticRight/index', name: 'authenticRightIndex', meta: { - title: '两清三化宅基地', + title: '闲置资源宅基地', hidden: true, }, component: (resolve) => require(['@/views/authenticRight/index'], resolve) @@ -5267,12 +5267,12 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/agriculturalTrusteeship/buyer/evaluate'], resolve) }, - //<--------------------------------------两清三化--------------------------------------> + //<--------------------------------------闲置资源--------------------------------------> { path: '/plotPremisesMobile/index', name: 'plotPremisesMobile', meta: { - title: '两清三化', + title: '闲置资源', hidden: true, }, component: (resolve) => require(['@/views/plotPremisesMobile/index'], resolve) diff --git a/src/views/homestead/login.vue b/src/views/homestead/login.vue index 3fb1c9b4..26063e40 100644 --- a/src/views/homestead/login.vue +++ b/src/views/homestead/login.vue @@ -3,7 +3,7 @@
-
环翠区两清三化
+
环翠区闲置资源
数据调查系统
From 95d698742247301412cd6a990030961445a98217 Mon Sep 17 00:00:00 2001 From: yangfuda <945208611@qq.com> Date: Thu, 11 May 2023 16:35:58 +0800 Subject: [PATCH 2/7] Merge branch 'master' of E:\project\nsgk_mobile with conflicts. --- .../collectionAccount/collectionAdd.vue | 2 +- .../collectionAccount/collectionModify.vue | 2 +- .../paymentApproval/collectionAdd.vue | 2 +- .../paymentApproval/collectionAdd2.vue | 2 +- .../paymentApproval/collectionApprovalAdd.vue | 2 +- .../collectionAccount/collectionAdd.vue | 2 +- .../collectionAccount/collectionModify.vue | 2 +- .../paymentApproval/collectionAdd.vue | 2 +- .../paymentApproval/collectionAdd2.vue | 2 +- .../paymentApproval/collectionApprovalAdd.vue | 2 +- 打包.bat | 19 ++++++------------- 11 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue index 3e946690..dc4e2b64 100644 --- a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue @@ -155,7 +155,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue index fd882efc..8029eb54 100644 --- a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue +++ b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue @@ -147,7 +147,7 @@ getPayee(this.$route.query.id).then((response) => { let _this = this this.form = response.data; - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ _this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue index d51c0e1d..0b2b5ecf 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue @@ -171,7 +171,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue index 262fbd3f..06a3b6be 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue @@ -171,7 +171,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue index 61acd464..b43f96ce 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue @@ -167,7 +167,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue index ee239ac1..2df5b7a1 100644 --- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue +++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue @@ -150,7 +150,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue index fd882efc..8029eb54 100644 --- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue +++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue @@ -147,7 +147,7 @@ getPayee(this.$route.query.id).then((response) => { let _this = this this.form = response.data; - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ _this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue index 27fed99f..d7f10dd4 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue @@ -165,7 +165,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue index 078bf246..78bc199c 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue @@ -165,7 +165,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue index 61acd464..b43f96ce 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue @@ -167,7 +167,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/打包.bat b/打包.bat index cf9cfe03..f3aefd88 100644 --- a/打包.bat +++ b/打包.bat @@ -1,21 +1,14 @@ @echo off -@echo ʼApp...... +E: +cd E:\project\nsgk_mobile -call :extract %0 -goto :eof -:extract -rem ĿĿ¼ -@echo ĿĿ¼: %~dp1 -%~d1 -cd %~dp1 -call npm run build -@echo ɹ +:: 打包预发布环境 +npm run build -@echo Ŀļ -start "" %~dp1 -@pause \ No newline at end of file +@echo SUCCESS +pause \ No newline at end of file From fd532b1069ab37d00d48e2a7190f03ff7dc4fb1d Mon Sep 17 00:00:00 2001 From: yangfuda <945208611@qq.com> Date: Thu, 11 May 2023 16:59:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=93=B6=E5=86=9C-=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E6=96=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue index 747ed2ad..9dee5adb 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue @@ -351,7 +351,7 @@ chargeItme:[], chargeItmeShow:[], payeeList:[], - // 查询参数 + // 查询参数1 queryParams: { transferType:"", orderByColumn: "id", From 9f6fa636402a7aff3ea9911e3e66ad2453d08943 Mon Sep 17 00:00:00 2001 From: yangfuda <945208611@qq.com> Date: Thu, 11 May 2023 17:02:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=93=B6=E5=86=9C-=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E6=96=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue index 9dee5adb..747ed2ad 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue @@ -351,7 +351,7 @@ chargeItme:[], chargeItmeShow:[], payeeList:[], - // 查询参数1 + // 查询参数 queryParams: { transferType:"", orderByColumn: "id", From ad2da1f38cb9a9dcb5c805b5a5f767c356ec3604 Mon Sep 17 00:00:00 2001 From: yangfuda <945208611@qq.com> Date: Thu, 11 May 2023 17:26:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=93=B6=E5=86=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 打包.bat | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/打包.bat b/打包.bat index f3aefd88..cf9cfe03 100644 --- a/打包.bat +++ b/打包.bat @@ -1,14 +1,21 @@ @echo off -E: -cd E:\project\nsgk_mobile +@echo ʼApp...... +call :extract %0 +goto :eof +:extract +rem ĿĿ¼ +@echo ĿĿ¼: %~dp1 +%~d1 +cd %~dp1 +call npm run build -:: 打包预发布环境 -npm run build +@echo ɹ +@echo Ŀļ +start "" %~dp1 -@echo SUCCESS -pause \ No newline at end of file +@pause \ No newline at end of file From adff8892b4ebdaec11c2cdd1dd49156b52dc9236 Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Fri, 12 May 2023 14:19:24 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=AE=85?= =?UTF-8?q?=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/homesteadSurvey/fsss.js | 6 +- src/api/homesteadSurvey/nh.js | 4 +- src/api/homesteadSurvey/nmfw.js | 14 +- src/api/homesteadSurvey/shyqr.js | 4 +- src/api/homesteadSurvey/suyqr.js | 4 +- src/api/homesteadSurvey/zjdzd.js | 8 + src/api/homesteadSurvey/zrz.js | 6 +- src/components/Map/MapGisObtainTj.vue | 264 + src/router/index.js | 90 + src/views/homesteadSurvey/add.vue | 459 +- src/views/homesteadSurvey/add2.vue | 21 +- src/views/homesteadSurvey/add3.vue | 21 +- src/views/homesteadSurvey/add4.vue | 159 +- src/views/homesteadSurvey/fsssAdd.vue | 368 ++ src/views/homesteadSurvey/hncyDetails.vue | 5708 +++++++++++++++++++++ src/views/homesteadSurvey/hncyList2.vue | 5532 ++++++++++++++++++++ src/views/homesteadSurvey/list.vue | 2 +- src/views/homesteadSurvey/list2.vue | 9 +- src/views/homesteadSurvey/list3.vue | 161 +- src/views/homesteadSurvey/list4.vue | 177 +- src/views/homesteadSurvey/nhAdd.vue | 327 ++ src/views/homesteadSurvey/nhDetails.vue | 5697 ++++++++++++++++++++ src/views/homesteadSurvey/nhcyAdd.vue | 355 ++ src/views/homesteadSurvey/nhcyList.vue | 178 + src/views/homesteadSurvey/nmfwAdd.vue | 563 ++ src/views/homesteadSurvey/nmfwList.vue | 183 + src/views/homesteadSurvey/shyqrAdd.vue | 663 +-- src/views/homesteadSurvey/zrzAdd.vue | 423 ++ 28 files changed, 20762 insertions(+), 644 deletions(-) create mode 100644 src/components/Map/MapGisObtainTj.vue create mode 100644 src/views/homesteadSurvey/fsssAdd.vue create mode 100644 src/views/homesteadSurvey/hncyDetails.vue create mode 100644 src/views/homesteadSurvey/hncyList2.vue create mode 100644 src/views/homesteadSurvey/nhAdd.vue create mode 100644 src/views/homesteadSurvey/nhDetails.vue create mode 100644 src/views/homesteadSurvey/nhcyAdd.vue create mode 100644 src/views/homesteadSurvey/nhcyList.vue create mode 100644 src/views/homesteadSurvey/nmfwAdd.vue create mode 100644 src/views/homesteadSurvey/nmfwList.vue create mode 100644 src/views/homesteadSurvey/zrzAdd.vue diff --git a/src/api/homesteadSurvey/fsss.js b/src/api/homesteadSurvey/fsss.js index b61dfc4b..616cb45d 100644 --- a/src/api/homesteadSurvey/fsss.js +++ b/src/api/homesteadSurvey/fsss.js @@ -21,7 +21,7 @@ export function exportFsss(query) { // 查询数据调查-附属设施详细 export function getFsss(id) { return request({ - url: '/houseSurvey/fsss/get/' + id, + url: '/home/homesteadfsss/get/' + id, method: 'get' }) } @@ -29,7 +29,7 @@ export function getFsss(id) { // 新增数据调查-附属设施 export function addFsss(data) { return request({ - url: '/houseSurvey/fsss/add', + url: '/home/homesteadfsss/add', method: 'post', data: data }) @@ -38,7 +38,7 @@ export function addFsss(data) { // 修改数据调查-附属设施 export function updateFsss(data) { return request({ - url: '/houseSurvey/fsss/edit', + url: '/home/homesteadfsss/edit', method: 'post', data: data }) diff --git a/src/api/homesteadSurvey/nh.js b/src/api/homesteadSurvey/nh.js index bccdbc9b..719c064c 100644 --- a/src/api/homesteadSurvey/nh.js +++ b/src/api/homesteadSurvey/nh.js @@ -37,7 +37,7 @@ export function getNhByNhdm(nhdm) { // 新增数据调查-户主信息 export function addNh(data) { return request({ - url: '/home/homesteadnhhncy/add', + url: '/home/homesteadnh/add', method: 'post', data: data }) @@ -55,7 +55,7 @@ export function nhConnectTask(data) { // 修改数据调查-户主信息 export function updateNh(data) { return request({ - url: '/home/homesteadnhhncy/edit', + url: '/home/homesteadnh/edit', method: 'post', data: data }) diff --git a/src/api/homesteadSurvey/nmfw.js b/src/api/homesteadSurvey/nmfw.js index 614bbb67..d2d587db 100644 --- a/src/api/homesteadSurvey/nmfw.js +++ b/src/api/homesteadSurvey/nmfw.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询数据调查-农民房屋列表 export function listNmfw(query) { return request({ - url: '/houseSurvey/nmfw/list', + url: '/home/homesteadnmfw/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listNmfw(query) { // 导出数据调查-农民房屋 export function exportNmfw(query) { return request({ - url: '/houseSurvey/nmfw/export', + url: '/home/homesteadnmfw/export', method: 'get', params: query }) @@ -21,7 +21,7 @@ export function exportNmfw(query) { // 查询数据调查-农民房屋详细 export function getNmfw(id) { return request({ - url: '/houseSurvey/nmfw/get/' + id, + url: '/home/homesteadnmfw/get/' + id, method: 'get' }) } @@ -29,7 +29,7 @@ export function getNmfw(id) { // 新增数据调查-农民房屋 export function addNmfw(data) { return request({ - url: '/houseSurvey/nmfw/add', + url: '/home/homesteadnmfw/add', method: 'post', data: data }) @@ -38,7 +38,7 @@ export function addNmfw(data) { // 新增数据调查-户主信息 export function nmfwConnectTask(data) { return request({ - url: '/houseSurvey/nmfw/connectTask', + url: '/home/homesteadnmfw/connectTask', method: 'post', data: data }) @@ -47,7 +47,7 @@ export function nmfwConnectTask(data) { // 修改数据调查-农民房屋 export function updateNmfw(data) { return request({ - url: '/houseSurvey/nmfw/edit', + url: '/home/homesteadnmfw/edit', method: 'post', data: data }) @@ -56,7 +56,7 @@ export function updateNmfw(data) { // 删除数据调查-农民房屋 export function delNmfw(id) { return request({ - url: '/houseSurvey/nmfw/remove/' + id, + url: '/home/homesteadnmfw/remove/' + id, method: 'get' }) } diff --git a/src/api/homesteadSurvey/shyqr.js b/src/api/homesteadSurvey/shyqr.js index 923930f1..fcadba84 100644 --- a/src/api/homesteadSurvey/shyqr.js +++ b/src/api/homesteadSurvey/shyqr.js @@ -49,7 +49,7 @@ export function getShyqr(id) { // 新增数据调查-使用权人 export function addShyqr(data) { return request({ - url: '/houseSurvey/shyqr/add', + url: '/home/homesteadshyqr/add', method: 'post', data: data }) @@ -58,7 +58,7 @@ export function addShyqr(data) { // 修改数据调查-使用权人 export function updateShyqr(data) { return request({ - url: '/houseSurvey/shyqr/edit', + url: '/home/homesteadshyqr/edit', method: 'post', data: data }) diff --git a/src/api/homesteadSurvey/suyqr.js b/src/api/homesteadSurvey/suyqr.js index 7104ca1e..a2c2b4c5 100644 --- a/src/api/homesteadSurvey/suyqr.js +++ b/src/api/homesteadSurvey/suyqr.js @@ -29,7 +29,7 @@ export function getSuyqr(id) { // 新增数据调查-所有权利人 export function addSuyqr(data) { return request({ - url: '/houseSurvey/suyqr/add', + url: '/home/homesteadsuyqr/add', method: 'post', data: data }) @@ -47,7 +47,7 @@ export function suyqrConnectTask(data) { // 修改数据调查-所有权利人 export function updateSuyqr(data) { return request({ - url: '/houseSurvey/suyqr/edit', + url: '/home/homesteadsuyqr/edit', method: 'post', data: data }) diff --git a/src/api/homesteadSurvey/zjdzd.js b/src/api/homesteadSurvey/zjdzd.js index 445e3886..e5a9018a 100644 --- a/src/api/homesteadSurvey/zjdzd.js +++ b/src/api/homesteadSurvey/zjdzd.js @@ -22,6 +22,14 @@ export function listZjdzd(query) { params: query }) } +// 查询数据调查-签字确认 +export function zjddcSign(data,zjddm) { + return request({ + url: '/home/homesteadzjdzdxx/zjddc/sign/'+zjddm, + method: 'post', + data: data + }) +} // 导出数据调查-宅基地宗地 export function exportZjdzd(query) { return request({ diff --git a/src/api/homesteadSurvey/zrz.js b/src/api/homesteadSurvey/zrz.js index 46306990..43dbb7f8 100644 --- a/src/api/homesteadSurvey/zrz.js +++ b/src/api/homesteadSurvey/zrz.js @@ -21,7 +21,7 @@ export function exportZrz(query) { // 查询数据调查-自然幢详细 export function getZrz(id) { return request({ - url: '/houseSurvey/zrz/get/' + id, + url: '/home/homespacezrz/get/' + id, method: 'get' }) } @@ -29,7 +29,7 @@ export function getZrz(id) { // 新增数据调查-自然幢 export function addZrz(data) { return request({ - url: '/houseSurvey/zrz/add', + url: '/home/homespacezrz/add', method: 'post', data: data }) @@ -38,7 +38,7 @@ export function addZrz(data) { // 修改数据调查-自然幢 export function updateZrz(data) { return request({ - url: '/houseSurvey/zrz/edit', + url: '/home/homespacezrz/edit', method: 'post', data: data }) diff --git a/src/components/Map/MapGisObtainTj.vue b/src/components/Map/MapGisObtainTj.vue new file mode 100644 index 00000000..9aae6f58 --- /dev/null +++ b/src/components/Map/MapGisObtainTj.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 40d2e911..d0b2c50d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2975,6 +2975,96 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/homesteadSurvey/shyqrAdd'], resolve) }, + { + path: '/homesteadSurvey/nhcyAdd', + name: 'nhcyAdd', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/nhcyAdd'], resolve) + }, + { + path: '/homesteadSurvey/hncyList2', + name: 'hncyList2', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/hncyList2'], resolve) + }, + { + path: '/homesteadSurvey/hncyDetails', + name: 'hncyDetails', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/hncyDetails'], resolve) + }, + { + path: '/homesteadSurvey/nhAdd', + name: 'nhAdd', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/nhAdd'], resolve) + }, + { + path: '/homesteadSurvey/nhDetails', + name: 'nhDetails', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/nhDetails'], resolve) + }, + { + path: '/homesteadSurvey/zrzAdd', + name: 'zrzAdd', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/zrzAdd'], resolve) + }, + { + path: '/homesteadSurvey/nhcyList', + name: 'nhcyList', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/nhcyList'], resolve) + }, + { + path: '/homesteadSurvey/nmfwList', + name: 'nmfwList', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/nmfwList'], resolve) + }, + { + path: '/homesteadSurvey/nmfwAdd', + name: 'nmfwAdd', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/nmfwAdd'], resolve) + }, + { + path: '/homesteadSurvey/fsssAdd', + name: 'fsssAdd', + meta: { + title: '宅基地调查', + hidden: true, + }, + component: (resolve) => require(['@/views/homesteadSurvey/fsssAdd'], resolve) + }, { path: '/homesteadSurvey/settle', name: 'homesteadSettle', diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index b7c6bfe5..57cbaa86 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -44,9 +44,9 @@
- +
-

宅基地信息

+

空间信息

@@ -450,8 +727,7 @@
- 保存 - 取消 + 保存
@@ -461,6 +737,8 @@ diff --git a/src/views/homesteadSurvey/add3.vue b/src/views/homesteadSurvey/add3.vue index e39caf45..b00f1313 100644 --- a/src/views/homesteadSurvey/add3.vue +++ b/src/views/homesteadSurvey/add3.vue @@ -65,11 +65,11 @@

{{item.zcs}}

-

+

自然幢信息

-

+

房屋列表

@@ -81,7 +81,7 @@
-

+ 添加自然幢信息

+

+ 添加自然幢信息

@@ -136,13 +136,20 @@ export default { } else { this.$cookies.set("search",""); } - this.$router.push({name:'homesteadList'}); + this.$router.push({name: this.$router.back(-1)}); // } }, - showPopupzrz(){}, - shownmfwlist(){}, + showPopupzrz(val){ + this.$router.push({name:'zrzAdd',query:val}); + }, + showPopupAddzrz(){ + console.info(this.zrzlist[0].zjddm); + this.$router.push({name:'zrzAdd',query:{zjddm:this.zrzlist[0].zjddm}}); + }, + shownmfwlist(val){ + this.$router.push({name:'nmfwList',query:val}); + }, deletezrz(){}, - showPopupzrz(){}, } } diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue index 83b69b80..ff46aed7 100644 --- a/src/views/homesteadSurvey/add4.vue +++ b/src/views/homesteadSurvey/add4.vue @@ -65,9 +65,9 @@

{{item.jzwqk}}

-

+

- 查看附属设施信息 + 查看附属设施信息

@@ -77,26 +77,58 @@
-

+ 添加附属设施信息

+

+ 添加附属设施信息

- 异常标记 + 异常标记

- 签名确认 + 签名确认

- 调查审核 + 调查审核

+ + + + + +

电子签名

+ + + + + + + 清空画板 + 保存提交 + + diff --git a/src/views/homesteadSurvey/fsssAdd.vue b/src/views/homesteadSurvey/fsssAdd.vue new file mode 100644 index 00000000..45b65c5c --- /dev/null +++ b/src/views/homesteadSurvey/fsssAdd.vue @@ -0,0 +1,368 @@ + + + + + diff --git a/src/views/homesteadSurvey/hncyDetails.vue b/src/views/homesteadSurvey/hncyDetails.vue new file mode 100644 index 00000000..bce7bc35 --- /dev/null +++ b/src/views/homesteadSurvey/hncyDetails.vue @@ -0,0 +1,5708 @@ + + + + + diff --git a/src/views/homesteadSurvey/hncyList2.vue b/src/views/homesteadSurvey/hncyList2.vue new file mode 100644 index 00000000..f9b727a5 --- /dev/null +++ b/src/views/homesteadSurvey/hncyList2.vue @@ -0,0 +1,5532 @@ + + + + + diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 55bbc0d7..26074978 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -919,7 +919,7 @@ // 返回 onClickLeft(){ this.$cookies.set("search","") - this.$router.push('/homesteadSurvey/index'); + this.$router.push({name: this.$router.back(-1)}); }, onConfirmhncysjly(value){ this.form5.sjlyName = value.dictLabel diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue index 322c6c36..15162d62 100644 --- a/src/views/homesteadSurvey/list2.vue +++ b/src/views/homesteadSurvey/list2.vue @@ -841,7 +841,7 @@ // 返回 onClickLeft(){ this.$cookies.set("search","") - this.$router.push('/homesteadSurvey/index'); + this.$router.push({name: this.$router.back(-1)}); }, onConfirmhncysjly(value){ this.form5.sjlyName = value.dictLabel @@ -1294,11 +1294,7 @@ "nhdm":item.nhdm, "deptId":this.item.deptId } - listNhhncy(params).then((response) => { - if (response.code == 200) { - this.hncylist = response.rows - } - }); + this.$router.push({name:'hncyList2',query:{nhdm:item.nhdm}}); } }, @@ -1330,6 +1326,7 @@ this.nhform.sjlyName = res.dictLabel } }) + this.$router.push({name:'nhDetails',query:{nhdm:item.nhdm,zjhm:item.zjhm}}); }, getZjdList(){ // let params1 = { diff --git a/src/views/homesteadSurvey/list3.vue b/src/views/homesteadSurvey/list3.vue index 50faae81..301dbf40 100644 --- a/src/views/homesteadSurvey/list3.vue +++ b/src/views/homesteadSurvey/list3.vue @@ -53,8 +53,9 @@ - +
+

所有权人信息

+

代表人信息

@@ -146,46 +148,46 @@ - + +

代理人信息

@@ -227,33 +230,33 @@
@@ -300,7 +303,7 @@ input-align="right" @click="showsjly = true" required - :rules="[{ required: true, message: '数据来源不能为空' }]" + :rules="[{ required: true}]" />
- 保存 + 保存
@@ -1094,7 +1097,7 @@ // 返回 onClickLeft(){ this.$cookies.set("search","") - this.$router.push('/homesteadSurvey/index'); + this.$router.push({name: this.$router.back(-1)}); }, onConfirmhncysjly(value){ this.form5.sjlyName = value.dictLabel @@ -1221,30 +1224,35 @@ }, // 所有权人保存 onSubmitsyqr(){ - if(this.qlrform.id!=null){ - updateSuyqr(this.qlrform).then( - response => { - let _this =this - this.$toast({ - icon: 'success', // 找到自己需要的图标 - message: '修改成功', - duration:"1000" - }) - } - ); - }else{ - this.qlrform.deptId = this.item.deptId - addSuyqr(this.qlrform).then( - response => { - let _this =this - this.$toast({ - icon: 'success', // 找到自己需要的图标 - message: '保存成功', - duration:"1000" - }) - } - ); - } + this.$refs.form.validate().then(() => { + if(this.qlrform.id!=null){ + updateSuyqr(this.qlrform).then( + response => { + let _this =this + this.$toast({ + icon: 'success', // 找到自己需要的图标 + message: '修改成功', + duration:"1000" + }) + } + ); + }else{ + this.qlrform.deptId = this.item.deptId + addSuyqr(this.qlrform).then( + response => { + let _this =this + this.$toast({ + icon: 'success', // 找到自己需要的图标 + message: '保存成功', + duration:"1000" + }) + } + ); + } + }).catch((e) => { + Dialog({ type: 'danger', message: '请填写完整的表单项' }); + }); + }, // 查询所有权人 getSyqr(){ @@ -5268,6 +5276,17 @@ /deep/ .van-swipe-cell__wrapper{ margin-right:-3px; } + .title:before + { + content:""; + width: 6px; + height: 20PX; + background: #7ac943; + border-radius: 3px; + position:absolute; + left:0; + bottom:0; + } .hzlxBtn{ font-size: 0.3rem; display: inline-block; diff --git a/src/views/homesteadSurvey/list4.vue b/src/views/homesteadSurvey/list4.vue index 04f3678e..c1bd337a 100644 --- a/src/views/homesteadSurvey/list4.vue +++ b/src/views/homesteadSurvey/list4.vue @@ -1973,7 +1973,7 @@ // 返回 onClickLeft(){ this.$cookies.set("search","") - this.$router.push('/homesteadSurvey/index'); + this.$router.push({name: this.$router.back(-1)}); }, onConfirmhncysjly(value){ this.form5.sjlyName = value.dictLabel @@ -3094,7 +3094,7 @@ //镇边界查询开始 ------------------------------start // var zhenTc= new ol.layer.Tile({ // source: new ol.source.TileWMS({ - // url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", + // url: that.mapGeoServerUrl+"/wms", // params: { // LAYERS: 'zjd_dc:t_house_survey_border_town', // TILED: true, @@ -3134,7 +3134,7 @@ // outputFormat: "application/json", // //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值 // }; - // let url_dw = that.mapGeoServerUrl + "/geoserver/zjd_dc/wfs"; //wfsurl; + // let url_dw = that.mapGeoServerUrl + "/wfs"; //wfsurl; // url_dw = url_dw + "?"; // for (let key in param_dw) { // url_dw = url_dw + key + "=" + param_dw[key] + "&"; @@ -3153,9 +3153,9 @@ // var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.mapZjdData.zjddm + "'"; // zrzTc = new ol.layer.Image({ // source: new ol.source.ImageWMS({ - // url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", + // url: that.mapGeoServerUrl + "/wms", // params: { - // LAYERS: 'zjd_dc:t_house_survey_zrz', + // LAYERS: 'nsgk_wulanhaote:t_homespace_zrz', // TILED: true, // cql_filter: cql_filter_map, // SRID: 3857, @@ -3169,7 +3169,7 @@ // //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'"; // fsssTc = new ol.layer.Image({ // source: new ol.source.ImageWMS({ - // url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", + // url: that.mapGeoServerUrl + "/wms", // params: { // LAYERS: 'zjd_dc:t_house_survey_fsss', // TILED: true, @@ -3483,37 +3483,37 @@ map.addLayer(zjdTc); //宅基地图层查询开始 ------------------start var zrzTc; - // //自然幢图层查询开始 ------------------start - // var zrzTc = new ol.layer.Image({ - // source: new ol.source.ImageWMS({ - // url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", - // params: { - // LAYERS: 'zjd_dc:t_house_survey_zrz', - // TILED: true, - // cql_filter: cql_filter, - // SRID: 3857, - // TIMESTAMP: new Date().getTime(), - // }, - // }), - // }); - // map.addLayer(zrzTc); - // //自然幢图层查询开始 ------------------start - // + //自然幢图层查询开始 ------------------start + zrzTc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/wms", + params: { + LAYERS: 'nsgk_wulanhaote:t_homespace_zrz', + TILED: true, + cql_filter: cql_filter, + SRID: 3857, + TIMESTAMP: new Date().getTime(), + }, + }), + }); + map.addLayer(zrzTc); + //自然幢图层查询开始 ------------------start + var fsssTc; // //附属设施图层查询开始 ------------------start - // var fsssTc = new ol.layer.Image({ - // source: new ol.source.ImageWMS({ - // url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", - // params: { - // LAYERS: 'zjd_dc:t_house_survey_fsss', - // TILED: true, - // cql_filter: cql_filter, - // SRID: 3857, - // TIMESTAMP: new Date().getTime(), - // }, - // }), - // }); - // map.addLayer(fsssTc); + fsssTc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/wms", + params: { + LAYERS: 'nsgk_wulanhaote:t_homestead_fsss', + TILED: true, + cql_filter: cql_filter, + SRID: 3857, + TIMESTAMP: new Date().getTime(), + }, + }), + }); + map.addLayer(fsssTc); // //附属设施图层查询开始 ------------------start //使用geoserver服务查询开始 -------------------end // if(this.backMap ==1){ @@ -3527,7 +3527,7 @@ // 'CQL_FILTER': cql // }, // serverType: 'geoserver', - // url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", + // url: that.mapGeoServerUrl + "/wms", // }); // zjdTc.setSource(wmsSourceBack); // ol.view.setResolution(ol.view.getResolution() + Math.random() * 0.00000001);//随机数缩放实现刷新 @@ -4186,7 +4186,7 @@ // //查询条件 // var cql_filter_cun; // var cun = that.$cookies.get("item").deptId; - // difang = ["zjd_dc:t_house_survey_zjdzd", "zjd_dc:t_house_survey_zrz","zjd_dc:t_house_survey_fsss"]; + // difang = ["zjd_dc:t_house_survey_zjdzd", "nsgk_wulanhaote:t_homespace_zrz","zjd_dc:t_house_survey_fsss"]; // var tach = 0; // var once = 0; // for (var i = 0; i < difang.length; i++) { @@ -4202,7 +4202,7 @@ // //循环判断查询条件 // if (difang[i] == "zjd_dc:t_house_survey_zjdzd") { // cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'"; - // } else if(difang[i] == "zjd_dc:t_house_survey_zrz") { + // } else if(difang[i] == "nsgk_wulanhaote:t_homespace_zrz") { // cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'"; // } else if(difang[i] == "zjd_dc:t_house_survey_fsss") { // cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'"; @@ -4216,7 +4216,7 @@ // //业务图层 wms服务 // delete_map[i] = new ol.layer.Tile({ // source: new ol.source.TileWMS({ - // url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", + // url: that.mapGeoServerUrl+"/wms", // params: { // LAYERS: difang[i], // //'LAYERS': 'new_shp:new_shp_all', @@ -4242,7 +4242,7 @@ // outputFormat: "application/json", // //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值 // }; - // let url_dw = that.mapGeoServerUrl+"/geoserver/zjd_dc/wfs"; //wfsurl; + // let url_dw = that.mapGeoServerUrl+"/wfs"; //wfsurl; // url_dw = url_dw + "?"; // for (let key in param_dw) { // url_dw = url_dw + key + "=" + param_dw[key] + "&"; @@ -4779,7 +4779,7 @@ outputFormat: "application/json", //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值 }; - let url_dw = that.mapGeoServerUrl+"/geoserver/zjd_dc/wfs"; //wfsurl; + let url_dw = that.mapGeoServerUrl+"/wfs"; //wfsurl; url_dw = url_dw + "?"; for (let key in param_dw) { url_dw = url_dw + key + "=" + param_dw[key] + "&"; @@ -4822,9 +4822,9 @@ //查询全部图层 -------查询叠加图层出现覆盖问题 var wmsSource = new ol.source.TileWMS({ - url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", + url: that.mapGeoServerUrl+"/wms", params: { - LAYERS: "zjd_dc:t_house_survey_all", + LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx", TILED: true, SRID: 3857, serverType: "geoserver", @@ -4861,9 +4861,9 @@ //查询附属设施图层 var FssswmsSource = new ol.source.TileWMS({ - url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", + url: that.mapGeoServerUrl+"/wms", params: { - LAYERS: "zjd_dc:t_house_survey_fsss", + LAYERS: "nsgk_wulanhaote:t_homestead_fsss", TILED: true, SRID: 3857, serverType: "geoserver", @@ -4976,6 +4976,7 @@ } } if (url_bbox) { + console.info(url_bbox); fetch(url_bbox).then((res) => { var geojsonmap = res.json(); return geojsonmap; @@ -5005,6 +5006,7 @@ return response.text(); }) .then(function (html) { + console.info(html); document.getElementById("info").innerHTML = html; if (html.indexOf(" { that.mapZjdData = response.rows[0]; //that.mapZjdAData.active = 1; that.mapZjdTeAll.mapZjdAData = that.mapZjdData; + console.info(obj.id); getZrz(obj.id).then((response) => { if (response.data.scjzmj != "") { that.textMjAll = response.data.scjzmj; @@ -5205,7 +5209,7 @@ projection: projection, features: new ol.format.GeoJSON().readFeatures("{\n" + " \"type\": \"Feature\",\n" + - " \"geometry\":" + that.mapZrzData.theGeom + ", \"properties\":" + JSON.stringify(that.mapZrzData) + "}"), + " \"geometry\":" + that.mapZrzData.theGeomJson + ", \"properties\":" + JSON.stringify(that.mapZrzData) + "}"), }), style: styleZjd }); @@ -5231,9 +5235,9 @@ var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'"; zrzTc = new ol.layer.Image({ source: new ol.source.ImageWMS({ - url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", + url: that.mapGeoServerUrl + "/wms", params: { - LAYERS: 'zjd_dc:t_house_survey_zrz', + LAYERS: 'nsgk_wulanhaote:t_homespace_zrz', TILED: true, cql_filter: cql_filter_map, SRID: 3857, @@ -5247,9 +5251,9 @@ //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'"; fsssTc = new ol.layer.Image({ source: new ol.source.ImageWMS({ - url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", + url: that.mapGeoServerUrl + "/wms", params: { - LAYERS: 'zjd_dc:t_house_survey_fsss', + LAYERS: 'nsgk_wulanhaote:t_homestead_fsss', TILED: true, cql_filter: cql_filter_map, SRID: 3857, @@ -5285,7 +5289,7 @@ projection: projection, features: new ol.format.GeoJSON().readFeatures("{\n" + " \"type\": \"Feature\",\n" + - " \"geometry\":" + that.mapZjdData.theGeom + ", \"properties\":" + JSON.stringify(that.mapZjdData) + "}"), + " \"geometry\":" + that.mapZjdData.theGeomJson+ ", \"properties\":" + JSON.stringify(that.mapZjdData) + "}"), }), style: styleZjd }); @@ -5337,28 +5341,30 @@ sourceMapLookMap.addFeature(newcenterFeatureMap); }); } - } else if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss") { + } else if ($("#info .featureInfo .featureInfo").text() == "t_homestead_fsss") { that.mapZjdTeAll.mapZrzAData = {}; that.mapZjdDataTure = ""; + that.mapXs = true; //that.mapZjdTeAll.mapZjdAData ={}; map.removeLayer(hc_land_on); let obj = {}; that.mapHasDateStatus = 0; let trs = $("#info .featureInfo").find("tr:eq(1)"); let fsssXq = trs.find("td").eq(0).text(); - let fsssIdNum = fsssXq.replace("t_house_survey_fsss.", ""); + let fsssIdNum = fsssXq.replace("t_homestead_fsss.", ""); obj.id = fsssIdNum; // 主键id - obj.deptName = trs.find("td").eq(4).text();//行政区划名称 - obj.zjddm = trs.find("td").eq(1).text();//宅基地代码 + obj.deptName = trs.find("td").eq(3).text();//行政区划名称 + obj.zjddm = trs.find("td").eq(4).text();//宅基地代码 // obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态 // obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型 - obj.jzmj = trs.find("td").eq(8).text(); //建筑面积 + obj.jzmj = trs.find("td").eq(6).text(); //建筑面积 let params = { "deptId": that.$cookies.get("item").deptId, "zjddm": obj.zjddm, "pageSize": 20, } + that.mapClick = obj.zjddm; that.$cookies.remove("search") //if (that.mapZjdData !="" && that.mapZjdData !=null && that.mapZjdData !=undefined) { if(that.mapXs && that.mapClick == obj.zjddm){ @@ -5390,7 +5396,7 @@ projection: projection, features: new ol.format.GeoJSON().readFeatures("{\n" + " \"type\": \"Feature\",\n" + - " \"geometry\":" + that.mapfsssData.theGeom + ", \"properties\":" + JSON.stringify(that.mapfsssData) + "}"), + " \"geometry\":" + that.mapfsssData.theGeomJson + ", \"properties\":" + JSON.stringify(that.mapfsssData) + "}"), }), style: styleZjd }); @@ -5416,9 +5422,9 @@ var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'"; zrzTc = new ol.layer.Image({ source: new ol.source.ImageWMS({ - url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", + url: that.mapGeoServerUrl + "/wms", params: { - LAYERS: 'zjd_dc:t_house_survey_zrz', + LAYERS: 'nsgk_wulanhaote:t_homespace_zrz', TILED: true, cql_filter: cql_filter_map, SRID: 3857, @@ -5432,9 +5438,9 @@ //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'"; fsssTc = new ol.layer.Image({ source: new ol.source.ImageWMS({ - url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", + url: that.mapGeoServerUrl + "/wms", params: { - LAYERS: 'zjd_dc:t_house_survey_fsss', + LAYERS: 'nsgk_wulanhaote:t_homestead_fsss', TILED: true, cql_filter: cql_filter_map, SRID: 3857, @@ -5470,7 +5476,7 @@ projection: projection, features: new ol.format.GeoJSON().readFeatures("{\n" + " \"type\": \"Feature\",\n" + - " \"geometry\":" + that.mapZjdData.theGeom + ", \"properties\":" + JSON.stringify(that.mapZjdData) + "}"), + " \"geometry\":" + that.mapZjdData.theGeomJson + ", \"properties\":" + JSON.stringify(that.mapZjdData) + "}"), }), style: styleZjd }); @@ -5964,19 +5970,34 @@ }, //宅基地点击地图核查 zjdHc(){ + console.info(this.mapZrzData) if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ this.mapZjdTeAll.active =1; //this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search","") - this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); + let trs = $("#info .featureInfo").find("tr:eq(1)"); + let zjdXq = trs.find("td").eq(0).text(); + let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", ""); + getZjdzd(zjdIdNum).then((response) => { + this.mapZjdData = response.data; + this.mapZjdTeAll.active = 1; + this.mapZjdTeAll.mapZjdAData = this.mapZjdData; + //this.$cookies.set("search",this.mapZjdTeAll); + console.info(this.mapZjdTeAll.mapZjdAData); + localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData)); + setTimeout(() => { + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); + }, 500); + }); //this.$router.push({path:'/homesteadSurvey/add'}); }else if(this.mapZrzData !=undefined && this.mapZrzData !=""){ if(this.mapZjdTeAll.mapZjdAData !=""){ this.mapZjdTeAll.active = 3; //this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search","") - this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); + console.info(this.mapZjdTeAll); + this.$router.push({path:'/homesteadSurvey/zrzAdd',query: this.mapZjdTeAll.mapZrzAData}); } else { this.$toast("必须有宅基地数据才能进入自然幢核查"); } @@ -5985,7 +6006,7 @@ this.mapZjdTeAll.active = 4; //this.$cookies.set("search", this.mapZjdTeAll); this.$cookies.set("search","") - this.$router.push({path: '/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); + this.$router.push({path: '/homesteadSurvey/fsssAdd',query: this.mapZjdTeAll.mapFsssAData}); } else { this.$toast("必须有宅基地数据才能进入附属设施核查"); } diff --git a/src/views/homesteadSurvey/nhAdd.vue b/src/views/homesteadSurvey/nhAdd.vue new file mode 100644 index 00000000..c8df4cf7 --- /dev/null +++ b/src/views/homesteadSurvey/nhAdd.vue @@ -0,0 +1,327 @@ + + + + + diff --git a/src/views/homesteadSurvey/nhDetails.vue b/src/views/homesteadSurvey/nhDetails.vue new file mode 100644 index 00000000..98c768ed --- /dev/null +++ b/src/views/homesteadSurvey/nhDetails.vue @@ -0,0 +1,5697 @@ + + + + + diff --git a/src/views/homesteadSurvey/nhcyAdd.vue b/src/views/homesteadSurvey/nhcyAdd.vue new file mode 100644 index 00000000..dcd78372 --- /dev/null +++ b/src/views/homesteadSurvey/nhcyAdd.vue @@ -0,0 +1,355 @@ + + + + + diff --git a/src/views/homesteadSurvey/nhcyList.vue b/src/views/homesteadSurvey/nhcyList.vue new file mode 100644 index 00000000..d0dbda84 --- /dev/null +++ b/src/views/homesteadSurvey/nhcyList.vue @@ -0,0 +1,178 @@ + + + + + diff --git a/src/views/homesteadSurvey/nmfwAdd.vue b/src/views/homesteadSurvey/nmfwAdd.vue new file mode 100644 index 00000000..11079ea3 --- /dev/null +++ b/src/views/homesteadSurvey/nmfwAdd.vue @@ -0,0 +1,563 @@ + + + + + diff --git a/src/views/homesteadSurvey/nmfwList.vue b/src/views/homesteadSurvey/nmfwList.vue new file mode 100644 index 00000000..a58ecd15 --- /dev/null +++ b/src/views/homesteadSurvey/nmfwList.vue @@ -0,0 +1,183 @@ + + + + + diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue index 8639af29..2d3512e9 100644 --- a/src/views/homesteadSurvey/shyqrAdd.vue +++ b/src/views/homesteadSurvey/shyqrAdd.vue @@ -44,7 +44,7 @@ - +

使用权人信息

+ + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
- 保存 - 取消 + 保存 + 取消
@@ -492,6 +322,9 @@ + + From 0856b0daf9a8c1ca781b5d1c4c5e110b48593d27 Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Fri, 12 May 2023 15:16:04 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=AE=85?= =?UTF-8?q?=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homesteadSurvey/list.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 26074978..2a7842f0 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -78,7 +78,7 @@ box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;"> @@ -416,7 +416,7 @@ }, methods: { getList(){ - rhhcList({surveyStatus:"3"}).then(res => { + rhhcList({surveyStatus:"2,3,4,5"}).then(res => { this.list1 = res.data.zjdzdxxList; this.totalH = res.data.zjdzs; this.totalR = res.data.shyqrs; @@ -1228,7 +1228,7 @@ }else{ let params = { "shyqrdbxm" : this.zjdvalue, - "surveyStatus":"3", + "surveyStatus":"2,3,4,5", } rhhcList(params).then((response) => { if (response.code == 200) { @@ -1415,7 +1415,7 @@ if(this.active === 0){ let params = { "shyqrdbxm" : this.zjdvalue, - "surveyStatus":"3", + "surveyStatus":"2,3,4,5", } rhhcList(params).then((response) => { if (response.code == 200) {