Merge remote-tracking branch 'origin/devzpx' into devzpx

# Conflicts: # src/assets/js/cesium-map/measureDistance.js
refactor: 增加主页面（为增加哈希路由），新增地图图形导出KML、Geojson功能，修改引入Cesium的方式，解决打包后地球无法加载的问题，新增public下Cesium资源
1 changed files with 2 additions and 1 deletions
--- a/src/assets/js/cesium-map/measureDistance.js
+++ b/src/assets/js/cesium-map/measureDistance.js
@ -1,5 +1,6 @@
 import * as Cesium from 'cesium'
 import {Cartesian3} from 'cesium'
+import {geojson2kml} from "@/assets/js/DataUtils.js";

 export default class MeasureDistance {
    constructor(viewer) {
@ -798,7 +799,7 @@ export default class MeasureDistance {
            aPolygon.polygon.hierarchy = new Cesium.PolygonHierarchy(drawPolygonPts);
            this.graphics.push(aPolygon)
            this._stopDraw()
-            geojson2kml(this.entity2Geojson(aPolygon))
+            // geojson2kml(this.entity2Geojson(aPolygon))
        }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
    }
    _drawRec(){
Author	SHA1	Message	Date
zhaipx	12872e61ca	Merge remote-tracking branch 'origin/devzpx' into devzpx # Conflicts: # src/assets/js/cesium-map/measureDistance.js	3 weeks ago
zhaipx	02bf513dfe	refactor: 增加主页面（为增加哈希路由），新增地图图形导出KML、Geojson功能，修改引入Cesium的方式，解决打包后地球无法加载的问题，新增public下Cesium资源	3 weeks ago