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

src/components/3DAnalysis/Profile3D/Profile3D.vue

@@ -236,7 +236,7 @@ export default {
       );
       screenSpaceEventHandler.setInputAction(function (e) {
         // let handlerLine = that.handlerLine;
-        if (handlerLine.polyline._actualPositions.length == 2) {
+        if (handlerLine.polyline && handlerLine.polyline._actualPositions && handlerLine.polyline._actualPositions.length == 2) {
           var result = {};
           result.object = handlerLine.polyline;
           handlerLine.drawEvt.raiseEvent(result);
@@ -244,6 +244,8 @@ export default {
           screenSpaceEventHandler.removeInputAction(
             Cesium.ScreenSpaceEventType.LEFT_CLICK
           );
+        }else{
+          console.log(handlerLine.polyline,'polyline')
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
     },

src/components/sceneAtttribute/ParticleSystem/ParticleSystem.vue

@@ -631,6 +631,9 @@ export default {
       });
       pointParticleSystemDrawHandler.movingEvt.addEventListener(
         (windowPosition) => {
+          if (!window.tooltip) {
+            window.tooltip = createTooltip(viewer._element);
+          }
           window.tooltip.showAt(
             windowPosition,
             "<p>点击确定粒子位置</p><p>点击选中粒子可进行更改属性</p>"

src/views/complianceAnalysis/components/lsjl.vue

@@ -74,6 +74,7 @@
 </template>
 
 <script>
+import parse from "wellknown";
 import { GetPage, Delect } from "@/api/ghss/hgxfx.js";
 import { Message, MessageBox } from "element-ui";
 import { rest } from "lodash";
@@ -207,7 +208,7 @@ export default {
     },
     zoomItem(item) {
       this.now = item.bsm;
-      this.addPolygon(item.geojson);
+      this.addPolygon(parse(item.geom));
     },
     // 加载GeoJSON数据
     addPolygon(geojson) {