From fcc5348307a44b2312b168e98e880c0e60f3c19e Mon Sep 17 00:00:00 2001 From: Surpriseplus <845948745@qq.com> Date: 星期一, 27 三月 2023 16:07:53 +0800 Subject: [PATCH] 一张图底图切换优化;综合展示,图层管理模型添加透明度设置;目录管理添加目录下载功能;附件预览添添加图片设置 --- src/components/preview_map.vue | 79 ++++++++++++++++++++++++++++++++++----- 1 files changed, 69 insertions(+), 10 deletions(-) diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue index f99013c..97bfd1b 100644 --- a/src/components/preview_map.vue +++ b/src/components/preview_map.vue @@ -512,12 +512,23 @@ setAttatchDetail(index, row) { this.refreshAttatchDetail() var name = row.name; - if (name.indexOf('.pdf') != -1) { + if (name.indexOf('.pdf') != -1 || name.indexOf('.PDF') != -1) { this.dialog.dialogVisible = true; this.dialog.isPdf = true; var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken(); this.dialog.src = url - } else if (name.indexOf('.jpg') != -1 || name.indexOf('.gif') != -1 || name.indexOf('.png') != -1 || name.indexOf('.jpeg') != -1) { + } else if ( + name.indexOf('.jpg') != -1 + || name.indexOf('.gif') != -1 + || name.indexOf('.png') != -1 + || name.indexOf('.jpeg') != -1 + || name.indexOf('.JPG') != -1 + || name.indexOf('.GIF') != -1 + || name.indexOf('.PNG') != -1 + || name.indexOf('.JPEG') != -1 + || name.indexOf('.BMP') != -1 + || name.indexOf('.bmp') != -1 + ) { this.dialog.dialogVisible = true; this.dialog.isJpg = true; var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken(); @@ -590,7 +601,20 @@ matchState(state = "", reg) { var row = state.row; var name = row.name; - if (name.indexOf('.pdf') != -1 || name.indexOf('.jpg') != -1 || name.indexOf('.gif') != -1 || name.indexOf('.png') != -1 || name.indexOf('.jpeg') != -1) { + if ( + name.indexOf('.jpg') != -1 + || name.indexOf('.gif') != -1 + || name.indexOf('.png') != -1 + || name.indexOf('.jpeg') != -1 + || name.indexOf('.JPG') != -1 + || name.indexOf('.GIF') != -1 + || name.indexOf('.PNG') != -1 + || name.indexOf('.JPEG') != -1 + || name.indexOf('.BMP') != -1 + || name.indexOf('.bmp') != -1 + || name.indexOf('.pdf') != -1 + || name.indexOf('.PDF') != -1 + ) { return true; } @@ -1014,21 +1038,36 @@ return Math.round(d * p) / p; }, update() { - if (isNaN(this.modelForm.lon) || !this.modelForm.lon) { + if (!this.modelForm.lon || isNaN(this.modelForm.lon)) { + var args = this.getEditTilesetArgs(); + this.modelForm.lon = args.lon; return } - if (isNaN(this.modelForm.lat) || !this.modelForm.lat) { + if (!this.modelForm.lat || isNaN(this.modelForm.lat)) { + var args = this.getEditTilesetArgs(); + this.modelForm.lat = args.lat; return } - if (isNaN(this.modelForm.height) || !this.modelForm.height) { + if (!this.modelForm.height || isNaN(this.modelForm.height)) { + var args = this.getEditTilesetArgs(); + this.modelForm.height = args.height; return } - if (isNaN(this.modelForm.alpha) || !this.modelForm.alpha) { + if (!this.modelForm.yaw || isNaN(this.modelForm.yaw)) { + this.modelForm.yaw = 0; return } - if (isNaN(this.modelForm.yaw) || !this.modelForm.yaw) { - return - } + // if (!this.modelForm.alpha || isNaN(this.modelForm.alpha)) { + + // if (this.app.under) { + // + // this.modelForm.alpha = sgworld._Analysis._UndergroundMode._alpha; + // } else { + // this.modelForm.alpha = 1 + // } + // return + + // } this.setTilesetArgs(this.modelForm); sgworld.Analysis.UndergroundMode(this.app.under, this.modelForm.alpha) }, @@ -1125,6 +1164,7 @@ var cm = this.app.tileset._root.transform; var cartesian = new Cesium.Cartesian3(cm[12], cm[13], cm[14]); var carto = Cesium.Cartographic.fromCartesian(cartesian); + if (carto) { this.modelForm.lon = Cesium.Math.toDegrees(carto.longitude).toFixed(7); this.modelForm.lat = Cesium.Math.toDegrees(carto.latitude).toFixed(7); @@ -1132,6 +1172,25 @@ } this.app.isBusy = false; }, + getEditTilesetArgs() { + this.app.isBusy = true; + var cm = this.app.tileset._root.transform; + var cartesian = new Cesium.Cartesian3(cm[12], cm[13], cm[14]); + var carto = Cesium.Cartographic.fromCartesian(cartesian); + var std = { + lon: null, + lat: null, + height: null, + } + + if (carto) { + std.lon = Cesium.Math.toDegrees(carto.longitude).toFixed(7); + std.lat = Cesium.Math.toDegrees(carto.latitude).toFixed(7); + std.height = carto.height.toFixed(3); + } + this.app.isBusy = false; + return std + }, async setShowModelLayer() { const data = await perms_selectLayers(); -- Gitblit v1.9.3