Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Query/clickQuery/clickQuery.vue

@@ -415,6 +415,14 @@ export default {
         this.pickPosition(movement);
       }
     },
+    mapSelect(movement) {
+      console.log(window.tempSelect,'window.tempSelect');
+      this.drawPolygon(window.tempSelect)
+      // //拾取模型
+      // let pickedFeature = viewer.scene.pick(movement.position);
+      // console.log(pickedFeature, "pickedFeature");
+    },
+
     async pickClick(pickedFeature) {
       let that = this;
       let eneityName = pickedFeature.primitive.name;
@@ -543,34 +551,19 @@ export default {
         obj.source.split(",") == `${obj.fwgzkj}:${obj.fwmc}`
       );
       let that = this;
-      // let queryByIDParameters = {
-      //   getFeatureMode: "BUFFER",
-      //   // getFeatureMode: "SPATIAL",
-      //   spatialQueryMode: "INTERSECT",
-      //   datasetNames: [`${obj.fwgzkj}:${obj.fwmc}`], //obj.source.split(","),
-      //   geometry: {
-      //     parts: [1],
-      //     points: [{ y: xy.lat, x: xy.lng }],
-      //     type: "POINT",
-      //   },
-      //   bufferDistance: 0.00005,
-      //   hasGeometry: true,
-      // };
       let queryByIDParameters = {
-        // getFeatureMode: "BUFFER",
-        getFeatureMode: "SPATIAL",
+        getFeatureMode: "BUFFER",
+        // getFeatureMode: "SPATIAL",
         spatialQueryMode: "INTERSECT",
         datasetNames: [`${obj.fwgzkj}:${obj.fwmc}`], //obj.source.split(","),
         geometry: {
           parts: [1],
-          // points: [{ y: xy.lat, x: xy.lng }],
-          points: [{"x":109.512284320217,"y":18.2979368144667},{"x":109.5159110704939,"y":18.286557933355265},{"x":109.527722824416,"y":18.29157815286776}],
-          type: "REGION",
+          points: [{ y: xy.lat, x: xy.lng }],
+          type: "POINT",
         },
         bufferDistance: 0.00005,
         hasGeometry: true,
       };
-      console.log('zouzhele');
       let e;
 
       if (obj.type == "S3M") {