From 7e275acee90c914685ca53f04ec6a4b74e46abbf Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 22 四月 2024 15:41:50 +0800
Subject: [PATCH] 112

---
 /dev/null                                                    |    0 
 Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool/ProjectTree.html |   11 +++--
 Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js        |    4 +-
 Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj    |    1 
 Terra.YaoGan.Web/Terra.YaoGan.Web/checkbox.html              |   63 ++++++++++++++++++++-----------
 Terra.YaoGan.Web/Terra.YaoGan.Web/fly/129.FLY                |    0 
 Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly                |    0 
 7 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj b/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj
index 9b3a665..be32a79 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj
@@ -1372,7 +1372,6 @@
     <Content Include="html\layuiupdate\font\iconfont.ttf" />
     <Content Include="html\layuiupdate\font\iconfont.woff" />
     <Content Include="Ashx\DataQL.ashx" />
-    <Content Include="fly\127.fly" />
     <Content Include="fly\128.fly" />
     <Content Include="fly\shp\鍓嶅痉闂ㄥ湴鍧�.CPG" />
     <Content Include="fly\shp\鍓嶅痉闂ㄥ湴鍧�.dbf" />
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/checkbox.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/checkbox.html
index 98adb65..0622a96 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/checkbox.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/checkbox.html
@@ -21,8 +21,6 @@
         }
     </style>
     <script>
-        var groupName = "16m鏁版嵁"; // 16m鏁版嵁,澶氭湡鏁版嵁
-
         function getQueryString(name) {
             var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
             var r = window.location.search.substring(1).match(reg);
@@ -33,12 +31,37 @@
         }
 
         window.onload = function () {
-            initLayers();
+            init();
         }
 
-        function initLayers() {
+        function init() {
+            var groups = ["2m褰卞儚", "16m褰卞儚", "妞嶈瑕嗙洊搴�"];
+            var select = document.getElementById("select");
+
+            for (var i in groups) {
+                var groupName = groups[i];
+                var item = SGWorld.ProjectTree.FindItem(groupName);
+                if (!item) continue;
+                SGWorld.ProjectTree.SetVisibility(item, false);
+
+                var names = getLayers(groupName);
+                if (names.length) {
+                    for (var i in names) {
+                        var op = document.createElement("option");
+                        op.text = groupName + "\\" + names[i];
+                        if (0 == i) op.selected = true;
+                        select.add(op);
+                    }
+                }
+            }
+
+            select.onchange = selectChanged;
+            setImageLayer();
+        }
+
+        function getLayers(groupName) {
             var item = SGWorld.ProjectTree.FindItem(groupName);
-            if (!item) return;
+            if (!item) return [];
 
             var names = [];
             var id = SGWorld.ProjectTree.GetNextItem(item, 11); // 11-CHILD
@@ -49,39 +72,33 @@
                 id = SGWorld.ProjectTree.GetNextItem(id, 13); // 13-NEXT
             }
 
-            var select = document.getElementById("select");
-            for (var i in names) {
-                var op = document.createElement("option");
-                op.text = names[i];
-                if (0 == i) op.selected = true;
-                select.add(op);
-            }
-            select.onchange = selectChanged;
-
-            setImageLayer();
+            return names;
         }
 
         function selectChanged(e) {
             setImageLayer();
         }
 
-        function setImageLayer() {
-            var select = document.getElementById("select");
-            var text = select.options[select.selectedIndex].text.replace("骞�", "");
+        var lastItem = null;
 
-            var item = SGWorld.ProjectTree.FindItem(groupName);
-            if (item) {
-                SGWorld.ProjectTree.SetVisibility(item, false);
+        function setImageLayer() {
+            if (lastItem) {
+                SGWorld.ProjectTree.SetVisibility(lastItem, false);
+                lastItem = null;
             }
 
-            item = SGWorld.ProjectTree.FindItem(groupName + "\\" + text);
+            var select = document.getElementById("select");
+            var text = select.options[select.selectedIndex].text;
+
+            var item = SGWorld.ProjectTree.FindItem(text);
             if (item) {
                 SGWorld.ProjectTree.SetVisibility(item, true);
+                lastItem = item;
             }
         }
     </script>
 </head>
 <body>
-    <select id="select" style="width: 120px; text-align: center;"></select><object id="SGWorld" classid="CLSID:3a4f9199-65a8-11d5-85c1-0001023952c1"></object>
+    <select id="select" style="width: 170px; text-align: center;"></select><object id="SGWorld" classid="CLSID:3a4f9199-65a8-11d5-85c1-0001023952c1"></object>
 </body>
 </html>
\ No newline at end of file
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly
deleted file mode 100644
index d71f226..0000000
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly
+++ /dev/null
Binary files differ
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly
index 3143fcd..223bee9 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly
Binary files differ
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/129.FLY b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/129.FLY
index f440d20..f75ac6c 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/129.FLY
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/129.FLY
Binary files differ
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/129_.FLY b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/129_.FLY
deleted file mode 100644
index 31f8c5d..0000000
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/129_.FLY
+++ /dev/null
Binary files differ
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool/ProjectTree.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool/ProjectTree.html
index 50ad2f5..8e78f15 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool/ProjectTree.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool/ProjectTree.html
@@ -5,11 +5,12 @@
     <title></title>
 	<meta charset="utf-8" />
     <style>
-        html,body{
-            width:100%;
-            height:100%;
-            padding:0px;
-            margin:0px;
+        html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
         }
     </style>
 </head>
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js
index 0a551c0..5376076 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js
@@ -167,7 +167,7 @@
         sgworld.Application.Multiple3DWindows.SetAsLeader();
         sgworld.Application.Multiple3DWindows.LinkPosition(globe);
 
-        var width = 125, height = 25;
+        var width = 175, height = 25;
         var left = 1920 / 2 - 20 - width - 20;
 
         showHtmlBySG(sgworld, title, location.origin + "/checkbox.html", left, 200, width, height, false);
@@ -280,7 +280,7 @@
     if (projectTreeStatus) {
         //sgworld.ProjectTree.ShowSearchTool = false;
         //window.external.createPmDialogDock('projectTree', url + "tool/ProjectTree.html", 420, 500, 200, 500, -1, -1);
-        window.external.createPmDialogDock('projectTree', url + "tool/ProjectTree.html", 280, 450, 150, 20, -1, -1); //rb.width, rb.height, rb.top, rb.left, rb.bottom, rb.right
+        window.external.createPmDialogDock('projectTree', url + "tool/ProjectTree.html", 280, 600, 200, 20, -1, -1); //rb.width, rb.height, rb.top, rb.left, rb.bottom, rb.right
         projectTreeStatus = false;
     } else {
         window.external.closeDialog("projectTree");

--
Gitblit v1.9.3