@kq_npm/client3d_webgl_vue 4.5.4-beta → 4.5.6-beta

package/isolineanalysis/index.js

@@ -264,16 +264,14 @@ var message = __webpack_require__(3275);
 
 
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 
 //等值线分析逻辑类
 
 class IsolineAnalysisViewModel {
-  //等值线分析存储参数对象
-
   constructor(scenceView, options) {
     (0,defineProperty/* default */.A)(this, "_elevation", null);
     //等值线分析三维对象
@@ -300,6 +298,9 @@ class IsolineAnalysisViewModel {
       src: const_image_.GREEN_TO_BLUE_URL
     }]);
     (0,defineProperty/* default */.A)(this, "_options", null);
+    //等值线分析存储参数对象
+    (0,defineProperty/* default */.A)(this, "_language", {});
+    this._language = scenceView._language;
     this._options = options;
     this._options.viewer = scenceView._viewer;
     this._options.viewer.scene.globe.depthTestAgainstTerrain = true;
@@ -453,7 +454,7 @@ class IsolineAnalysisViewModel {
       });
     } else {
       (0,message/* default */.A)({
-        message: "请添加地形后分析!",
+        message: this._language["terrainAnalysisTips"],
         type: "warning"
       });
     }

package/measure/index.js

@@ -920,7 +920,7 @@ const __default__ = {
       if (mode.value === "ground") {
         if (!viewModel.checkTerrainAdded()) {
           (0,message/* default */.A)({
-            message: "请先加载地形!",
+            message: language.value["measuretAddTerrainTips"],
             type: "warning"
           });
           return;
@@ -929,7 +929,7 @@ const __default__ = {
       if (mode.value === "model") {
         if (!viewModel.checkModelAdded()) {
           (0,message/* default */.A)({
-            message: "请先加载模型!",
+            message: language.value["measuretAddModelTips"],
             type: "warning"
           });
           return;

package/modelFlat/index.js

@@ -255,9 +255,9 @@ var message = __webpack_require__(3275);
 
 
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 //模型拾取逻辑类
 
@@ -271,32 +271,54 @@ class ModelFlatViewModel {
     //全局参数
     (0,defineProperty/* default */.A)(this, "_removeEventListener", null);
     //绘制完成监听事件
+    (0,defineProperty/* default */.A)(this, "_measureHandler", null);
+    //测量三维对象
+    (0,defineProperty/* default */.A)(this, "_measureResult", null);
+    //测量结果
     (0,defineProperty/* default */.A)(this, "_flatteningPolygonTex", null);
     // 平整对象
     (0,defineProperty/* default */.A)(this, "_assistPolygons", []);
     //平整辅助面数组
     (0,defineProperty/* default */.A)(this, "currentFlatPolygonIndex", -1);
+    (0,defineProperty/* default */.A)(this, "_language", {});
     this._viewer = scenceView._viewer;
     this._options = viewModel;
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
+    this._language = scenceView._language;
     this._drawManager = scenceView._drawManager;
     //Create flattenning controller
-    let kq3dFlattening = new window.Cesium.Kq3dFlattenning(this._viewer, {});
-    //Create flattenedPolygonTexture
-    this._flatteningPolygonTex = kq3dFlattening.createFlattenedPolygonTexture();
-    var models = this._viewer.scene.primitives._primitives;
-    for (let i = 0; i < models.length; i++) {
-      if (models[i]._url) {
-        //Attach 3dTiles
-        this._flatteningPolygonTex.attachTileset(models[i]);
+    var that = this;
+    if (scenceView.g_flattenedPolygonTexture) {
+      this._flatteningPolygonTex = scenceView.g_flattenedPolygonTexture;
+    } else {
+      let kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
+      this._flatteningPolygonTex = kq3dFlattenning.createFlattenedPolygonTexture();
+      var models = this._viewer.scene.primitives._primitives;
+      for (let i = 0; i < models.length; i++) {
+        if (models[i] instanceof Cesium.Cesium3DTileset && models[i]._url) {
+          that._flatteningPolygonTex.attachTileset(models[i]);
+        }
       }
     }
-    let that = this;
-    this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
-      if (shape) {
-        that._options.positions = shape._controlPoints;
-        that.createFlat();
-        that._drawManager.clear();
+    // this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
+    //   if (shape) {
+    //     that._options.positions = shape._controlPoints;
+    //     that.createFlat();
+    //     that._drawManager.clear();
+    //   }
+    // });
+    this._measureHandler = new Cesium.Kq3dMeasureHandler(this._viewer);
+    this._measureHandler.measureEvent.addEventListener(function (result) {
+      that._measureResult = result;
+      result.measureResult.label.show = false;
+    });
+    this._measureHandler.activeEvent.addEventListener(function (ret) {
+      if (ret == false) {
+        if (that._measureResult) {
+          that._options.positions = that._measureResult.positions;
+          that.createFlat();
+          that._measureResult.measureResult.destroy();
+        }
       }
     });
   }
@@ -315,7 +337,7 @@ class ModelFlatViewModel {
       positions: this._options.positions,
       height: this._options.flatHeight
     });
-    this._flatteningPolygonTex.addFlattenedPolygon(myPolygon);
+    this._flatteningPolygonTex && this._flatteningPolygonTex.addFlattenedPolygon(myPolygon);
   }
   // 获取平整数量
   getFlatCount() {
@@ -327,18 +349,18 @@ class ModelFlatViewModel {
     var flag = false;
     var models = this._viewer.scene.primitives._primitives;
     for (let i = 0; i < models.length; i++) {
-      if (models[i]._url) {
+      if (models[i] instanceof Cesium.Cesium3DTileset && models[i]._url) {
+        models[i].flattenDiscard = false;
         flag = true;
       }
     }
     if (flag) {
-      this.remove();
-      this._drawManager.startDraw("polygon", {
-        clampToGround: true
-      });
+      this.remove(!this._options.showFlattenedPolygons);
+      this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.HorizontalArea);
+      // this._drawManager.startDraw("polygon", { clampToGround: true });
     } else {
       (0,message/* default */.A)({
-        message: "请添加模型后绘制!",
+        message: this._language["addModelTips"],
         type: "warning"
       });
     }
@@ -346,7 +368,7 @@ class ModelFlatViewModel {
   // 切换高度重新计算
   setHeight(val) {
     this._options.flatHeight = Number(val);
-    if (this.currentFlatPolygonIndex === -1) {
+    if (this.currentFlatPolygonIndex == -1) {
       this._flatteningPolygonTex.setFlattenedPolygonHeight(-1, Number(val));
     } else {
       this._flatteningPolygonTex.setFlattenedPolygonHeight(this.currentFlatPolygonIndex, Number(val));
@@ -370,21 +392,27 @@ class ModelFlatViewModel {
     this.currentFlatPolygonIndex = val;
   }
   // 清除绘制
-  remove() {
+  remove(bool) {
     this._drawManager.stopDraw();
+    if (bool) {
+      this._flatteningPolygonTex && this._flatteningPolygonTex.removeAllFlattenedPolygon();
+      for (var i = 0; i < this._assistPolygons.length; i++) {
+        this._viewer.entities.remove(this._assistPolygons[i]);
+      }
+      this._assistPolygons = [];
+    }
   }
   // 清除
   clear() {
-    this.remove();
-    this._flatteningPolygonTex.removeAllFlattenedPolygon();
-    for (var i = 0; i < this._assistPolygons.length; i++) {
-      this._viewer.entities.remove(this._assistPolygons[i]);
-    }
-    this._assistPolygons = [];
+    this.remove(true);
+    this._measureResult = null;
+    this._measureHandler.clear();
   }
   //销毁
   destroy() {
     this.clear();
+    this._measureHandler && this._measureHandler.destroy();
+    this._measureHandler = null;
   }
 }
 // EXTERNAL MODULE: external "@kq_npm/client_icons_vue"
@@ -475,7 +503,9 @@ const __default__ = {
       // 模型平整深度范围最小值
       maxFlatDepth: props.settingParams && props.settingParams.maxExcavationDepth || 100,
       // 模型平整深度范围最大值
-      flatteningShow: props.settingParams && props.settingParams.maxExcavationDepth || true // 压平面是否显示
+      flatteningShow: props.settingParams && props.settingParams.maxExcavationDepth || true,
+      // 压平面是否显示
+      showFlattenedPolygons: props.settingParams && props.settingParams.showFlattenedPolygons || false // 是否显示多个压平面分析结果
     });
 
     // 组件容器Ref
@@ -508,14 +538,7 @@ const __default__ = {
       //父组件ScenceView初始化完成后执行
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
-          viewModel = new ModelFlatViewModel(scenceView, {
-            flatHeight: formItem.flatHeight,
-            flatteningShow: formItem.flatteningShow
-          });
-          setTimeout(() => {
-            setCurrentFlatPolygonIndex(0);
-            console.log(getFlatCount());
-          }, 1500);
+          viewModel = new ModelFlatViewModel(scenceView, formItem);
         }
       });
     });

package/modelexcavate/index.js

@@ -257,6 +257,7 @@ class ModelExcavateViewModel {
     (0,defineProperty/* default */.A)(this, "_wallPrimitive", void 0);
     //Kq3dWallPrimitive
     (0,defineProperty/* default */.A)(this, "entity0", null);
+    (0,defineProperty/* default */.A)(this, "_language", {});
     (0,defineProperty/* default */.A)(this, "wall", null);
     (0,defineProperty/* default */.A)(this, "ratio", 0.01);
     (0,defineProperty/* default */.A)(this, "ii", 1);
@@ -268,21 +269,25 @@ class ModelExcavateViewModel {
     (0,defineProperty/* default */.A)(this, "scratchCartesian7", new window.Cesium.Cartesian3());
     (0,defineProperty/* default */.A)(this, "intervalId", null);
     (0,defineProperty/* default */.A)(this, "g_flattenedPolygonTexture", null);
+    this._language = scenceView._language;
     this._viewer = scenceView._viewer;
     this._options = options;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
-
-    let kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
-    this.g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture();
     var that = this;
-    var models = this._viewer.scene.primitives._primitives;
-    for (let i = 0; i < models.length; i++) {
-      if (models[1] instanceof Cesium.Cesium3DTileset && models[i]._url) {
-        models[i].enableFlattenning = true;
-        models[i].flattenDiscard = true;
-        models[i].readyPromise.then(function (tileset) {
-          that.g_flattenedPolygonTexture.attachTileset(tileset);
-        });
+    if (scenceView.g_flattenedPolygonTexture) {
+      this.g_flattenedPolygonTexture = scenceView.g_flattenedPolygonTexture;
+    } else {
+      let kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
+      this.g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture();
+      var models = this._viewer.scene.primitives._primitives;
+      for (let i = 0; i < models.length; i++) {
+        if (models[i] instanceof Cesium.Cesium3DTileset && models[i]._url) {
+          models[i].enableFlattenning = true;
+          models[i].flattenDiscard = true;
+          models[i].readyPromise.then(function (tileset) {
+            that.g_flattenedPolygonTexture.attachTileset(tileset);
+          });
+        }
       }
     }
     this._measureHandler = new Cesium.Kq3dMeasureHandler(this._viewer);
@@ -415,8 +420,8 @@ class ModelExcavateViewModel {
     var models = this._viewer.scene.primitives._primitives;
     for (let i = 0; i < models.length; i++) {
       if (models[i] instanceof Cesium.Cesium3DTileset && models[i]._url) {
-        // models[i].enableFlattenning = true;
-        // models[i].flattenDiscard = true;
+        models[i].enableFlattenning = true;
+        models[i].flattenDiscard = true;
         // models[i].readyPromise.then(function (tileset) {
         //   that.g_flattenedPolygonTexture.attachTileset(tileset);
         // });
@@ -428,7 +433,7 @@ class ModelExcavateViewModel {
       this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.HorizontalArea);
     } else {
       (0,message/* default */.A)({
-        message: "请添加模型后绘制!",
+        message: this._language["addModelTips"],
         type: "warning"
       });
     }
@@ -467,8 +472,8 @@ class ModelExcavateViewModel {
   //销毁
   destroy() {
     this.clear();
-    this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.detachAllTileset();
-    this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.destroy();
+    // this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.detachAllTileset();
+    // this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.destroy();
     this._measureHandler && this._measureHandler.destroy();
     this._measureHandler = null;
   }
@@ -686,7 +691,7 @@ const __default__ = {
       }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
         class: "kq3d-model-excavate-tip"
       }, {
-        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).skylineTips + '(' + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).reverseDrawPolygon + ')'), 1 /* TEXT */)]),
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).skylineTips), 1 /* TEXT */)]),
         _: 1 /* STABLE */
       }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
         onClick: _cache[5] || (_cache[5] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startOperation(), ["stop"])),

package/modelselect/index.js

@@ -254,15 +254,13 @@ var message = __webpack_require__(3275);
 
 
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 //模型拾取逻辑类
 
 class ModelSelectViewModel {
-  // 模型属性匹配字段
-
   constructor(scenceView, pickCallFunc) {
     (0,defineProperty/* default */.A)(this, "_viewer", null);
     //三维viewer对象
@@ -277,6 +275,9 @@ class ModelSelectViewModel {
     (0,defineProperty/* default */.A)(this, "_modeFiledArray", null);
     // 模型属性唯一值字段集合
     (0,defineProperty/* default */.A)(this, "_modeFiled", "id");
+    // 模型属性匹配字段
+    (0,defineProperty/* default */.A)(this, "_language", {});
+    this._language = scenceView._language;
     this._viewer = scenceView._viewer;
     this._drawManager = scenceView._drawManager;
     this._handler = new Cesium.ScreenSpaceEventHandler(this._viewer.scene.canvas);
@@ -341,7 +342,7 @@ class ModelSelectViewModel {
       this._isPick = true;
     } else {
       (0,message/* default */.A)({
-        message: "请添加模型后拾取!",
+        message: this._language["addModelAnalysisTips"],
         type: "warning"
       });
     }

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.5.4-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"sdkNames":["@kq_npm/client_icons_vue"],"restrictedVersion":true,"validateSDK":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"1.1.1","echarts":"5.5.1","echarts-stat":"1.2.0","js-cookie":"3.0.1","omit.js":"2.0.2","save":"2.5.0","tinycolor2":"1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"0.18.5","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.5.6-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"sdkNames":["@kq_npm/client_icons_vue"],"restrictedVersion":true,"validateSDK":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"1.1.1","echarts":"5.5.1","echarts-stat":"1.2.0","js-cookie":"3.0.1","omit.js":"2.0.2","save":"2.5.0","tinycolor2":"1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"0.18.5","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}

package/planeclip/index.js

@@ -255,15 +255,13 @@ var message = __webpack_require__(3275);
 
 
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 //平面裁剪逻辑类
 
 class PlaneClipViewModel {
-  //绘制完成事件监听
-
   constructor(scenceView, options) {
     (0,defineProperty/* default */.A)(this, "_viewer", null);
     //三维viewer对象
@@ -298,10 +296,13 @@ class PlaneClipViewModel {
     (0,defineProperty/* default */.A)(this, "_drawManager", null);
     //绘制管理对象
     (0,defineProperty/* default */.A)(this, "_removeEventListener", null);
+    //绘制完成事件监听
+    (0,defineProperty/* default */.A)(this, "_language", {});
     this._options = Object.assign({}, options, this._defaultOptions);
     this._viewer = scenceView._viewer;
     // this._viewer.enabledFXAA = true;
     this._options.viewer = this._viewer;
+    this._language = scenceView._language;
     this._drawManager = scenceView._drawManager;
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
@@ -354,7 +355,7 @@ class PlaneClipViewModel {
       });
     } else {
       (0,message/* default */.A)({
-        message: "请添加模型后裁剪!",
+        message: this._language["addModelAnalysisTips"],
         type: "warning"
       });
     }

package/scaneffect/index.js

@@ -244,9 +244,9 @@ var const_image_ = __webpack_require__(4822);
 ;// CONCATENATED MODULE: ./src/webgl/scaneffect/ScanEffectViewModel.js
 
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 
 
@@ -660,7 +660,7 @@ class ScanEffectViewModel {
       }
     } else {
       (0,message/* default */.A)({
-        message: "请添加模型后提取!",
+        message: this._language["addModelExtractionTips"],
         type: "warning"
       });
     }

package/sceneadvancedtoimage/index.js

@@ -270,6 +270,8 @@ class SceneAdvancedToImageViewModel {
     (0,defineProperty/* default */.A)(this, "_removeEventListener", null);
     //绘制完成监听事件
     (0,defineProperty/* default */.A)(this, "_satellitePyramidPrimitive", null);
+    (0,defineProperty/* default */.A)(this, "_language", {});
+    this._language = scenceView._language;
     this._viewer = scenceView._viewer;
     this._options = options;
     this._drawManager = scenceView._drawManager;
@@ -318,13 +320,13 @@ class SceneAdvancedToImageViewModel {
         }, 1000);
       } catch (error) {
         (0,message/* default */.A)({
-          message: "出图异常！",
+          message: this._language["toImageErrorTips"],
           type: "error"
         });
       }
     } else {
       (0,message/* default */.A)({
-        message: "请先绘制视椎体！",
+        message: this._language["toImageCentrumOpticusTips"],
         type: "warning"
       });
     }

package/sceneapp/index.js

@@ -9521,9 +9521,9 @@ var _3rd_libs_shp = __webpack_require__(3825);
 ;// CONCATENATED MODULE: external "dompurify"
 var external_dompurify_namespaceObject = require("dompurify");
 ;// CONCATENATED MODULE: ./src/common/_utils/util.js
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */// 获取当前时间返回置顶格式
 /**
  * 安全地设置html元素的innerHTML
@@ -9596,7 +9596,7 @@ return;}let params=new KqGIS.GeometryAnalysis.ShpParserParams({file:file});let d
  * 解析json 文件
  * @file 上传file文件流
  * @callbackFun 回调方法 传入解析后的features数组
- */function readJSON(file,callbackFun){try{let readEncoding="utf-8";let reader=new FileReader();reader.readAsText(file,readEncoding);reader.onload=function(){try{callbackFun(JSON.parse(this.result));}catch(err){callbackFun(this.result);}};reader.onerror=function(error){callbackFun(null);};}catch(error){callbackFun(null);}}/**
+ */function readJSON(file,callbackFun){try{let readEncoding="utf-8";let reader=new FileReader();reader.readAsText(file,readEncoding);reader.onload=function(){try{callbackFun(JSON.parse(this.result));}catch(err){callbackFun(this.result);}};reader.onerror=function(error){callbackFun(null,error);};}catch(error){callbackFun(null,error);}}/**
  * 解析txt文件
  * @file 上传file文件流
  * @callbackFun 回调方法 传入解析后的features数组
@@ -9617,7 +9617,7 @@ if(rows[nextIndex].indexOf("@")!==-1){// 结束上个地块
 getCoor(geoType,pointArr,objarr);dataArr.push({type:geoType,coordinates:objarr});}else{let nextRow=rows[nextIndex].split(",");if(nextRow.length>0){if(nextRow[1]!==arr_row[1]){// 一行的第二个值是代表圈号，圈号不同表示不同的多边形
 getCoor(geoType,pointArr,objarr);pointArr=[];}}}}else{// 最后的行需要加上多边形
 getCoor(geoType,pointArr,objarr);dataArr.push({type:geoType,coordinates:objarr});}}// 地图和服务默认投影都是经纬度的，传入定位的坐标也必须是经纬度的，需要转换
-if(dataArr.length===0){KqMessage({message:language.exporttxterror+"!",type:"error",duration:2000});callbackFun(null);return;}let features=[];for(let d in dataArr){let f=dataArr[d];let feature={type:"Feature",geometry:f};features.push(feature);}let data={type:"FeatureCollection",features:features};if(checkLatLng(dataArr[0])){if(callbackFun){callbackFun(data);}}else{let projectfeatures=[];for(let d in dataArr){let f=dataArr[d];let feature={type:"Feature",geometry:f};projectfeatures.push(feature);}projectTransform(dataUrl,inPrj,"4326",projectfeatures,function(datafeature){let data={type:"FeatureCollection",features:datafeature};if(callbackFun){callbackFun(data);}});}};reader.readAsText(file,"utf-8");function getCoor(type,pointArr,objarr){if(type==="Point"){objarr.push(pointArr[0][0]);objarr.push(pointArr[0][1]);}else if(type==="LineString"){for(let i=0;i<pointArr.length;i++){objarr.push(pointArr[i]);}}else if(type==="Polygon"){objarr.push(pointArr);}}}/**
+if(dataArr.length===0){KqMessage({message:language.exporttxterror+"!",type:"error",duration:2000});callbackFun(null);return;}let features=[];for(let d in dataArr){let f=dataArr[d];let feature={type:"Feature",geometry:f};features.push(feature);}let data={type:"FeatureCollection",features:features};if(checkLatLng(dataArr[0])){if(callbackFun){callbackFun(data);}}else{let projectfeatures=[];for(let d in dataArr){let f=dataArr[d];projToAssign(f,"4326",inPrj);let feature={type:"Feature",geometry:f};projectfeatures.push(feature);}let data={type:"FeatureCollection",features:projectfeatures};if(callbackFun){callbackFun(data);}}};reader.readAsText(file,"utf-8");function getCoor(type,pointArr,objarr){if(type==="Point"){objarr.push(pointArr[0][0]);objarr.push(pointArr[0][1]);}else if(type==="LineString"){for(let i=0;i<pointArr.length;i++){objarr.push(pointArr[i]);}}else if(type==="Polygon"){objarr.push(pointArr);}}}/**
  * 解析文件
  * @file 上传file文件流
  * @callbackFun 回调方法 传入解析后的features数组
@@ -9671,7 +9671,11 @@ return;}coor=transform.inverse(coor);}// 根据geometry对象 获取图形的空
 function getGeoEPSGByFeture(geometry){let _x=0;if(geometry.type.toUpperCase()==="POLYGON"){_x=geometry.coordinates[0][0][0]||geometry.coordinates[0][0];}else if(geometry.type.toUpperCase()==="MULTIPOLYGON"){_x=geometry.coordinates[0][0][0][0]||geometry.coordinates[0][0][0];}else if(geometry.type.toUpperCase()==="POINT"){_x=geometry.coordinates[0][0]||geometry.coordinates[0];}else if(geometry.type.toUpperCase()==="LINESTRING"){_x=geometry.coordinates[0][0]||geometry.coordinates[0];}else{return"+proj=tmerc +lat_0=0 +lon_0=99 +k=1 +x_0=33500000 +y_0=0 +ellps=GRS80 +units=m +no_defs ";}if(_x>-999&&_x<999){return"+proj=longlat +ellps=GRS80 +no_defs +type=crs";}let dh=_x.toString().substr(0,2);const _dh=33;// 以33度带为计算点
 let lon=99;// 以33度带为计算点
 let x=33500000;// 以33度带为计算点
-lon=lon+(Number(dh)-_dh)*3;x=x+(Number(dh)-_dh)*1000000;let a=`+proj=tmerc +lat_0=0 +lon_0=${lon} +k=1 +x_0=${x} +y_0=0 +ellps=GRS80 +units=m +no_defs `;return a;}}/**
+lon=lon+(Number(dh)-_dh)*3;x=x+(Number(dh)-_dh)*1000000;let a=`+proj=tmerc +lat_0=0 +lon_0=${lon} +k=1 +x_0=${x} +y_0=0 +ellps=GRS80 +units=m +no_defs `;return a;}}function projToAssign(geometry,outPrj,inPrj){inPrj="EPSG:"+inPrj;outPrj="EPSG:"+outPrj;// 转换的投影
+let transform=proj4(outPrj,inPrj);let type=geometry.type;let coor=geometry.coordinates;let d,c,p,newPoint;if(type==="Polygon"){for(d in coor){c=coor[d];for(p in c){newPoint=transform.inverse([Number(c[p][0]),Number(c[p][1])]);c[p]=newPoint;}}}else if(type==="MultiPolygon"){for(let r=0;r<coor.length;r++){let _coor=coor[r];for(d in _coor){c=_coor[d];// if (!$.isArray(c)) {
+//     continue;
+// }
+for(p in c){newPoint=transform.inverse([Number(c[p][0]),Number(c[p][1])]);c[p]=newPoint;}}}}else if(type==="LineString"){for(d in coor){newPoint=transform.inverse(coor[d]);coor[d]=newPoint;}}else if(type==="Point"){coor=transform.inverse(coor);}}/**
  * 导出 Excel
  * @tableData 表格数据 数组对象
  * @fields 表格数据中的属性名称
@@ -9699,8 +9703,8 @@ elink.href=_url;elink.setAttribute("download","shapefile.zip");elink.style.displ
  * @param {string} outPrj  //导出的坐标系
  * @param {object} features //要导出的坐标
  */function exportTXT(dataUrl,outPrj,features){if(dataUrl){if(dataUrl.indexOf("?")>=0){let url=dataUrl.split("?")[0];if(url===""||url==="undefined"||url===null){KqMessage({message:"导出Txt失败,没有找到服务地址！",type:"error",duration:2000});return;}}}if(["4490","4326","4610"].includes(outPrj)){let txtBodys=createTxtBody(features);let drawTTitle="[属性描述] \r\n格式版本号=1.0 \r\n数据生产单位=国土资源部 \r\n数据产生日期=[datatime] \r\n坐标系=墨卡托 \r\n投影类型=高斯克吕格 \r\n计量单位=米 \r\n[地块坐标] \r\n";let date=new Date();let time=date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate();drawTTitle=drawTTitle.replace("[datatime]",time);// 设置生成日期
-let evalue=drawTTitle+txtBodys;saveTXT(evalue,"","地块坐标信息.txt");}else{projectTransform(dataUrl,"4326",outPrj,features,function(dataFeatures){let txtBodys=createTxtBody(dataFeatures);let drawTTitle="[属性描述] \r\n格式版本号=1.0 \r\n数据生产单位=国土资源部 \r\n数据产生日期=[datatime] \r\n坐标系=墨卡托 \r\n投影类型=高斯克吕格 \r\n计量单位=米 \r\n[地块坐标] \r\n";let date=new Date();let time=date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate();drawTTitle=drawTTitle.replace("[datatime]",time);// 设置生成日期
-let evalue=drawTTitle+txtBodys;saveTXT(evalue,"","地块坐标信息.txt");});}}// 导出txt方法--总方法
+let evalue=drawTTitle+txtBodys;saveTXT(evalue,"","地块坐标信息.txt");}else{let dataFeatures=[];for(let d=0;d<features.length;d++){let f=features[d].geometry;projToAssign(f,outPrj,"4326");let feature={type:"Feature",geometry:f};dataFeatures.push(feature);}let txtBodys=createTxtBody(dataFeatures);let drawTTitle="[属性描述] \r\n格式版本号=1.0 \r\n数据生产单位=国土资源部 \r\n数据产生日期=[datatime] \r\n坐标系=墨卡托 \r\n投影类型=高斯克吕格 \r\n计量单位=米 \r\n[地块坐标] \r\n";let date=new Date();let time=date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate();drawTTitle=drawTTitle.replace("[datatime]",time);// 设置生成日期
+let evalue=drawTTitle+txtBodys;saveTXT(evalue,"","地块坐标信息.txt");}}// 导出txt方法--总方法
 function createTxtBody(features){let txtBodys="";for(let k in features){let geometry=features[k]["geometry"];let geoType=geometry["type"];let coordinates=geometry["coordinates"];// let RKZQBM = features[k]['properties']['XZQDM'] === undefined ? '' : features[k]['properties']['XZQDM'];
 // let ZQMC = features[k]['properties']['XZQMC'] === undefined ? '' : features[k]['properties']['XZQDM'];
 switch(geoType){case"Point":txtBodys+=createBodyBycoord([[coordinates]],"","","点");break;case"LineString":// this.removeCPointFromCoordinates(coordinates);