冲突

src/views/crops/area/index.vue

@@ -323,51 +323,9 @@ function initMap() {
         destination: Cesium.Rectangle.fromDegrees(119.5091, 35.5671, 120.3285, 36.1455),
         duration: 2,
     });
-<<<<<<< HEAD
 
     // 图层点击事件
     layerClick()
-=======
-    var handler = new Cesium.ScreenSpaceEventHandler(viewer.canvas);
-    handler.setInputAction(function (movement) {
-        var ray = viewer.camera.getPickRay(movement.position);
-        var cartesian = viewer.scene.globe.pick(ray, viewer.scene);
-        if (cartesian) {
-            let cartographic = Cesium.Cartographic.fromCartesian(cartesian);
-            if (cartographic) {
-                let xy = new Cesium.Cartesian2();
-                let alti = viewer.camera.positionCartographic.height;
-                let level = getLevel(alti);
-                const layers = viewer.imageryLayers._layers;
-                let providerPoint =null
-                layers.forEach(item => {
-                    if (item._imageryProvider._layers == "shuzisannong:huangdaoqu_town") {
-                        providerPoint=item
-                    }
-                });
-                // 拿取最后一个图层
-                let provider = providerPoint._imageryProvider;
-                console.log(providerPoint);
-                if (provider && provider.ready && provider._layers && providerPoint.show === true) {
-                    xy = provider.tilingScheme.positionToTileXY(cartographic, level, xy);
-                    let promise = provider.pickFeatures(
-                        xy.x,
-                        xy.y,
-                        level,
-                        cartographic.longitude,
-                        cartographic.latitude
-                    );
-                    if (promise) {
-                        promise.then(data => {
-                            if (data.length > 0) {
-                            }
-                        });
-                    }
-                }
-            }
-        }
-    }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
->>>>>>> 49bcfb120ce1d3cf4355582b8c7fe18c523a4a0c
 
     //加载黄岛区村级地图服务
     // Cesium.GeoJsonDataSource.load(
@@ -546,7 +504,6 @@ function getLevel(height) {
     }
 }
 
-<<<<<<< HEAD
 let XZDM = ''
 // 图层点击事件
 function layerClick() {
@@ -666,8 +623,6 @@ function deleteEntityByName(name) {
 }
 
 
-=======
->>>>>>> 49bcfb120ce1d3cf4355582b8c7fe18c523a4a0c
 /*------------------接口--------------------*/
 const getArea = () => {
     getarea({ time: '2023-04-19', subregion: '0', parent: '黄岛区' }).then(res => {