@kq_npm/client3d_webgl_vue 4.5.4-beta → 4.5.5-beta

package/aspectanalysis/index.js

@@ -225,9 +225,9 @@ var defineProperty = __webpack_require__(6913);
 var message = __webpack_require__(3275);
 ;// CONCATENATED MODULE: ./src/webgl/aspectanalysis/AspectAnalysisViewModel.js
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 /**
  * 坡向逻辑类
@@ -242,6 +242,8 @@ class AspectAnalysisViewModel {
       viewer: null,
       _drawManager: null
     });
+    (0,defineProperty/* default */.A)(this, "_language", {});
+    this._language = scenceView._language;
     this._globaOptions.viewer = scenceView._viewer;
     let options = {
       interval: aspect.interval || 500,
@@ -277,13 +279,13 @@ class AspectAnalysisViewModel {
         }
       } else {
         (0,message/* default */.A)({
-          message: "只支持STK类型的地形分析!",
+          message: this._language["stkTerrainAnalysisTips"],
           type: "warning"
         });
       }
     } else {
       (0,message/* default */.A)({
-        message: "请加载地形后分析!",
+        message: this._language["terrainAnalysisTips"],
         type: "warning"
       });
     }

package/boxclip/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.
  */
 //Box裁剪逻辑类
 
 class BoxClipViewModel {
-  //绘制完成监听事件
-
   constructor(scenceView, options) {
     (0,defineProperty/* default */.A)(this, "_viewer", null);
     //三维viewer对象
@@ -294,6 +292,9 @@ class BoxClipViewModel {
     (0,defineProperty/* default */.A)(this, "_drawManager", null);
     //绘制管理对象
     (0,defineProperty/* default */.A)(this, "_removeEventListener", null);
+    //绘制完成监听事件
+    (0,defineProperty/* default */.A)(this, "_language", {});
+    this._language = scenceView._language;
     this._options = Object.assign({}, options, this._defaultOptions);
     this._viewer = scenceView._viewer;
     // this._viewer.enabledFXAA = true;
@@ -351,7 +352,7 @@ class BoxClipViewModel {
       });
     } else {
       (0,message/* default */.A)({
-        message: "请添加模型后裁剪!",
+        message: this._language["addModelClipTips"],
         type: "warning"
       });
     }

package/clientPrint/index.js

@@ -580,6 +580,11 @@ const __default__ = {
     showLogo: {
       type: Boolean,
       default: false
+    },
+    // 是否使用自定义地图数据
+    useCustomData: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props, {
@@ -594,7 +599,7 @@ const __default__ = {
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.watch)(() => locale.value, (newVal, oldVal) => {
       language.value = messages.value[newVal]["webgl"];
       companyName.value = props.companyName || language.value.comapanyname;
-      systemTime.value = newVal == 'zh' ? getSystemIime() : getSystemEnTime();
+      systemTime.value = newVal == "zh" ? getSystemIime() : getSystemEnTime();
       printObj.value.popTitle = language.value.print;
     });
     const props = __props;
@@ -733,14 +738,34 @@ const __default__ = {
         printState.value = false;
       }
     });
+    let showMap = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
+    let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.reactive)({
+      options: props && props.options,
+      service: props && props.service,
+      scenceInfo: props && props.scenceInfo,
+      defaultShowLayerNames: props && props.defaultShowLayerNames,
+      showToolButtons: props && props.showToolButtons,
+      toolButtonsPosition: props && props.toolButtonsPosition,
+      showLogo: props && props.showLogo
+    });
     let currentClick = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.reactive)({});
     let scaleFloor = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(1);
     let scaleStep = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(0.2);
     // 查询进度条
     let loadState = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
     // 三维球id
-    global_event_default().setDefaultMapInfo("scencePrint", "cesium", null);
+    global_event_default().setWebMap("scencePrint", "cesium", null);
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.onMounted)(() => {
+      if (!props.useCustomData) {
+        global_event_default().getWebMapByMapTarget(props.mapTarget, scenceView => {
+          if (scenceView && scenceView._viewer) {
+            formItem = scenceView._props;
+            showMap = true;
+          }
+        });
+      } else {
+        showMap = true;
+      }
       setTitleDataform.value.data.title = props.printTitle || language.value.oneimage;
       papAnchor.value = "portrait";
       borderStyleValue.value = "printborder1";
@@ -1924,15 +1949,16 @@ const __default__ = {
           ref: printContentDiv
         }, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_21, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("img", {
           src: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(scenceImageUrl)
-        }, null, 8 /* PROPS */, _hoisted_22)]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_scene_view, {
+        }, null, 8 /* PROPS */, _hoisted_22)]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showMap) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createBlock)(_component_kq_scene_view, {
+          key: 0,
           target: 'scencePrint',
-          options: __props.options,
-          service: __props.service,
-          scenceInfo: __props.scenceInfo,
-          showToolButtons: __props.showToolButtons,
-          defaultShowLayerNames: __props.defaultShowLayerNames,
-          toolButtonsPosition: __props.toolButtonsPosition,
-          showLogo: __props.showLogo,
+          options: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).options,
+          service: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).service,
+          scenceInfo: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).scenceInfo,
+          showToolButtons: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).showToolButtons,
+          defaultShowLayerNames: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).defaultShowLayerNames,
+          toolButtonsPosition: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).toolButtonsPosition,
+          showLogo: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).showLogo,
           style: {
             "position": "relative"
           }
