From 5685babbcf4eb0b1cbbe1385472d862ce5fbb410 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 06 四月 2023 14:23:53 +0800
Subject: [PATCH] 地质体模型挂载,数据申请页面 添加下载功能

---
 src/views/Archive/index.vue |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index 4c71eac..c4c5f86 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -840,6 +840,7 @@
       width="90%"
       top="10vh"
       :close-on-click-modal="false"
+      :before-close="handleMaptClose"
     >
       <div style="height:73vh">
         <map-sdk v-if='showMapVisible'></map-sdk>
@@ -1131,7 +1132,7 @@
             <el-button
               class="primary"
               size="small"
-              @click="getInsertDown"
+              @click="getInsertDownx"
             >{{
               $t("common.confirm")
             }}</el-button>
@@ -1407,7 +1408,7 @@
         .catch(_ => { })
     },
     downloadx() {
-      this.$bus.$emit("setInsertDown", this.codeForm)
+      this.$bus.$emit("setInsertDown2", this.codeForm)
       // 
     },
     closeDownx() {
@@ -1417,7 +1418,7 @@
         repassword: '',
       }
     },
-    async getInsertDown() {
+    async getInsertDownx() {
 
       this.dialogInsertVisible = false;
       this.dialogVisible1 = false;
@@ -1434,6 +1435,7 @@
         for (var i in this.ruleForm.depname) {
           std.push(this.ruleForm.depname[i].name)
         }
+
         obj = {
           pwd: encr(this.codeForm.password),
           entities: entities,
@@ -1466,8 +1468,10 @@
         }
         var dirs = null;
         if (this.listData.dirs) {
+
           dirs = this.listData.dirs
         }
+
         obj = {
           pwd: encr(this.codeForm.password),
           entities: [this.listBankData.name], // bpachydrogeology,bhydrogeologyattach
@@ -1775,6 +1779,29 @@
       this.$store.state.download = true;
 
     },
+
+    handleMaptClose() {
+      this.dialogMapVisible = false;
+      this.showMapVisible = false;
+      this.$store.state.mapMenuBoolean = false;
+      this.$store.state.mapMenuBoxFlag = null;
+      this.$store.state.mapPopBoolean = false;
+      this.$store.state.mapPopBoxFlag = false;
+      this.$store.state.download = false;
+      if (window.sgworld) {
+        window.sgworld.Creator.SimpleGraphic.clear();
+        for (var i in this.$store.state.queryInfo) {
+          window.sgworld.Viewer.entities.remove(this.$store.state.queryInfo[i]);
+        }
+      }
+
+      this.$store.state.queryInfo = [];
+      if (this.$store.state.primitLayer != null) {
+        sgworld.Viewer.entities.remove(this.$store.state.primitLayer);
+        sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
+        this.$store.state.primitLayer = null;
+      }
+    },
     downloadMap(index, rows) {
       var token = getToken()
       var url = BASE_URL + "/dataLib/downloadFile?token=" + token + "&guid=" + rows.guid + "&pwd=" + rows.pwd;

--
Gitblit v1.9.3