e11430a8 by 杨威

修改测试中的问题

1 parent 22eeaff5
......@@ -105,6 +105,17 @@
"XZQMC": "行政区名称",
"XZQMJ": "行政区面积"
}
},
{
"layerName":"JZD",
"layerLabel":"界址点",
"layerUrl":"http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
"id":3
},
{
"layerName":"JZX",
"layerLabel":"界址线",
"layerUrl":"http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
"id":4
}
]
\ No newline at end of file
......
......@@ -513,7 +513,6 @@ export default {
this.$message.warning("不是临时数据,不能导入图形!!!");
return;
}
//先这么写着 后面返回类型 根据类型判断
var type = this.zdData.type;
if(type == "zd"){
BSM = this.zdData.zdbsm;
......
......@@ -544,12 +544,15 @@ export default {
}
savePoints.push(obj);
}
//保存矢量数据表
addjzd(savePoints).then(res=>{
if(res.succcess){
//触发查询接口
console.log("界址点保存成成功!!!");
}
});
//保存空间数据
},
saveJzx(lines){
var jzxLines = [];
......@@ -568,12 +571,15 @@ export default {
}
jzxLines.push(obj);
}
//保存矢量数据表
addjzx(jzxLines).then(res=>{
if(res.success){
//触发查询界址线
console.log("界址线保存成功!!!!!");
}
});
//保存空间数据表
},
saveZRZ(graphic){
var self = this;
......
import {loadModules} from 'esri-loader'
import {loadModules} from 'esri-loader'
export default {
......@@ -19,6 +19,7 @@ export default {
findParameters.layerIds = layerIds;
findParameters.searchFields = searchFields;
findParameters.searchText = searchText;
findParameters.outSpatialReference = {wkid:3857};
findTask.execute(findParameters).then(function (result) {
if(callBackFunction){
callBackFunction(result);
......
......@@ -152,7 +152,9 @@ export default {
if(this.isMap){
this.isMap = false;
}
} else {
} else if(newPath == '/viewMap'){
this.isMap = true;
}else{
}
},
......
......@@ -164,6 +164,8 @@ import ChangeMap from "@/components/map/ChangeMap";
import sideTools from "./mapWeight/sideTools.vue"
import mapTools from './mapWeight/js/mapTools.js'
export default {
inject:['getRightTree','getTreeByBsm'],
components:{
......@@ -190,7 +192,7 @@ export default {
bottomResultDialog:false
}
},
mixins:[mapLayerManager,findTask],
mixins:[mapLayerManager,findTask,mapTools],
mounted(){
var query = this.$route.query
......@@ -331,7 +333,7 @@ export default {
this.clearSearchLayer(this.viewId);
this.dialogVisible = false;
},
closeBufferDialog(){
closeBufferDialog(flag){
//关闭时清除查询结果 清除数据
this.results = [];
this.selectResLayerId =null;
......@@ -340,8 +342,10 @@ export default {
this.heighGraphic = null;
//清除查询图层
this.clearSearchLayer(this.viewId);
this.clearBufferLayer(this.viewId);
this.bottomResultDialog = false;
if(!flag){
this.clearBufferLayer(this.viewId);
}
},
//处理数据
delIdentifyData(data){
......
......@@ -249,10 +249,6 @@ export default {
geometry.spatialReference = {
wkt:wkt
}
var graphic = {
attributes:self.currentClickZd,
geometry:geometry
}
// self.checkGeo(graphic);
self.resultDialog = false;
self.$emit("setGeometry",geometry);
......
......@@ -50,6 +50,7 @@ export default {
symbol:graphicSymbol.fillSymbol.bufferGeoSymbol
})
layer.add(graphic);
view.center = graphic.geometry.extent.center;
if(callBackFunction && typeof callBackFunction == 'function'){
callBackFunction(bufferGeometry);
}
......@@ -119,7 +120,7 @@ export default {
layer.removeAll();
}else {
layer = new GraphicsLayer({
id:"overLayer"
id:"identifyLayer"
})
view.map.add(layer);
}
......
......@@ -150,7 +150,7 @@
</div>
<el-dialog title="图形导入" :visible.sync="importDialog"
width="30%">
<import-geometry @setGeometry="setGeometry"></import-geometry>
<import-geometry @setGeometry = "setBufferGeometry"></import-geometry>
</el-dialog>
</div>
</template>
......@@ -281,7 +281,6 @@
//缓冲区分析
bufferAnalysis(){
this.bufferDialog = true;
},
//缓冲区分析执行语句
toIdentity(){
......@@ -309,7 +308,7 @@
}else{
self.$message.success("暂无数据!!!");
//清除上次的结果 关闭上次的结果 清除地图数据
self.$parent.closeBufferDialog();
self.$parent.closeBufferDialog(true);
}
},true,'all',3,view.extent);
})
......@@ -351,6 +350,8 @@
self.$parent.bottomResultDialog = true;
}else{
self.$message.success("暂无数据!!!");
//清除上次的结果 关闭上次的结果 清除地图数据
self.$parent.closeBufferDialog(true);
}
},true,'all',3,view.extent);
})
......@@ -375,6 +376,8 @@
return;
}
}
//将那个导入图层清除
self.createBuffer(this.importGeo,self.bufferParams.distance,self.viewId,function (bufGeo) {
self.identify(self.layerUrl,self.bufferParams.layerId,bufGeo,function(res){
var resultes = res.results;
......@@ -383,6 +386,8 @@
self.$parent.bottomResultDialog = true;
}else{
self.$message.success("暂无数据!!!");
//清除上次的结果 关闭上次的结果 清除地图数据
self.$parent.closeBufferDialog(true);
}
},true,'all',3,view.extent);
})
......@@ -401,7 +406,7 @@
}
//清除结果图层和绘制图层
this.$parent.closeResultDialog();
this.clearBufferLayer();
this.clearBufferLayer(this.viewId);
},
//获取地籍区/地籍子区数据
getDjqList(){
......@@ -449,7 +454,8 @@
}
},
//设置导入的空间数据
setGeometry(geo){
setBufferGeometry(geo){
debugger
this.importGeo = geo;
this.importDialog = false;
},
......