|  | @@ -105,9 +105,9 @@ export default {
 | 
	
		
			
				|  |  |        this.addPolygon();
 | 
	
		
			
				|  |  |        ShapeUpload(formdata).then((res) => {
 | 
	
		
			
				|  |  |          if (res.success) {
 | 
	
		
			
				|  |  | -          var layer = myMap.addGeoJson("common_layer", res.data.geojson);
 | 
	
		
			
				|  |  | -          var url = `${SYS_LAYERS.XZQXZ}/0/query`;
 | 
	
		
			
				|  |  | -          var geom = layer.getSource().getFeatures()[0].getGeometry();
 | 
	
		
			
				|  |  | +          // var layer = myMap.addGeoJson("common_layer", res.data.geojson);
 | 
	
		
			
				|  |  | +          // var url = `${SYS_LAYERS.XZQXZ}/0/query`;
 | 
	
		
			
				|  |  | +          // var geom = layer.getSource().getFeatures()[0].getGeometry();
 | 
	
		
			
				|  |  |            // 判断绘制范围是否在行政区范围内
 | 
	
		
			
				|  |  |            let withinRange = true;
 | 
	
		
			
				|  |  |            // arcMap.SearchWfsData(url, geom, function (fs) {
 | 
	
	
		
			
				|  | @@ -121,18 +121,18 @@ export default {
 | 
	
		
			
				|  |  |            //   } else {
 | 
	
		
			
				|  |  |            //     withinRange = false;
 | 
	
		
			
				|  |  |            //   }
 | 
	
		
			
				|  |  | -          //   if (withinRange) {
 | 
	
		
			
				|  |  | -          //     this.model.xzfw = res.data.filepath;
 | 
	
		
			
				|  |  | -          //     this.model.feature = layer.getSource().getFeatures()[0];
 | 
	
		
			
				|  |  | -          //     this.model.xzmj = new OLTool().Tools.formatArea(
 | 
	
		
			
				|  |  | -          //       this.model.feature.getGeometry(),
 | 
	
		
			
				|  |  | -          //       true
 | 
	
		
			
				|  |  | -          //     );
 | 
	
		
			
				|  |  | -          //     myMap.zoomToextent(layer.getSource().getExtent());
 | 
	
		
			
				|  |  | -          //   } else {
 | 
	
		
			
				|  |  | -          //     this.clearAll();
 | 
	
		
			
				|  |  | -          //     ElMessage.warning("分析范围超出了权限范围,请重新上传文件!");
 | 
	
		
			
				|  |  | -          //   }
 | 
	
		
			
				|  |  | +          if (withinRange) {
 | 
	
		
			
				|  |  | +            this.model.xzfw = res.data.filepath;
 | 
	
		
			
				|  |  | +            //     this.model.feature = layer.getSource().getFeatures()[0];
 | 
	
		
			
				|  |  | +            //     this.model.xzmj = new OLTool().Tools.formatArea(
 | 
	
		
			
				|  |  | +            //       this.model.feature.getGeometry(),
 | 
	
		
			
				|  |  | +            //       true
 | 
	
		
			
				|  |  | +            //     );
 | 
	
		
			
				|  |  | +            //     myMap.zoomToextent(layer.getSource().getExtent());
 | 
	
		
			
				|  |  | +          } else {
 | 
	
		
			
				|  |  | +            //     this.clearAll();
 | 
	
		
			
				|  |  | +            //     ElMessage.warning("分析范围超出了权限范围,请重新上传文件!");
 | 
	
		
			
				|  |  | +          }
 | 
	
		
			
				|  |  |            // });
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        });
 |