From 8a16f971db33686b9e4f96f650cac23882632425 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 四月 2023 17:08:56 +0800
Subject: [PATCH] 1

---
 ExportMap/up.html   |   29 +++++++----------------------
 ExportMap/crds.html |    3 ++-
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/ExportMap/crds.html b/ExportMap/crds.html
index 0f8ff13..a868500 100644
--- a/ExportMap/crds.html
+++ b/ExportMap/crds.html
@@ -13,7 +13,8 @@
   <script>
     var app = {
       // 鍐呯綉
-      server: "http://127.0.0.1:12316/server/",
+      //server: "http://127.0.0.1:12316/server/",
+      server: "http://192.168.20.205:8088/server/",
       // 澶栫綉
       //server: "http://103.85.165.99:8052/server/",
       token: null,
diff --git a/ExportMap/up.html b/ExportMap/up.html
index 180b7ed..5070803 100644
--- a/ExportMap/up.html
+++ b/ExportMap/up.html
@@ -13,7 +13,7 @@
     var path = "20230228";
     var url = "http://127.0.0.1:12316/server/";
     //var token = "c36e4f94-dfde-401e-9967-2c4a449f1300";
-    var token = "4506afb2-07c2-41c5-9055-6b4d397af1f9";
+    var token = "deca57d4-7e09-431f-8dd2-97b6e9d840b2";
 
     $(function () {
       $("#pathSpan").html(path);
@@ -185,11 +185,11 @@
     }
   </script>
   <script>
-    // 璇锋眰涓嬭浇
-    function downloadReq() {
+    // 鍏冩暟鎹�-璇锋眰涓嬭浇
+    function metaDownloadReq() {
       var obj = {
         pwd: encrypt.encrypt("Test!321&456"),
-        ids: [1411, 1412]
+        ids: [1411, 1412, 8, 2140]
       };
 
       ajax(getUrl("meta/downloadReq"), "POST", JSON.stringify(obj), null, null, function (rs) {
@@ -245,26 +245,12 @@
       });
     }
 
-    // 璇锋眰瀹炰綋涓嬭浇
-    function downloadEntityReq() {
-      var obj = {
-        entities: ["sexplorationpoint"], // bpachydrogeology,bhydrogeologyattach
-        filter: "exppointid like 'EA12'",
-        pwd: encrypt.encrypt("Test!321&456")
-      };
-
-      ajax(getUrl("dataLib/downloadEntityReq"), "POST", JSON.stringify(obj), null, null, function (rs) {
-        console.log(rs);
-        alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
-      });
-    }
-
     // 涓嬭浇DB鏁版嵁
     function downloadDbData() {
       var obj = {
         pwd: encrypt.encrypt("Test!321&456"),
-        entities: ["dlgagnp", "dlg25wboul", "dlg25wresa"],
-        filter: "gid > 1",
+        entities: ["dlgagnp", "dlg25wboul", "dlg25wresa"], // "sexplorationpoint"
+        filter: "gid > 1", // "exppointid like 'EA12'"
         //ids: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
         dirs: "01,02,03,04,06,07",
         depcode: "00",
@@ -568,7 +554,7 @@
     <br />
 
     鍏冩暟鎹細
-    <input value="璇锋眰涓嬭浇" type="button" onclick="downloadReq();" />
+    <input value="璇锋眰涓嬭浇" type="button" onclick="metaDownloadReq();" />
     <input value="涓嬭浇鏂囦欢" type="button" onclick="selectDownloadFile();" />
     <iframe id="downFrame" src="" style="display: none; border: 0; padding: 0; height: 0; width: 0"></iframe>
     <hr />
@@ -578,7 +564,6 @@
     <!--<input value="璇锋眰涓嬭浇" type="button" onclick="downloadReq();" />-->
     <input id="fileId" value="" type="text" />
     <input value="涓嬭浇鏂囦欢" type="button" onclick="selectDownloadFile();" />
-    <input value="璇锋眰瀹炰綋涓嬭浇" type="button" onclick="downloadEntityReq();" />
     <input value="涓嬭浇DB鏁版嵁" type="button" onclick="downloadDbData();" />
     <hr />
     <br />

--
Gitblit v1.9.3