diff --git a/src/api/homesteadSurvey/town.js b/src/api/homesteadSurvey/town.js
new file mode 100644
index 00000000..691ab268
--- /dev/null
+++ b/src/api/homesteadSurvey/town.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询镇边界列表
+export function listTown(query) {
+ return request({
+ url: '/houseSurvey/town/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 导出镇边界
+export function exportTown(query) {
+ return request({
+ url: '/houseSurvey/town/export',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询镇边界详细
+export function getTown(fid) {
+ return request({
+ url: '/houseSurvey/town/get/' + fid,
+ method: 'get'
+ })
+}
+
+// 新增镇边界
+export function addTown(data) {
+ return request({
+ url: '/houseSurvey/town/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改镇边界
+export function updateTown(data) {
+ return request({
+ url: '/houseSurvey/town/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除镇边界
+export function delTown(fid) {
+ return request({
+ url: '/houseSurvey/town/remove/' + fid,
+ method: 'get'
+ })
+}
+
diff --git a/src/api/homesteadSurvey/village.js b/src/api/homesteadSurvey/village.js
new file mode 100644
index 00000000..681ad814
--- /dev/null
+++ b/src/api/homesteadSurvey/village.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询村边界列表
+export function listVillage(query) {
+ return request({
+ url: '/houseSurvey/village/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 导出村边界
+export function exportVillage(query) {
+ return request({
+ url: '/houseSurvey/village/export',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询村边界详细
+export function getVillage(fid) {
+ return request({
+ url: '/houseSurvey/village/get/' + fid,
+ method: 'get'
+ })
+}
+
+// 新增村边界
+export function addVillage(data) {
+ return request({
+ url: '/houseSurvey/village/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改村边界
+export function updateVillage(data) {
+ return request({
+ url: '/houseSurvey/village/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除村边界
+export function delVillage(fid) {
+ return request({
+ url: '/houseSurvey/village/remove/' + fid,
+ method: 'get'
+ })
+}
+
diff --git a/src/api/homesteadSurvey/zjdzd.js b/src/api/homesteadSurvey/zjdzd.js
index 5f4259a9..26ef0607 100644
--- a/src/api/homesteadSurvey/zjdzd.js
+++ b/src/api/homesteadSurvey/zjdzd.js
@@ -69,3 +69,11 @@ export function uploadFile(data) {
data: data
})
}
+
+//查询当前登录账号坐标
+export function getQueryLand() {
+ return request({
+ url: '/system/dept/get/current',
+ method: 'get'
+ })
+}
diff --git a/src/assets/images/housesteadSurvey/mark.png b/src/assets/images/housesteadSurvey/mark.png
new file mode 100644
index 00000000..f5f29b0c
Binary files /dev/null and b/src/assets/images/housesteadSurvey/mark.png differ
diff --git a/src/components/Map/MapGisDrawing.vue b/src/components/Map/MapGisDrawing.vue
new file mode 100644
index 00000000..b34d017b
--- /dev/null
+++ b/src/components/Map/MapGisDrawing.vue
@@ -0,0 +1,380 @@
+
+
+
+
+
+
+
diff --git a/src/components/Map/MapGisLine.vue b/src/components/Map/MapGisLine.vue
new file mode 100644
index 00000000..ed8ca783
--- /dev/null
+++ b/src/components/Map/MapGisLine.vue
@@ -0,0 +1,381 @@
+
+
+
+
+
+
+
diff --git a/src/components/Map/MapGisTag.vue b/src/components/Map/MapGisTag.vue
new file mode 100644
index 00000000..e459f178
--- /dev/null
+++ b/src/components/Map/MapGisTag.vue
@@ -0,0 +1,437 @@
+
+
+
+
+
+
+
diff --git a/src/views/homestead/index.vue b/src/views/homestead/index.vue
index 02c76af2..1e03744b 100644
--- a/src/views/homestead/index.vue
+++ b/src/views/homestead/index.vue
@@ -2173,7 +2173,7 @@ export default {
var wmsSource = new ol.source.TileWMS({
//url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms',
- url: "http://116.255.135.38:8080/geoserver/nsgk_hc/wms",
+ url: "http://116.255.223.226:8080/geoserver/nsgk_hc/wms",
//url: 'http://localhost:8888/geoserver/mywork_mysql/wms',
params: {
LAYERS: "nsgk_hc:nsgk_hc_all",
@@ -2202,7 +2202,7 @@ export default {
title: "add Layer",
source: new ol.source.Vector({
projection: projection,
- // url: "http://116.255.135.38:8081/nsgk_test/profile/geojson/huancui.json", //GeoJSON的文件路径,用户可以根据需求而改变
+ // url: "http://116.255.223.226:8081/nsgk_test/profile/geojson/huancui.json", //GeoJSON的文件路径,用户可以根据需求而改变
// format: new ol.format.GeoJSON(),
features: new ol.format.GeoJSON().readFeatures(data),
}),
@@ -2244,7 +2244,7 @@ export default {
// title: "add Layer",
// source: new ol.source.Vector({
// projection: projection,
- // url: "http://116.255.135.38:8081/nsgk_test/profile/geojson/huancui.json", //GeoJSON的文件路径,用户可以根据需求而改变
+ // url: "http://116.255.223.226:8081/nsgk_test/profile/geojson/huancui.json", //GeoJSON的文件路径,用户可以根据需求而改变
// format: new ol.format.GeoJSON(),
// }),
// style: new ol.style.Style({
@@ -2264,7 +2264,7 @@ export default {
// title: "add huancui_zhen",
// source: new ol.source.Vector({
// projection: projection,
- // url: "http://116.255.135.38:8081/nsgk_test/profile/geojson/huancui_zhen.json", //GeoJSON的文件路径,用户可以根据需求而改变
+ // url: "http://116.255.223.226:8081/nsgk_test/profile/geojson/huancui_zhen.json", //GeoJSON的文件路径,用户可以根据需求而改变
// format: new ol.format.GeoJSON(),
// }),
// style: new ol.style.Style({
@@ -2700,7 +2700,7 @@ export default {
nongZt[i] = new ol.layer.Tile({
source: new ol.source.TileWMS({
//url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms',
- url: "http://116.255.135.38:8080/geoserver/nsgk_hc/wms",
+ url: "http://116.255.223.226:8080/geoserver/nsgk_hc/wms",
//url: 'http://localhost:8888/geoserver/mywork_mysql/wms',
//url: 'http://localhost:8888/geoserver/new_shp/wms',
params: {
@@ -2727,7 +2727,7 @@ export default {
outputFormat: "application/json",
//filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值
};
- let url_dw = "http://116.255.135.38:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
+ let url_dw = "http://116.255.223.226:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
url_dw = url_dw + "?";
for (let key in param_dw) {
url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -2859,7 +2859,7 @@ export default {
delete_map[i] = new ol.layer.Tile({
source: new ol.source.TileWMS({
//url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms',
- url: "http://116.255.135.38:8080/geoserver/nsgk_hc/wms",
+ url: "http://116.255.223.226:8080/geoserver/nsgk_hc/wms",
//url: 'http://localhost:8888/geoserver/mywork_mysql/wms',
//url: 'http://localhost:8888/geoserver/new_shp/wms',
params: {
@@ -2887,7 +2887,7 @@ export default {
outputFormat: "application/json",
//filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值
};
- let url_dw = "http://116.255.135.38:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
+ let url_dw = "http://116.255.223.226:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
url_dw = url_dw + "?";
for (let key in param_dw) {
url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -3121,7 +3121,7 @@ export default {
outputFormat: "application/json",
//filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值
};
- let url_dw = "http://116.255.135.38:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
+ let url_dw = "http://116.255.223.226:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
url_dw = url_dw + "?";
for (let key in param_dw) {
url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -3288,7 +3288,7 @@ export default {
outputFormat: "application/json",
//filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值
};
- let url_dw = "http://116.255.135.38:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
+ let url_dw = "http://116.255.223.226:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
url_dw = url_dw + "?";
for (let key in param_dw) {
url_dw = url_dw + key + "=" + param_dw[key] + "&";
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index e5081118..7aa7a986 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -339,6 +339,7 @@
label="备注"
placeholder="备注"
/>
+
保存
@@ -697,6 +698,7 @@
placeholder="备注"
:rules="[{ required: true, message: '' }]"
/>
+
保存
@@ -817,6 +819,7 @@
placeholder="备注"
:rules="[{ required: true, message: '' }]"
/>
+
保存
@@ -930,6 +933,7 @@
placeholder="备注"
:rules="[{ required: true, message: '' }]"
/>
+
保存
@@ -1176,6 +1180,7 @@
查看户主信息
+
保存
@@ -1198,7 +1203,7 @@
个人
- 查看自然幢信息
+ 查看自然幢信息
@@ -1258,7 +1263,7 @@
个人
- 查看附属设施信息
+ 查看附属设施信息
@@ -1280,9 +1285,17 @@