@@ -1985,7 +2011,7 @@ const __default__ = {
             }, 8 /* PROPS */, ["title"])], 8 /* PROPS */, _hoisted_24)], 40 /* PROPS, NEED_HYDRATION */, _hoisted_23)), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, item.data.isShow]]);
           }), 128 /* KEYED_FRAGMENT */))]),
           _: 1 /* STABLE */
-        }, 8 /* PROPS */, ["options", "service", "scenceInfo", "showToolButtons", "defaultShowLayerNames", "toolButtonsPosition", "showLogo"])], 512 /* NEED_PATCH */), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_25, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_26, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).printcompany) + "：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(companyName)), 1 /* TEXT */)]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_27, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).printdate) + "：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(systemTime)), 1 /* TEXT */)])])], 512 /* NEED_PATCH */)]),
+        }, 8 /* PROPS */, ["options", "service", "scenceInfo", "showToolButtons", "defaultShowLayerNames", "toolButtonsPosition", "showLogo"])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)("v-if", true)], 512 /* NEED_PATCH */), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_25, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_26, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).printcompany) + "：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(companyName)), 1 /* TEXT */)]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_27, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).printdate) + "：" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(systemTime)), 1 /* TEXT */)])])], 512 /* NEED_PATCH */)]),
         _: 1 /* STABLE */
       })], 512 /* NEED_PATCH */)], 512 /* NEED_PATCH */);
     };

package/excavatefillanalysis/index.js

