diff --git a/src/router/index.js b/src/router/index.js index 5234950..6759f07 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,7 +7,7 @@ Vue.use(VueRouter) const routes = [ // { - // path: '/', + // path: '/home', // name: 'home', // component: HomeView, // }, diff --git a/src/views/home/home.vue b/src/views/home/home.vue index cd2037e..2d80f46 100644 --- a/src/views/home/home.vue +++ b/src/views/home/home.vue @@ -46,13 +46,7 @@
参数
- +
隐蔽添加
- + @@ -125,7 +119,7 @@ 参与路线规划
- + diff --git a/src/views/residentAnalysis/index.vue b/src/views/residentAnalysis/index.vue index 120ea11..28f3fba 100644 --- a/src/views/residentAnalysis/index.vue +++ b/src/views/residentAnalysis/index.vue @@ -5,19 +5,17 @@ - 确定 -
- - 导出 - - json编辑 +
确定
+
+
导出
+
json编辑
- +
范围
@@ -118,7 +116,7 @@
道路附属点 - 新增 +
新增
@@ -161,7 +159,7 @@
道路附属线 - 新增 +
新增
@@ -206,7 +204,7 @@
水系附属点 - 新增 +
新增
@@ -249,7 +247,7 @@
水系附属线 - 新增 +
新增
@@ -292,8 +290,8 @@ @@ -685,19 +683,13 @@ export default { // 判断矩形与 mars3d GeoJSON 图层是否相交(不转 GeoJSON) getIntersectId(position, layer) { - console.log('position===>', position, layer) if (!position || !layer || !layer.graphics) return null const rectCoords = position.concat([position[0]]) // 闭合 - console.log('rectCoords===>', rectCoords) - const rectPoly = turf.polygon([rectCoords]) - console.log('rectPoly===>', rectPoly) const [minX, minY, maxX, maxY] = turf.bbox(rectPoly) // 矩形 bbox - console.log('minX, minY, maxX, maxY===>', minX, minY, maxX, maxY) - let fc = this._polyCache.get(layer) if (!fc) { @@ -1327,7 +1319,7 @@ export default { .then((response) => { this.jsonInfo = { path: response.data.path, - json: JSON.stringify(response.data.json, null, 2), + json: JSON.stringify(this.decodeEscapedJson(response.data.json), null, 2), } this.jsonLoading = false }) @@ -1431,34 +1423,26 @@ export default {