From 04dae190af26730e8e0dcfb7cb4ec066400422f3 Mon Sep 17 00:00:00 2001 From: Surpriseplus <845948745@qq.com> Date: 星期一, 14 八月 2023 16:43:25 +0800 Subject: [PATCH] 生产环境加载高德地图显示空白修改 --- src/components/preview_map.vue | 345 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 295 insertions(+), 50 deletions(-) diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue index fe756a7..2060f0b 100644 --- a/src/components/preview_map.vue +++ b/src/components/preview_map.vue @@ -26,6 +26,7 @@ :props="defaultProps" @node-click="handleNodeClick" @check="handleCheckChange" + @node-contextmenu="rightClick" > </el-tree> </div> @@ -42,39 +43,51 @@ <el-form-item> <el-button size="small" + v-if="$store.state.previewLayer.type == 'mpt'" + @click="setcropping" + >瑁佸壀</el-button> + <el-button + size="small" + v-if="$store.state.previewLayer.type != 'mpt'" @click="locateTo" >瀹氫綅</el-button> <el-button size="small" + v-if="$store.state.previewLayer.type != 'mpt'" @click="showTileset" >鏄鹃殣</el-button> <el-button size="small" + v-if="$store.state.previewLayer.type != 'mpt'" @click="setUndergroundMode" >鍦颁笅</el-button> <el-button - v-if="$store.state.previewLayer.type != '3dml' && - $store.state.previewLayer.type !='cpt'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" size="small" @click="pickupCoords" >鎷惧彇</el-button> <el-button - v-if="$store.state.previewLayer.type != '3dml' && - $store.state.previewLayer.type !='cpt'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" size="small" @click="reload" > 閲嶈浇 </el-button> <el-button - v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml'&& - $store.state.previewLayer.type !='cpt'" + v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" size="small" @click="getModeKeyId" >妯″瀷涓婚敭</el-button> <el-button - v-if="$store.state.previewLayer.type != '3dml'&& - $store.state.previewLayer.type !='cpt'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' + " size="small" @click="resave" >淇濆瓨</el-button> @@ -82,8 +95,9 @@ </el-form-item> <el-form-item label="缁忓害:" - v-if="$store.state.previewLayer.type != '3dml'&& - $store.state.previewLayer.type !='cpt'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" > <el-input size="small" @@ -93,8 +107,9 @@ </el-form-item> <el-form-item label="绾害:" - v-if="$store.state.previewLayer.type != '3dml'&& - $store.state.previewLayer.type !='cpt'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" > <el-input size="small" @@ -104,8 +119,9 @@ </el-form-item> <el-form-item label="楂樺害:" - v-if="$store.state.previewLayer.type != '3dml'&& - $store.state.previewLayer.type !='cpt'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" > <el-input size="small" @@ -115,12 +131,23 @@ </el-form-item> <el-form-item label="瑙掑害:" - v-if="$store.state.previewLayer.type != '3dml'&& - $store.state.previewLayer.type !='cpt'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" > <el-input size="small" v-model="modelForm.yaw" + ></el-input> + + </el-form-item> + <el-form-item + label="姣斾緥:" + v-if="$store.state.previewLayer.type == 'las'" + > + <el-input + size="small" + v-model="modelForm.scale" ></el-input> </el-form-item> @@ -151,6 +178,7 @@ <el-tab-pane label="灞炴��" name="first" + v-if="serveType" > <el-form ref="form" @@ -189,14 +217,16 @@ plain size="small" @click="InsertData" - >{{$t('common.increase')}}</el-button> + >{{ + $t('common.increase') }}</el-button> <el-button v-show="!isShowModel" type="info" plain size="small" @click="EditData" - >{{$t('common.update')}}</el-button> + >{{ $t('common.update') + }}</el-button> </el-form-item> </el-form> @@ -222,10 +252,10 @@ id="insertFile" multiple="multiple" style="display: none" - @change="insertFile( )" + @change="insertFile()" /> <el-link - @click="getInsertFile( )" + @click="getInsertFile()" :underline="false" ><i class="el-icon-folder-opened"></i></el-link> </el-form-item> @@ -236,14 +266,15 @@ class="elLink" :underline="false" @click="setAttachInsert" - >{{$t('common.append')}}</el-link> + >{{ $t('common.append') + }}</el-link> </el-col> <el-col :span="3"> <el-link class="elLink" :underline="false" @click="setAttachDel" - >{{$t('common.delete')}}</el-link> + >{{ $t('common.delete') }}</el-link> </el-col> </el-row> @@ -368,11 +399,24 @@ type="primary" size="small" @click="setSureKeyModelKey" - >{{$t('common.confirm')}}</el-button> + >{{ $t('common.confirm') }}</el-button> </el-form-item> </el-form> </div> <undergroundModel ref="undergroundModel" /> + <el-card + class="box-card" + ref="card" + :style="{ ...rightClickMenuStyle }" + v-show="menuVisible" + > + <div + class="edit" + @click="setShowFile" + > + <i class="el-icon-tickets"></i> 闄勪欢 + </div> + </el-card> </div> </template> @@ -385,7 +429,8 @@ comprehensive_selectFiles, dataQuery_deletes, publish_update, - comprehensive_selectPubById + comprehensive_selectPubById, + resSelectCountForRole } from '../api/api.js'; import { getToken } from '@/utils/auth'; import undergroundModel from '../views/Tools/undergroundModel.vue' @@ -419,7 +464,8 @@ info: '', icon: '', bak: '', - Id: '' + Id: '', + }, options: [ { @@ -461,6 +507,11 @@ yaw: 0, alpha: 1, modelid: null, + west: null, + south: null, + east: null, + north: null, + scale: 1 }, app: { tileset: null, @@ -471,12 +522,68 @@ modelLayerId: null, optionKey: [], modelKeyFlag: false, + menuVisible: false, + rightClickMenuStyle: {}, // 鍙抽敭鑿滃崟鏍峰紡 + serveType: true, + layerData: "lf.sys_style" } }, mounted() { this.init3DMap(); }, methods: { + // 榧犳爣鍙冲嚮浜嬩欢 + rightClick(event, object, node, element) { + if (object.type == 1 || node.data.children != null) return; + if (object.serveType != "TMS" && object.serveType != "DEM") return + + this.menuVisible = true + var type; + if (object.serveType == "TMS") { + type = 'dom_' + this.layerData = "DOM" + } else if (object.serveType == "DEM") { + type = 'dem_' + this.layerData = "DEM" + } + this.serveType = false + this.activeName = 'second' + this.formInline.Id = type + object.id; + this.layerID = type + object.id; + this.$refs.card.$el.style.left = event.pageX + 20 + "px"; + this.$refs.card.$el.style.top = event.pageY + "px"; + + }, + setShowFile() { + + this.dialogVisible = true; + this.getAttacthFlieList(); + this.menuVisible = false + }, + //瑁佸壀 + setcropping() { + var that = this; + sgworld.Creator.SimpleGraphic.clear() + sgworld.Creator.SimpleGraphic.edit(false, { editProp: false }); + sgworld.Creator.createSimpleGraphic( + "rectangle", {}, + function (entity) { + that.modelForm.east = Cesium.Math.toDegrees( + entity.rectangle.coordinates.getValue().east + ); + that.modelForm.north = Cesium.Math.toDegrees( + entity.rectangle.coordinates.getValue().north + ); + that.modelForm.west = Cesium.Math.toDegrees( + entity.rectangle.coordinates.getValue().west + ); + that.modelForm.south = Cesium.Math.toDegrees( + entity.rectangle.coordinates.getValue().south + ); + + } + ); + }, setUndergroundMode() { if (window.UndergroundMode) { this.$refs && @@ -548,7 +655,7 @@ } - $.ajax(BASE_URL + "/comprehensive/uploadFiles?token=" + token + "&tabName=lf.sys_style&eventid=" + this.layerID, + $.ajax(BASE_URL + "/comprehensive/uploadFiles?token=" + token + "&tabName=" + this.layerData + "&eventid=" + this.layerID, { type: "post", data: formData, @@ -625,7 +732,7 @@ async getAttacthFlieList() { var obj = { eventid: this.layerID, - tabName: "lf.sys_style" + tabName: this.layerData }; const res = await comprehensive_selectFiles(obj); if (res.code != 200) { @@ -689,6 +796,8 @@ }, handleClose() { + this.layerData = "lf.sys_style" + this.serveType = true; this.dialogVisible = false; this.formInline = { title: '', @@ -761,7 +870,18 @@ this.formInline.title = this.formInline.name; } }, - setChangeTileset(result) { + setChangeTileset(result, check) { + + var nodes = this.$refs.tree.getCheckedNodes(); + var str = []; + for (var i = 0; i < nodes.length; i++) { + var node = this.$refs.tree.getNode(nodes[i]).data.serveType; + if (node != 'DEM') { + str.push(nodes[i]) + } + } + str.push(result[0].id) + this.$refs.tree.setCheckedKeys(str) var value = this.$refs.tree.getCheckedNodes(); var std = []; for (var i in value) { @@ -772,9 +892,33 @@ if (std.indexOf(tile.id) != -1) { this.setAddLayers(tile) } else { - for (var j in Viewer.scene.primitives._primitives) { - if (Viewer.scene.primitives._primitives[j].id == tile.cnName) { - Viewer.scene.primitives.remove(Viewer.scene.primitives._primitives[j]) + if (tile.serveType == 'DEM') { + + if (window.terrainFlag == '2') { + window.terrainLayer.deleteObject(); + } else if (window.terrainFlag == '1') { + Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider(); + } + + // + var option = { + url: window.sceneConfig.SGUrl, + layerName: window.sceneConfig.mptName, + requestVertexNormals: true, + }; + window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, ""); + } else if (tile.serveType == 'TMS') { + for (let i = 0; i < window.Viewer.imageryLayers._layers.length; i++) { + if (window.Viewer.imageryLayers._layers[i].name == result.cnName) { + window.Viewer.imageryLayers.remove(window.Viewer.imageryLayers._layers[i]); + break; + } + } + } else { + for (var j in Viewer.scene.primitives._primitives) { + if (Viewer.scene.primitives._primitives[j].id == tile.cnName) { + Viewer.scene.primitives.remove(Viewer.scene.primitives._primitives[j]) + } } } } @@ -810,6 +954,37 @@ } }); + } else if (rs.serveType == "DEM") { + + if (window.terrainFlag == '2') { + window.terrainLayer.deleteObject(); + } else if (window.terrainFlag == '1') { + Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider(); + + } + var url = rs.url; + if (rs.url.indexOf("{host}") != -1) { + url = rs.url.replace("{host}", iisHost); + } + window.terrainLayer = null; + window.terrainFlag = '1' + + window.terrainLayer = new Cesium.CesiumTerrainProvider({ + url: url + }); + Viewer.terrainProvider = window.terrainLayer + } else if (rs.serveType == "TMS") { + var url = rs.url; + if (rs.url.indexOf("{host}") != -1) { + url = rs.url.replace("{host}", iisHost); + } + var layer = Viewer.imageryLayers.addImageryProvider( + new Cesium.UrlTemplateImageryProvider({ + url: url, + maximumLevel: 18, + }) + ); + layer.name = rs.cnName; } }, @@ -871,13 +1046,31 @@ } }, handleNodeClick(data) { + this.menuVisible = false if (data.type == 2) { this.currentData = data; - for (var j in Viewer.scene.primitives._primitives) { - if (Viewer.scene.primitives._primitives[j].id == data.cnName) { - Viewer.flyTo(Viewer.scene.primitives._primitives[j]); + + if (data.serveType == 'DEM' || data.serveType == 'TMS') { + if (!data.pubid) return + + this.setQueryPubid(data) + } else { + for (var j in Viewer.scene.primitives._primitives) { + if (Viewer.scene.primitives._primitives[j].id == data.cnName) { + Viewer.flyTo(Viewer.scene.primitives._primitives[j]); + } } } + } + }, + async setQueryPubid(res) { + const data = await comprehensive_selectPubById({ id: res.pubid }) + if (data.code != 200) return; + if (data.result.geom) { + var wkt = this.$wkt.parse(data.result.geom); + Viewer.camera.flyTo({ + destination: Cesium.Cartesian3.fromDegrees(wkt.coordinates[1], wkt.coordinates[0], 2000), + }); } }, getchilds(source) { @@ -922,6 +1115,13 @@ base_ulr = base_ulr.replace("{host}", iisHost) } + Viewer.imageryLayers.addImageryProvider( + new Cesium.UrlTemplateImageryProvider({ + url: base_ulr, + maximumLevel: 5 + }) + ); + window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider( new Cesium.UrlTemplateImageryProvider({ url: base_ulr, @@ -944,6 +1144,7 @@ requestVertexNormals: true, }; window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, ""); + window.terrainFlag = '2' // window.terrainLayer = new Cesium.CesiumTerrainProvider({ // url: demLayer // }); @@ -954,7 +1155,6 @@ var res = this.$store.state.previewLayer; var type = res.type; res.ulr = res.url.replace("{host}", iisHost); - if (type == 'DEM') { window.terrainLayer.deleteObject(); // Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider(); @@ -972,7 +1172,7 @@ roll: 0.0 } });*/ - debugger + var wkt = this.$wkt.parse(res.geom); var height = this.getHeight(wkt.coordinates[2]); Viewer.camera.flyTo({ @@ -1004,12 +1204,30 @@ }); } else if (res.url.indexOf('.mpt') != -1) { - Viewer.imageryLayers.removeAll(); - var url = res.url.split(';') - sgworld.Creator.createImageryProvider('mpt褰卞儚', "wms", { + this.editModelFlag = true; + //Viewer.imageryLayers.removeAll(); + + var url = res.url.split(';'); + var ops = { url: url[0], layers: url[1] - }, "0", undefined, true, ""); + }; + if (res && res.json) { + var rs = JSON.parse(res.json); + ops.rectangle = Cesium.Rectangle.fromDegrees(rs.west, rs.south, rs.east, rs.north); + } + + sgworld.Creator.createImageryProvider(res.cnName, "wms", ops, "0", undefined, true, ""); + + if (res && res.json) { + var rs = JSON.parse(res.json); + Viewer.camera.flyTo({ + destination: Cesium.Rectangle.fromDegrees(rs.west, rs.south, rs.east, rs.north) + }) + } + + + } else if (res.url.indexOf('menuLayer') != -1) { this.setShowModelLayer(); } @@ -1035,9 +1253,15 @@ }, async resave() { - if (!this.modelForm.modelid) { - return this.$message('鏈�夋嫨妯″瀷涓婚敭ID'); + + if (this.$store.state.previewLayer.type != "mpt") { + if (!this.modelForm.modelid) { + return this.$message('鏈�夋嫨妯″瀷涓婚敭ID'); + } + } else { + sgworld.Creator.SimpleGraphic.clear() } + this.$store.state.previewLayer.json = JSON.stringify(this.modelForm); if (this.$store.state.previewLayer.url) { @@ -1056,8 +1280,10 @@ this.reload(); }, reload() { + debugger sgworld.Analysis.UndergroundMode(this.app.under, this.modelForm.alpha) var json = JSON.stringify(this.modelForm); + var modelScale = this.modelForm.scale var url = this.$store.state.previewLayer.url.replace("{host}", iisHost); if (!url) return; if (this.app.tileset) Viewer.scene.primitives.remove(this.app.tileset); @@ -1067,13 +1293,14 @@ var that = this; Viewer.scene.primitives.add(this.app.tileset).readyPromise.then(function (ts) { that.modelForm = JSON.parse(json); - var pos = Cesium.Cartesian3.fromDegrees(parseFloat(that.modelForm.lon), parseFloat(that.modelForm.lat), parseFloat(that.modelForm.height)); - - var converter = Cesium.Transforms.eastNorthUpToFixedFrame; var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(parseFloat(that.modelForm.yaw)), 0, 0); var matrix = Cesium.Transforms.headingPitchRollToFixedFrame(pos, hpr, Cesium.Ellipsoid.WGS84, converter); + if (modelScale) { + var scale = Cesium.Matrix4.fromUniformScale(modelScale); + Cesium.Matrix4.multiply(matrix, scale, matrix); + } that.app.tileset._root.transform = matrix; Viewer.flyTo(ts); @@ -1146,6 +1373,8 @@ var converter = Cesium.Transforms.eastNorthUpToFixedFrame; var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(parseFloat(f.yaw)), 0, 0); var matrix = Cesium.Transforms.headingPitchRollToFixedFrame(pos, hpr, Cesium.Ellipsoid.WGS84, converter); + var scale = Cesium.Matrix4.fromUniformScale(f.scale); + Cesium.Matrix4.multiply(matrix, scale, matrix); var model = this.app.tileset model._root.transform = matrix; }, @@ -1285,12 +1514,15 @@ if (str.type == 1) { val.push(str); } - if (str.url != null && str.type == 2 && str.serveType == 'Tileset') { - val.push(str); + if (str.url != null && str.type == 2) { + + if (str.serveType == 'Tileset' || str.serveType == '3DML' || str.serveType == 'TMS' || str.serveType == 'DEM') { + val.push(str); + } } - if (str.url != null && str.type == 2 && str.serveType == '3DML') { - val.push(str); - } + // if (str.url != null && str.type == 2 && str.serveType == '3DML') { + // + // } }); var res = this.setTreeData(val); @@ -1357,6 +1589,7 @@ .previewBox { width: 100%; height: 100%; + .modelLayer { position: absolute; z-index: 40; @@ -1366,16 +1599,19 @@ margin: 10px; max-height: 600px; overflow: auto; + .modelBox { width: 100%; min-height: 24px; } } + .pdfClass { height: 70vh; width: 100%; position: relative; } + .el-icon-sunrise { background: url("../assets/img/synthesis/images/3鐧藉簳_157.png") center center no-repeat; @@ -1386,5 +1622,14 @@ content: "11"; visibility: hidden; } + .box-card { + position: fixed; + display: block; + z-index: 10000; + padding: 0px 0px; + border: 1px solid #ebeef5; + border-radius: 4px; + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + } } </style> -- Gitblit v1.9.3