@@ -235,15 +235,13 @@ var message = __webpack_require__(3275);
 ;// CONCATENATED MODULE: ./src/webgl/excavatefillanalysis/ExcavateFillAnalysisViewModel.js
 
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 //填挖方分析逻辑类
 
 class ExcavateFillAnalysisViewModel {
-  //绘制完成监听事件
-
   constructor(scenceView, options, callback) {
     (0,defineProperty/* default */.A)(this, "_excavateFillAnalysis", null);
     //填挖方分析三维对象
@@ -252,6 +250,9 @@ class ExcavateFillAnalysisViewModel {
     (0,defineProperty/* default */.A)(this, "_options", null);
     //填挖方分析存储参数对象
     (0,defineProperty/* default */.A)(this, "_removeEventListener", null);
+    //绘制完成监听事件
+    (0,defineProperty/* default */.A)(this, "_language", {});
+    this._language = scenceView._language;
     options.viewer = scenceView._viewer;
     options.viewer.scene.globe.depthTestAgainstTerrain = true;
     if (options.cutColor) {
@@ -300,13 +301,13 @@ class ExcavateFillAnalysisViewModel {
         });
       } else {
         (0,message/* default */.A)({
-          message: "只支持STK类型的地形分析!",
+          message: this._language["stkTerrainAnalysisTips"],
           type: "warning"
         });
       }
     } else {
       (0,message/* default */.A)({
-        message: "请加载地形后分析!",
+        message: this._language["terrainAnalysisTips"],
         type: "warning"
       });
     }

package/flight/index.js

@@ -745,7 +745,7 @@ const __default__ = {
     function save() {
       if (pathName.value === "") {
         (0,message/* default */.A)({
-          message: "请输入路径名称!",
+          message: language.value["enterPathName"] + "!",
           type: "warning"
         });
       } else {

package/floodanalysis/index.js

@@ -254,9 +254,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.
  */
 
 //地形淹没分析逻辑类
@@ -274,6 +274,7 @@ class FloodAnalysisViewModel {
     //测量结果
     (0,defineProperty/* default */.A)(this, "_mode", 0);
     //淹没模式
+    (0,defineProperty/* default */.A)(this, "_language", {});
     (0,defineProperty/* default */.A)(this, "_colorImages", [
     //淹没纹理图片集合
     {
@@ -286,6 +287,7 @@ class FloodAnalysisViewModel {
       value: "2",
       src: const_image_.GREEN_TO_BLUE_URL
     }]);
+    this._language = scenceView._language;
     this._mode = options.mode;
     options.viewer = scenceView._viewer;
     options.viewer.scene.globe.depthTestAgainstTerrain = true;
@@ -352,13 +354,13 @@ class FloodAnalysisViewModel {
           this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.HorizontalArea);
         } else {
           (0,message/* default */.A)({
-            message: "只支持STK类型的地形分析!",
+            message: this._language["stkTerrainAnalysisTips"],
             type: "warning"
           });
         }
       } else {
         (0,message/* default */.A)({
-          message: "请加载地形后分析!",
+          message: this._language["terrainAnalysisTips"],
           type: "warning"
         });
       }
@@ -376,7 +378,7 @@ class FloodAnalysisViewModel {
         this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.HorizontalArea);
       } else {
         (0,message/* default */.A)({
-          message: "请添加模型后分析!",
+          message: this._language["addModelAnalysisTips"],
           type: "warning"
         });
       }

package/geologicalbodyanalysis/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.
  */
 //地质体分析逻辑类
 
@@ -270,6 +270,8 @@ class GeologicalBodyAnalysisViewModel {
     (0,defineProperty/* default */.A)(this, "_geologyBody", null);
     //地质体分析三维对象
     (0,defineProperty/* default */.A)(this, "_measureHandler", null);
+    (0,defineProperty/* default */.A)(this, "_language", {});
+    this._language = scenceView._language;
     this._options = options;
     this._viewer = scenceView._viewer;
     this._measureHandler = new Cesium.Kq3dMeasureHandler(scenceView._viewer);
@@ -369,7 +371,7 @@ class GeologicalBodyAnalysisViewModel {
       }
     } else {
       (0,message/* default */.A)({
-        message: "请添加地质体后分析!",
+        message: this._language["addGeologyBodyTips"],
         type: "warning"
       });
     }

package/gpuspatialquery/index.js

@@ -247,15 +247,13 @@ var message = __webpack_require__(3275);
 ;// CONCATENATED MODULE: ./src/webgl/gpuspatialquery/GPUSpatialQueryViewModel.js
 
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 //GPU空间查询逻辑类
 
 class GPUSpatialQueryViewModel {
-  //绘制完成监听事件
-
   constructor(scenceView, options) {
     (0,defineProperty/* default */.A)(this, "_gpuSpatialQuery", null);
     //GPU查询三维对象
@@ -270,6 +268,9 @@ class GPUSpatialQueryViewModel {
     (0,defineProperty/* default */.A)(this, "finishedQuery", null);
     //绘制后的查询事件
     (0,defineProperty/* default */.A)(this, "_removeEventListener", null);
+    //绘制完成监听事件
+    (0,defineProperty/* default */.A)(this, "_language", {});
+    this._language = scenceView._language;
     options.viewer = scenceView._viewer;
     options.viewer.scene.globe.depthTestAgainstTerrain = true;
     options.viewer.scene.logarithmicDepthBuffer = true;
@@ -348,7 +349,7 @@ class GPUSpatialQueryViewModel {
       });
     } else {
       (0,message/* default */.A)({
-        message: "请添加模型后分析!",
+        message: this._language["addModelAnalysisTips"],
         type: "warning"
       });
     }

package/heatmap3d/index.js

@@ -700,9 +700,9 @@ var defineProperty = __webpack_require__(6913);
 var message = __webpack_require__(3275);
 ;// CONCATENATED MODULE: ./src/webgl/heatmap3d/Heatmap3dViewModel.js
 
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
  */
 //热力图
 
@@ -762,7 +762,7 @@ class Heatmap3dViewModel {
             lat: lat
           }));
         }
-        (0,util_.setInnerHtml)(document.getElementById('mouse_lonlat'), `<p>${that.language['longitude'] || "经度"}：${lon.toFixed(5)}</p><p>${that.language['latitude'] || "纬度"}：${lat.toFixed(5)}</p><p>${that.language['heatValue'] || "热力值"}：${val}</p>`);
+        (0,util_.setInnerHtml)(document.getElementById('mouse_lonlat'), `<p>${that.language['longitude'] || "longitude"}：${lon.toFixed(5)}</p><p>${that.language['latitude'] || "latitude"}：${lat.toFixed(5)}</p><p>${that.language['heatValue'] || "value"}：${val}</p>`);
         that._mouseLabel.setVisible(true);
       } else {
         that._mouseLabel.setVisible(false);