From c2a6c53657baaf0830cd881e1a23a15af23ac6fa Mon Sep 17 00:00:00 2001 From: Surpriseplus <845948745@qq.com> Date: 星期四, 21 九月 2023 18:35:14 +0800 Subject: [PATCH] 代码更新 --- src/components/preview_map.vue | 621 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 501 insertions(+), 120 deletions(-) diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue index 3512071..0f9b5bd 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,35 +43,57 @@ <el-form-item> <el-button size="small" + @click="dialogLayerVisible = true" + >鍥惧眰</el-button> + <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" - @click="underground" + v-if="$store.state.previewLayer.type != 'mpt'" + @click="setUndergroundMode" >鍦颁笅</el-button> + <br /> <el-button - v-if="$store.state.previewLayer.type != '3dml'" + 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'" + 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'" + 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'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' + " size="small" @click="resave" >淇濆瓨</el-button> @@ -78,86 +101,69 @@ </el-form-item> <el-form-item label="缁忓害:" - v-if="$store.state.previewLayer.type != '3dml'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" > <el-input size="small" v-model="modelForm.lon" - @input="update" ></el-input> - <el-slider - v-model="modelForm.lon" - @input="update" - :min="73" - :step="0.001" - :max="135" - ></el-slider> + </el-form-item> <el-form-item label="绾害:" - v-if="$store.state.previewLayer.type != '3dml'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" > <el-input size="small" v-model="modelForm.lat" - @input="update" ></el-input> - <el-slider - v-model="modelForm.lat" - @input="update" - :min="3" - :step="0.001" - :max="54" - ></el-slider> + </el-form-item> <el-form-item label="楂樺害:" - v-if="$store.state.previewLayer.type != '3dml'" + v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'cpt' && + $store.state.previewLayer.type != 'mpt'" > <el-input size="small" v-model="modelForm.height" - @input="update" ></el-input> - <el-slider - v-model="modelForm.height" - :min="-800" - :step="1" - @input="update" - :max="8800" - ></el-slider> + </el-form-item> <el-form-item label="瑙掑害:" - v-if="$store.state.previewLayer.type != '3dml'" + 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" - @input="update" ></el-input> - <el-slider - v-model="modelForm.yaw" - :min="0" - @input="update" - :step="0.1" - :max="360" - ></el-slider> + </el-form-item> - <el-form-item label="閫忔槑搴�:"> + <el-form-item + label="姣斾緥:" + v-if="$store.state.previewLayer.type == 'las'" + > + <el-input + size="small" + v-model="modelForm.scale" + ></el-input> + + </el-form-item> + <!-- <el-form-item label="閫忔槑搴�:"> <el-input size="small" v-model="modelForm.alpha" - @input="update" ></el-input> - <el-slider - v-model="modelForm.alpha" - @input="update" - :min="0" - :step="0.01" - :max="1" - ></el-slider> - </el-form-item> + + </el-form-item> --> </el-form> </div> @@ -178,6 +184,7 @@ <el-tab-pane label="灞炴��" name="first" + v-if="serveType" > <el-form ref="form" @@ -216,14 +223,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> @@ -249,10 +258,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> @@ -263,14 +272,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> @@ -369,6 +379,40 @@ </div> </el-dialog> + + <div + v-show="dialogLayerVisible" + class="levelLayer box_divm" + > + <div class="levelTitle"> + <div> + 鍥惧眰鍒楄〃 + </div> + <div @click="dialogLayerVisible = false"> + <i class="el-icon-close"></i> + </div> + </div> + <div class="layerContent"> + <div + v-for="(item,index) in layerTree" + class="contLayer" + > + <div> <el-checkbox + v-model="item.checked" + @change="setLayerTreeChange(item)" + >{{item.cnName}}</el-checkbox></div> + <div> + + <el-button + icon="el-icon-map-location" + size="mini" + @click="setLayerTreeLocation(item)" + ></el-button> + </div> + </div> + </div> + + </div> <div v-show="modelKeyFlag" class="modelLayer box_divm" @@ -395,11 +439,25 @@ 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> @@ -412,7 +470,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' @@ -436,6 +495,7 @@ }, childOption: [], dialogVisible: false, + dialogLayerVisible: false, isShowModel: false, tableData: [], formInline: { @@ -446,7 +506,8 @@ info: '', icon: '', bak: '', - Id: '' + Id: '', + }, options: [ { @@ -479,7 +540,7 @@ isJpg: false, src: '' }, - modelType: ['ifc', 'fbx', 'rvt', '3dml'], + modelType: ['ifc', 'fbx', 'rvt', '3dml', 'cpt', 'osgb', 'las', 'laz'], editModelFlag: false, modelForm: { lon: 119, @@ -488,6 +549,11 @@ yaw: 0, alpha: 1, modelid: null, + west: null, + south: null, + east: null, + north: null, + scale: 1 }, app: { tileset: null, @@ -498,12 +564,142 @@ modelLayerId: null, optionKey: [], modelKeyFlag: false, + menuVisible: false, + rightClickMenuStyle: {}, // 鍙抽敭鑿滃崟鏍峰紡 + serveType: true, + layerData: "lf.sys_style", + layerTree: null } }, mounted() { this.init3DMap(); + this.getLayers(); }, methods: { + async getLayers() { + const data = await perms_selectLayers(); + if (data.code != 200) { + return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触"); + } + + var layer = data.result.filter(res => { + if (res.type == 2) { + if (res.serveType == 'WMTS' || res.serveType == 'TMS') { + res.checked = false; + return res + } + } + }) + this.layerTree = layer + }, + setLayerTreeChange(res) { + if (res.checked) { + this.setAddTreeLayers(res) + } else { + this.setRemoveTreeLayers(res) + } + }, + async setLayerTreeLocation(res) { + if (res.pubid) { + let data = await comprehensive_selectPubById({ id: res.pubid }); + if (data.result && data.result.geom) { + let wkt = this.$wkt.parse(data.result.geom); + let height = this.getHeight(wkt.coordinates[2]); + Viewer.camera.flyTo({ + destination: Cesium.Cartesian3.fromDegrees(wkt.coordinates[1], wkt.coordinates[0], sceneConfig.extureHeight), // 2000 + }); + } + } + }, + async setAddTreeLayers(res) { + var url = res.url.indexOf("{host}") > -1 ? res.url.replace("{host}", iisHost) : res.url; + + var layer = Viewer.imageryLayers.addImageryProvider( + new Cesium.UrlTemplateImageryProvider({ + url: url, + maximumLevel: 18, + }) + ); + layer.name = res.cnName + '_' + res.id + }, + setRemoveTreeLayers(res) { + var name = res.cnName + '_' + res.id; + var layers = Viewer.imageryLayers._layers; + for (var i in layers) { + if (layers[i].name == name) { + Viewer.imageryLayers.remove(layers[i]) + } + } + }, + setTreeData(source) { + let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕 + return cloneData.filter((father) => { + // 寰幆鎵�鏈夐」 + let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁 + if (branchArr.length > 0) { + branchArr.sort(function (a, b) { + + return a.orderNum - b.orderNum + }) + } + branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊� + // 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=1 锛岀劧鍚庡啀浠� b.c=c 锛� 閭d箞 a.c=b.c=c=1 锛涘悓鐞嗭紝鍚庣画浠� c.d=2 ,閭d箞 a.c.d 涔熸槸=2锛� + // 鐢辨寰幆澶氭鍚庯紝灏辫兘褰㈡垚鐩稿簲鐨勬爲褰㈡暟鎹粨鏋� + return father.pid == 0; // 杩斿洖涓�绾ц彍鍗� + }); + }, + // 榧犳爣鍙冲嚮浜嬩欢 + 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 && @@ -575,7 +771,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, @@ -652,7 +848,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) { @@ -716,6 +912,8 @@ }, handleClose() { + this.layerData = "lf.sys_style" + this.serveType = true; this.dialogVisible = false; this.formInline = { title: '', @@ -788,7 +986,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) { @@ -799,9 +1008,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]) + } } } } @@ -821,7 +1054,7 @@ new Cesium.Cesium3DTileset({ name: rs.cnName, url: url, //192.168.20.106,to4 - maximumScreenSpaceError: 64, // 鏈�澶у睆骞曠┖闂撮敊璇細16 + maximumScreenSpaceError: url.indexOf("/pnts/") > -1 ? 16 : 64, // 鏈�澶у睆骞曠┖闂撮敊璇細16 maximumMemoryUsage: 768, // 鏈�澶у唴瀛橈細512 dynamicScreenSpaceError: true, // 鍑忓皯绂荤浉鏈鸿緝杩滅殑灞忓箷绌洪棿閿欒锛歠alse skipLevelOfDetail: true, // 鍦ㄩ亶鍘嗘椂鍊欒烦杩囪鎯咃細false @@ -837,6 +1070,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; } }, @@ -898,13 +1162,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) { @@ -930,6 +1212,10 @@ // Viewer.camera.flyTo({ // destination: Cesium.Cartesian3.fromDegrees(110, 33, 8000000), // }); + + if (is_production) { + Viewer.imageryLayers.removeAll(); + } Viewer._enableInfoOrSelection = false; //鏄剧ずfps Viewer.scene.debugShowFramesPerSecond = false; @@ -939,6 +1225,32 @@ // window.sgworld.navControl("scale", false); //寮�鍚繁搴︽娴� // sg.Analysis.depthTestAgainstTerrain(true) + if (is_production) { + var base_ulr = window.sceneConfig.baseUrl; + if (base_ulr.indexOf('{host}') > -1) { + 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, + + }) + ); + + + } + + + + Viewer.scene.globe.depthTestAgainstTerrain = true; // window.elevationTool = new SmartEarth.ElevationTool(window.sg); // elevationTool.setContourColor("#F1D487"); @@ -948,6 +1260,7 @@ requestVertexNormals: true, }; window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, ""); + window.terrainFlag = '2' // window.terrainLayer = new Cesium.CesiumTerrainProvider({ // url: demLayer // }); @@ -957,12 +1270,13 @@ if (this.$store.state.previewLayer) { var res = this.$store.state.previewLayer; var type = res.type; + console.log(type) res.ulr = res.url.replace("{host}", iisHost); if (type == 'DEM') { window.terrainLayer.deleteObject(); // Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider(); // window.terrainLayer = null; - + window.terrainLayer = null; window.terrainLayer = new Cesium.CesiumTerrainProvider({ url: res.url }); @@ -975,6 +1289,7 @@ roll: 0.0 } });*/ + var wkt = this.$wkt.parse(res.geom); var height = this.getHeight(wkt.coordinates[2]); Viewer.camera.flyTo({ @@ -992,12 +1307,13 @@ Viewer.camera.flyTo({ destination: Cesium.Cartesian3.fromDegrees(wkt.coordinates[1], wkt.coordinates[0], height), }); - } else if (type == '3dml' || type == 'fbx' || type == 'ifc' || type == 'rvt') { + } else if (type == '3dml' || type == 'fbx' || type == 'ifc' || type == 'rvt' + || type == 'cpt' || type == 'osgb' || type == 'las' || type == 'laz') { if (this.app.tileset) viewer.scene.primitives.remove(this.app.tileset); this.app.tileset = this.createTileset(res); var that = this; - + this.editModelFlag = true; Viewer.scene.primitives.add(this.app.tileset).readyPromise.then(function (ts) { that.setModleLocatin() @@ -1005,12 +1321,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(); } @@ -1036,9 +1370,15 @@ }, async resave() { - if (!this.modelForm.modelid) { - return this.$message('鏈�夋嫨妯″瀷涓婚敭ID'); + var type = this.$store.state.previewLayer.type; + if (type && type != "mpt" && 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) { @@ -1057,7 +1397,10 @@ this.reload(); }, reload() { + + 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 +1410,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); @@ -1103,6 +1447,8 @@ that.modelForm.lat = y; that.modelForm.height = z; that.pickupCoords(); + that.reload(); + }, Cesium.ScreenSpaceEventType.LEFT_CLICK); }, // 淇濈暀灏忔暟浣� @@ -1112,36 +1458,26 @@ return Math.round(d * p) / p; }, update() { - if (!this.modelForm.lon || isNaN(this.modelForm.lon)) { - var args = this.getEditTilesetArgs(); - this.modelForm.lon = args.lon == null ? 0 : args.height; - return - } - if (!this.modelForm.lat || isNaN(this.modelForm.lat)) { - var args = this.getEditTilesetArgs(); - this.modelForm.lat = args.lat == null ? 0 : args.height; - return - } - if (!this.modelForm.height || isNaN(this.modelForm.height)) { - var args = this.getEditTilesetArgs(); - this.modelForm.height = args.height == null ? 0 : args.height; - return - } - if (!this.modelForm.yaw || isNaN(this.modelForm.yaw)) { - this.modelForm.yaw = 0; - 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 - // } + // if (!this.modelForm.lon || isNaN(this.modelForm.lon)) { + // var args = this.getEditTilesetArgs(); + // this.modelForm.lon = args.lon == null ? 0 : args.height; // return - // } + // if (!this.modelForm.lat || isNaN(this.modelForm.lat)) { + // var args = this.getEditTilesetArgs(); + // this.modelForm.lat = args.lat == null ? 0 : args.height; + // return + // } + // if (!this.modelForm.height || isNaN(this.modelForm.height)) { + // var args = this.getEditTilesetArgs(); + // this.modelForm.height = args.height == null ? 0 : args.height; + // return + // } + // if (!this.modelForm.yaw || isNaN(this.modelForm.yaw)) { + // this.modelForm.yaw = 0; + // return + // } + this.setTilesetArgs(this.modelForm); sgworld.Analysis.UndergroundMode(this.app.under, this.modelForm.alpha) }, @@ -1154,6 +1490,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; }, @@ -1164,6 +1502,7 @@ }, //鏄鹃殣 showTileset() { + if (!this.app.tileset) return; this.app.tileset.show = !this.app.tileset.show; }, @@ -1179,7 +1518,7 @@ name: 'tsTest', skipLevelOfDetail: true, // 鍦ㄩ亶鍘嗘椂鍊欒烦杩囪鎯咃細false baseScreenSpaceError: 1024, - maximumScreenSpaceError: 64, // 鏈�澶у睆骞曠┖闂撮敊璇細16锛屾暟鍊煎姞澶ц兘璁╂渶缁堟垚鍍忓彉妯$硦 + maximumScreenSpaceError: res.url.indexOf("/pnts/") > -1 ? 16 : 64, // 鏈�澶у睆骞曠┖闂撮敊璇細16锛屾暟鍊煎姞澶ц兘璁╂渶缁堟垚鍍忓彉妯$硦 skipScreenSpaceErrorFactor: 16, skipLevels: 1, immediatelyLoadDesiredLevelOfDetail: false, @@ -1197,8 +1536,9 @@ }); }, setEditModelLayer(res) { - this.editModelFlag = true; + if (res.json) { + var json = JSON.parse(res.json) this.modelForm = json; this.reload(); @@ -1209,7 +1549,6 @@ setModleLocatin() { var res = this.$store.state.previewLayer; var type = res.type; - if (this.modelType.indexOf(type) != -1) { if (type != '3dml') { this.setEditModelLayer(res) @@ -1292,12 +1631,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); @@ -1352,7 +1694,8 @@ if (level > 0 && level < 23) { return this.levelArray[level] } - return this.levelArray[this.levelArray.length - 1] + var res = 7 + return this.levelArray[res] }, }, @@ -1364,6 +1707,7 @@ .previewBox { width: 100%; height: 100%; + .modelLayer { position: absolute; z-index: 40; @@ -1373,9 +1717,36 @@ margin: 10px; max-height: 600px; overflow: auto; + .modelBox { width: 100%; min-height: 24px; + } + } + + .levelLayer { + position: absolute; + z-index: 40; + padding: 10px 20px; + max-height: 450px; + overflow: auto; + border: 1px solid #409eff; + top: 20%; + left: 50%; + transform: translate(-50%, 0%); + .levelTitle { + width: 100%; + display: flex; + justify-content: space-between; + font-size: 16px; + font-family: Source Han Sans CN; + } + .contLayer { + margin: 10px 0px; + font-size: 14px; + font-family: Source Han Sans CN; + display: flex; + justify-content: space-between; } } .pdfClass { @@ -1383,6 +1754,7 @@ width: 100%; position: relative; } + .el-icon-sunrise { background: url("../assets/img/synthesis/images/3鐧藉簳_157.png") center center no-repeat; @@ -1393,5 +1765,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