diff --git a/src/api/onlineHome/phfs/phfs.js b/src/api/onlineHome/phfs/phfs.js index 9c196d13..6bbf54fe 100644 --- a/src/api/onlineHome/phfs/phfs.js +++ b/src/api/onlineHome/phfs/phfs.js @@ -7,4 +7,65 @@ export function getList(data){ method:'get', params:data }) + +} +// 宅基地盘活信息统计 +export function utilizeStatistics(query) { + return request({ + url: '/house/phxxb/utilizeStatistics', + method: 'get', + params: query + }) +} + +// 导出宅基地盘活信息 +export function exportPhxxb(query) { + return request({ + url: '/house/phxxb/export', + method: 'get', + params: query + }) +} + +// 查询宅基地盘活信息详细 +export function getPhxxb(id) { + return request({ + url: '/house/phxxb/get/' + id, + method: 'get' + }) +} + +// 新增宅基地盘活信息 +export function addPhxxb(data) { + return request({ + url: '/house/phxxb/add', + method: 'post', + data: data + }) +} + +// 修改宅基地盘活信息 +export function updatePhxxb(data) { + return request({ + url: '/house/phxxb/edit', + method: 'post', + data: data + }) +} + +// 删除宅基地盘活信息 +export function delPhxxb(id) { + return request({ + url: '/house/phxxb/remove/' + id, + method: 'get' + }) +} + +//通过宅基地编码查询宅基地信息 +export function queryGeoZjdzd(query) { + return request({ + url: '/house/lz/queryGeoZjdzd', + method: 'get', + params: query + }) } diff --git a/src/components/Map/MapGisObtain.vue b/src/components/Map/MapGisObtain.vue index 2f813638..c1c8b331 100644 --- a/src/components/Map/MapGisObtain.vue +++ b/src/components/Map/MapGisObtain.vue @@ -4,7 +4,7 @@
-
+ @@ -100,7 +100,8 @@ export default { projection: projection, features: new ol.format.GeoJSON().readFeatures("{\n" + " \"type\": \"Feature\",\n" + - " \"geometry\":" + response.data[i].zjdzd.theGeom + "}"), + " \"geometry\":" + response.data[i].zjdzd.theGeom + ", " + + " \"properties\":" + JSON.stringify(response.data[i]) + "}"), }), resolution:Math.random() * 0.00000001, style: new ol.style.Style({ @@ -122,7 +123,6 @@ export default { var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - console.log(center); that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 @@ -174,6 +174,7 @@ export default { }); that.map.addLayer(geo_zjdzd); //that.closeMoule = feature.values_.zjddm; + that.$emit('closeMoule', feature.values_.zjddm); var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX; var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY; var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX; @@ -188,6 +189,7 @@ export default { duration: 1000, // 缩放持续时间,默认不需要设置 resolution:Math.random() * 0.00000001, }); + } }); } diff --git a/src/router/index.js b/src/router/index.js index a769e0cc..18806c4f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -753,6 +753,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitList'], resolve) }, + { + path: '/freeExit', + name: 'freeExit', + meta: { + title: '无偿退出', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/freeExit/freeExitList'], resolve) + }, { path: '/paidExitAdd', name: 'paidExitAdd', @@ -762,6 +771,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitAdd'], resolve) }, + { + path: '/freeExitAdd', + name: 'freeExitAdd', + meta: { + title: '无偿退出', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/freeExit/freeExitAdd'], resolve) + }, { path: '/mortgage', name: 'mortgage', @@ -897,6 +915,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitDetail'], resolve) }, + { + path: '/freeExitDetail', + name: 'freeExitDetail', + meta: { + title: '无偿退出详情', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/freeExit/freeExitDetail'], resolve) + }, { path: '/paidExitModify', name: 'paidExitModify', @@ -906,6 +933,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitModify'], resolve) }, + { + path: '/freeExitModify', + name: 'freeExitModify', + meta: { + title: '无偿退出修改', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/freeExit/freeExitModify'], resolve) + }, { path: '/paidUtilizeList', name: 'paidUtilizeList', @@ -960,6 +996,168 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyAdd'], resolve) }, + { + path: '/zzjyDetails', + name: 'zzjyDetails', + meta: { + title: '自主经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyDetails'], resolve) + }, + { + path: '/zzjyModify', + name: 'zzjyModify', + meta: { + title: '修改自主经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyModify'], resolve) + }, + { + path: '/czjyList', + name: 'czjyList', + meta: { + title: '出租经营列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/czjy/czjyList'], resolve) + }, + { + path: '/czjyAdd', + name: 'czjyAdd', + meta: { + title: '添加出租经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/czjy/czjyAdd'], resolve) + }, + { + path: '/czjyModify', + name: 'czjyModify', + meta: { + title: '修改出租经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/czjy/czjyModify'], resolve) + }, + { + path: '/czjyDetails', + name: 'czjyDetails', + meta: { + title: '出租经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/czjy/czjyDetails'], resolve) + }, + { + path: '/rgjyList', + name: 'rgjyList', + meta: { + title: '入股经营列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/rgjy/rgjyList'], resolve) + }, + { + path: '/rgjyAdd', + name: 'rgjyAdd', + meta: { + title: '添加入股经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/rgjy/rgjyAdd'], resolve) + }, + { + path: '/rgjyModify', + name: 'rgjyModify', + meta: { + title: '修改入股经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/rgjy/rgjyModify'], resolve) + }, + { + path: '/rgjyDetails', + name: 'rgjyDetails', + meta: { + title: '入股经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/rgjy/rgjyDetails'], resolve) + }, + { + path: '/hzjyList', + name: 'hzjyList', + meta: { + title: '合作经营列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/hzjy/hzjyList'], resolve) + }, + { + path: '/hzjyAdd', + name: 'hzjyAdd', + meta: { + title: '添加合作经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/hzjy/hzjyAdd'], resolve) + }, + { + path: '/hzjyModify', + name: 'hzjyModify', + meta: { + title: '修改合作经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/hzjy/hzjyModify'], resolve) + }, + { + path: '/hzjyDetails', + name: 'hzjyDetails', + meta: { + title: '合作经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/hzjy/hzjyDetails'], resolve) + }, + { + path: '/zzlyList', + name: 'zzlyList', + meta: { + title: '整治利用列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzly/zzlyList'], resolve) + }, + { + path: '/zzlyAdd', + name: 'zzlyAdd', + meta: { + title: '添加整治利用', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzly/zzlyAdd'], resolve) + }, + { + path: '/zzlyModify', + name: 'zzlyModify', + meta: { + title: '修改整治利用', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzly/zzlyModify'], resolve) + }, + { + path: '/zzlyDetails', + name: 'zzlyDetails', + meta: { + title: '整治利用', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzly/zzlyDetails'], resolve) + }, { path: '/task', name: 'task', diff --git a/src/views/onlineHome/homestead/freeExit/freeExitAdd.vue b/src/views/onlineHome/homestead/freeExit/freeExitAdd.vue new file mode 100644 index 00000000..8d22486f --- /dev/null +++ b/src/views/onlineHome/homestead/freeExit/freeExitAdd.vue @@ -0,0 +1,310 @@ + + + + + diff --git a/src/views/onlineHome/homestead/freeExit/freeExitDetail.vue b/src/views/onlineHome/homestead/freeExit/freeExitDetail.vue new file mode 100644 index 00000000..7a9a4ff0 --- /dev/null +++ b/src/views/onlineHome/homestead/freeExit/freeExitDetail.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/src/views/onlineHome/homestead/freeExit/freeExitList.vue b/src/views/onlineHome/homestead/freeExit/freeExitList.vue new file mode 100644 index 00000000..13a84ee0 --- /dev/null +++ b/src/views/onlineHome/homestead/freeExit/freeExitList.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/onlineHome/homestead/freeExit/freeExitModify.vue b/src/views/onlineHome/homestead/freeExit/freeExitModify.vue new file mode 100644 index 00000000..07d3aae6 --- /dev/null +++ b/src/views/onlineHome/homestead/freeExit/freeExitModify.vue @@ -0,0 +1,309 @@ + + + + + diff --git a/src/views/onlineHome/phfs/czjy/czjyAdd.vue b/src/views/onlineHome/phfs/czjy/czjyAdd.vue new file mode 100644 index 00000000..b2c71a36 --- /dev/null +++ b/src/views/onlineHome/phfs/czjy/czjyAdd.vue @@ -0,0 +1,479 @@ + + + + + diff --git a/src/views/onlineHome/phfs/czjy/czjyDetails.vue b/src/views/onlineHome/phfs/czjy/czjyDetails.vue new file mode 100644 index 00000000..7ae8a8e6 --- /dev/null +++ b/src/views/onlineHome/phfs/czjy/czjyDetails.vue @@ -0,0 +1,450 @@ + + + + + diff --git a/src/views/onlineHome/phfs/czjy/czjyList.vue b/src/views/onlineHome/phfs/czjy/czjyList.vue new file mode 100644 index 00000000..51b268aa --- /dev/null +++ b/src/views/onlineHome/phfs/czjy/czjyList.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/onlineHome/phfs/czjy/czjyModify.vue b/src/views/onlineHome/phfs/czjy/czjyModify.vue new file mode 100644 index 00000000..04e296e9 --- /dev/null +++ b/src/views/onlineHome/phfs/czjy/czjyModify.vue @@ -0,0 +1,501 @@ + + + + + diff --git a/src/views/onlineHome/phfs/hzjy/hzjyAdd.vue b/src/views/onlineHome/phfs/hzjy/hzjyAdd.vue new file mode 100644 index 00000000..ba7c4662 --- /dev/null +++ b/src/views/onlineHome/phfs/hzjy/hzjyAdd.vue @@ -0,0 +1,479 @@ + + + + + diff --git a/src/views/onlineHome/phfs/hzjy/hzjyDetails.vue b/src/views/onlineHome/phfs/hzjy/hzjyDetails.vue new file mode 100644 index 00000000..ce20f247 --- /dev/null +++ b/src/views/onlineHome/phfs/hzjy/hzjyDetails.vue @@ -0,0 +1,450 @@ + + + + + diff --git a/src/views/onlineHome/phfs/hzjy/hzjyList.vue b/src/views/onlineHome/phfs/hzjy/hzjyList.vue new file mode 100644 index 00000000..cd1f9473 --- /dev/null +++ b/src/views/onlineHome/phfs/hzjy/hzjyList.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/onlineHome/phfs/hzjy/hzjyModify.vue b/src/views/onlineHome/phfs/hzjy/hzjyModify.vue new file mode 100644 index 00000000..d31e599a --- /dev/null +++ b/src/views/onlineHome/phfs/hzjy/hzjyModify.vue @@ -0,0 +1,501 @@ + + + + + diff --git a/src/views/onlineHome/phfs/rgjy/rgjyAdd.vue b/src/views/onlineHome/phfs/rgjy/rgjyAdd.vue new file mode 100644 index 00000000..5eae104f --- /dev/null +++ b/src/views/onlineHome/phfs/rgjy/rgjyAdd.vue @@ -0,0 +1,479 @@ + + + + + diff --git a/src/views/onlineHome/phfs/rgjy/rgjyDetails.vue b/src/views/onlineHome/phfs/rgjy/rgjyDetails.vue new file mode 100644 index 00000000..a483eb12 --- /dev/null +++ b/src/views/onlineHome/phfs/rgjy/rgjyDetails.vue @@ -0,0 +1,450 @@ + + + + + diff --git a/src/views/onlineHome/phfs/rgjy/rgjyList.vue b/src/views/onlineHome/phfs/rgjy/rgjyList.vue new file mode 100644 index 00000000..fd11ac03 --- /dev/null +++ b/src/views/onlineHome/phfs/rgjy/rgjyList.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/onlineHome/phfs/rgjy/rgjyModify.vue b/src/views/onlineHome/phfs/rgjy/rgjyModify.vue new file mode 100644 index 00000000..f3fe94dd --- /dev/null +++ b/src/views/onlineHome/phfs/rgjy/rgjyModify.vue @@ -0,0 +1,501 @@ + + + + + diff --git a/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue b/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue index 1007ef46..63017f83 100644 --- a/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue +++ b/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue @@ -44,7 +44,7 @@ input-align="right" > @@ -55,91 +55,59 @@ @cancel="showzjddm = false" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -160,6 +128,7 @@ + + diff --git a/src/views/onlineHome/phfs/zzjy/zzjyList.vue b/src/views/onlineHome/phfs/zzjy/zzjyList.vue index e2f9d087..48ee9721 100644 --- a/src/views/onlineHome/phfs/zzjy/zzjyList.vue +++ b/src/views/onlineHome/phfs/zzjy/zzjyList.vue @@ -21,7 +21,7 @@ @load="getList" > - + - - - - - - - - - - - - - + + + + diff --git a/src/views/onlineHome/phfs/zzly/zzlyAdd.vue b/src/views/onlineHome/phfs/zzly/zzlyAdd.vue new file mode 100644 index 00000000..f9c1b77c --- /dev/null +++ b/src/views/onlineHome/phfs/zzly/zzlyAdd.vue @@ -0,0 +1,450 @@ + + + + + diff --git a/src/views/onlineHome/phfs/zzly/zzlyDetails.vue b/src/views/onlineHome/phfs/zzly/zzlyDetails.vue new file mode 100644 index 00000000..22cd59bb --- /dev/null +++ b/src/views/onlineHome/phfs/zzly/zzlyDetails.vue @@ -0,0 +1,432 @@ + + + + + diff --git a/src/views/onlineHome/phfs/zzly/zzlyList.vue b/src/views/onlineHome/phfs/zzly/zzlyList.vue new file mode 100644 index 00000000..92cde4c8 --- /dev/null +++ b/src/views/onlineHome/phfs/zzly/zzlyList.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/src/views/onlineHome/phfs/zzly/zzlyModify.vue b/src/views/onlineHome/phfs/zzly/zzlyModify.vue new file mode 100644 index 00000000..e493b573 --- /dev/null +++ b/src/views/onlineHome/phfs/zzly/zzlyModify.vue @@ -0,0 +1,455 @@ + + + + + diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue index 92b6fecb..566f9a70 100644 --- a/src/views/onlineHome/workbench.vue +++ b/src/views/onlineHome/workbench.vue @@ -471,6 +471,14 @@

有偿退出

+ +
+
+ +
+
+

无偿退出

+
@@ -538,7 +546,7 @@

自主经营

- +
@@ -546,7 +554,7 @@

出租经营

- +
@@ -554,7 +562,7 @@

入股经营

- +
@@ -562,7 +570,7 @@

合作经营

- +
@@ -693,6 +701,8 @@ this.$router.push({ path: "/mortgage" }); } else if (data == 'paidExit') { this.$router.push({ path: "/paidExit" }); + } else if (data == 'freeExit') { + this.$router.push({ path: "/freeExit" }); } else if (data == 'arbitrationList') { console.log("arbitrationList"); this.$router.push({ path: "/onlineHome/arbitrationList" }); @@ -710,6 +720,14 @@ this.$router.push({ path: "/paidUtilizeList" }); }else if (data == 'zzjyList') { this.$router.push({ path: "/zzjyList" }); + }else if (data == 'czjyList') { + this.$router.push({ path: "/czjyList" }); + }else if (data == 'rgjyList') { + this.$router.push({ path: "/rgjyList" }); + }else if (data == 'hzjyList') { + this.$router.push({ path: "/hzjyList" }); + }else if (data == 'zzlyList') { + this.$router.push({ path: "/zzlyList" }); } } else { this.$dialog.alert({