From 13f87b980adfcaa0a3f5b0854c75bdc7deec8301 Mon Sep 17 00:00:00 2001 From: xing <xingjs@qq.com> Date: 星期六, 25 二月 2023 09:35:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/MapView/mapSpaceTop.vue | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/components/MapView/mapSpaceTop.vue b/src/components/MapView/mapSpaceTop.vue index 562c9a2..32658cb 100644 --- a/src/components/MapView/mapSpaceTop.vue +++ b/src/components/MapView/mapSpaceTop.vue @@ -5,6 +5,7 @@ @change="menuTreeCheck" placeholder="璇烽�夋嫨..." filterable + :popper-append-to-body="false" > <el-option v-for="item in layerData" @@ -57,14 +58,14 @@ </template> <script> -import queryinfo from "../../views/Tools/queryinfo.vue" -import { inquiry_SelectTabs, dataLib_selectTabs } from '../../api/api.js'; +import queryinfo from "../../views/Tools/queryinfo.vue"; +import { inquiry_SelectTabs, dataLib_selectTabs } from "../../api/api.js"; export default { components: { queryinfo }, data() { return { menuTopFrom: { - queryLayer: '', + queryLayer: "", }, layerData: [ // { @@ -83,8 +84,8 @@ // }, ], defaultProps: { - children: 'children', - label: 'label', + children: "children", + label: "label", }, mapSpaceQueryLayer: null, }; @@ -97,18 +98,17 @@ // const data = await inquiry_SelectTabs(); const data = await dataLib_selectTabs({ pageIndex: 1, - pageSize: 500 - }) + pageSize: 500, + }); if (data.code != 200) { - this.$message.error('鍒楄〃璋冪敤澶辫触'); + this.$message.error("鍒楄〃璋冪敤澶辫触"); } var option = data.result; this.layerData = option.filter((res) => { if (res.rows != 0) { return res; } - }) - + }); // for (var i in option) { // // console.log(option[i].tableType) @@ -125,28 +125,28 @@ getCheckedNodes() { this.$store.state.mapSpaceQueryLayer = this.mapSpaceQueryLayer; // this.$store.state.mapPopBoolean = true; - this.$store.state.mapPopBoxFlag = '2'; + 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: () => { + 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 (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() - } - } - }); + if (window.Viewer.scene.primitives.length != 0) { + window.Viewer.scene.primitives.removeAll(); + } + }, + }); }, resetCheckedNodes() { this.menuTopFrom.queryLayer = null; this.$refs.treeForm.setCheckedKeys([]); }, menuTreeCheck(value) { - this.mapSpaceQueryLayer = value; this.getCheckedNodes(); @@ -164,5 +164,4 @@ overflow: hidden; } </style> -<style lang="less" scoped> -</style> +<style lang="less" scoped></style> -- Gitblit v1.9.3