From f0cf67e3f93bef082f2ca02139a7fe647b33e467 Mon Sep 17 00:00:00 2001 From: Surpriseplus <845948745@qq.com> Date: 星期三, 15 三月 2023 18:52:02 +0800 Subject: [PATCH] 优化图层管理的折叠会折叠其它的面板;优化柱状图属性界面;优化WMS图层加载效果;优化资料馆上传的附件,前端显示不出来效果;综合展示拾取功能 --- src/views/Tools/LayerTree.vue | 114 +++++++++++++++----------------------------------------- 1 files changed, 31 insertions(+), 83 deletions(-) diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue index c9d2169..35b2b83 100644 --- a/src/views/Tools/LayerTree.vue +++ b/src/views/Tools/LayerTree.vue @@ -168,7 +168,7 @@ >纭� 瀹�</el-button> </span> </el-dialog> - <queryinfo ref="queryinfo" /> + </div> </template> @@ -241,21 +241,7 @@ var layer = this.currentData.enName.replaceAll("_", ""); this.$store.state.mapSpaceQueryLayer = layer; this.$store.state.mapPopBoxFlag = "2"; - this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close(); - this.$refs && - this.$refs.queryinfo && - this.$refs.queryinfo.open("灞炴��", null, { - close: () => { - if (this.$store.state.primitLayer != null) { - sgworld.Creator.DeleteObject(this.$store.state.primitLayer); - this.$store.state.primitLayer = null; - } - - if (window.Viewer.scene.primitives.length != 0) { - window.Viewer.scene.primitives.removeAll(); - } - }, - }); + this.$store.state.showPopBoxFlag = true; }, modelAttach() { this.menuVisible = false; @@ -293,6 +279,7 @@ rightClick(event, object, Node, element) { this.currentData = object; this.currentNode = Node; + this.$store.state.propertiesName = this.currentData; if (this.currentData.serveType == "Tileset") { this.showModelAttach = true; @@ -386,16 +373,10 @@ this.menuVisible = false var label = this.currentNode.data.cnName; if (this.currentNode.data.serveType == "WMS") { - for (var i in window.Viewer.imageryLayers._layers) { - if ( - window.Viewer.imageryLayers._layers[i].imageryProvider.name === - label - ) { - window.Viewer.imageryLayers.remove( - window.Viewer.imageryLayers._layers[i] - ); - } - } + var value = this.$refs.tree.getCheckedNodes(); + + this.$bus.$emit("showMenuLayer", value); + } else if (this.currentNode.data.serveType == "WFS") { for (var i in window.Viewer.dataSources._dataSources) { if (window.Viewer.dataSources._dataSources[i].name == label) { @@ -431,23 +412,10 @@ this.currentData = data ? data : this.currentData; var layer = this.currentData.enName.replaceAll("_", ""); this.$store.state.mapSpaceQueryLayer = layer; - + this.$store.state.showPopBoxFlag = true; this.$store.state.mapPopBoxFlag = "2"; - this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close(); - this.$refs && - this.$refs.queryinfo && - this.$refs.queryinfo.open("灞炴��", null, { - close: () => { - if (this.$store.state.primitLayer != null) { - sgworld.Creator.DeleteObject(this.$store.state.primitLayer); - this.$store.state.primitLayer = null; - } - if (window.Viewer.scene.primitives.length != 0) { - window.Viewer.scene.primitives.removeAll(); - } - }, - }); + }, //妯″瀷瀹氫綅 positioning() { @@ -534,36 +502,13 @@ handleCheckChange(data, checked, indeterminate) { if (data.type != 2) return; - var std = []; - if (data.serveType == "WMS") { - for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) { - var val_id = - window.Viewer.imageryLayers._layers[i].imageryProvider.name; - if (val_id == data.cnName) { - std.push(data.label); + var value = this.$refs.tree.getCheckedNodes(); - const img_layer = window.Viewer.imageryLayers._layers[i]; - img_layer.show = checked; - } - } - //瀛樺偍閫変腑鍥惧眰 - let checkedLayers = JSON.parse(sessionStorage.getItem("checkedLayers")); - if (checked && data.url){ - checkedLayers.push(data); - } - else { - for (let i = 0; i < checkedLayers.length; i++) { - let item = checkedLayers[i]; - if (item.enName == data.enName){ - checkedLayers.splice(i,1); - } - } - } - sessionStorage.setItem("checkedLayers",JSON.stringify(checkedLayers)); - setTimeout(() => { - this.$bus.$emit("treeChanged", true); - }, 500) - } else if (data.serveType == "WFS") { + this.$bus.$emit("showMenuLayer", value); + + + + if (data.serveType == "WFS") { if (window.Viewer.dataSources._dataSources.length == 0) { this.setAddLayers(data); } else { @@ -575,28 +520,31 @@ } } } else if (data.serveType == "Tileset") { + if (Viewer.scene.primitives._primitives.length == 0) { this.setAddLayers(data); } else { + var std = []; for (var i in Viewer.scene.primitives._primitives) { Viewer.scene.primitives._primitives[i].show = checked; if (Viewer.scene.primitives._primitives[i].id == data.cnName) { - // std.push(res.id); + std.push(data.id); Viewer.flyTo(Viewer.scene.primitives._primitives[i]); } } } - } - if (std.length == 0 && checked == true) { - this.setAddLayers(data); - } else { - window.map.getLayers().getArray().forEach(item => { - if (item.get("name") == data.cnName) { - item.setVisible(checked); + if (std.length == 0 && checked == true) { + this.setAddLayers(data); + } else { + window.map.getLayers().getArray().forEach(item => { + if (item.get("name") == data.cnName) { + item.setVisible(checked); - } - }); + } + }); + } } + @@ -702,7 +650,7 @@ this.tileSet(tileset, parseFloat(res.elev)) Viewer.flyTo(tileset); }); - window.model = tileset + // window.model = tileset } }, @@ -748,7 +696,7 @@ if (str.isShow == 1) { checkKey.push(str.id); that.setAddLayers(str); - if (str.serveType == "WMS" && str.url){ + if (str.serveType == "WMS" && str.url) { checkedLayers.push(str); } } @@ -757,7 +705,7 @@ }); //瀛樺偍閫変腑鍥惧眰 - sessionStorage.setItem("checkedLayers",JSON.stringify(checkedLayers)); + sessionStorage.setItem("checkedLayers", JSON.stringify(checkedLayers)); var res = this.setTreeData(val); for (var i in res) { -- Gitblit v1.9.3