From 280001d476b92bf2d14052518e6f69bee9dee43d Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 18 七月 2024 16:13:15 +0800
Subject: [PATCH] 提交代码

---
 javaweb-plus/javaweb-admin/src/main/resources/templates/main.html              |    9 ++++++---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html |   13 +++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
index b077c3f..25eb478 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -575,7 +575,7 @@
 
 	function infoWindowProject(e){
 
-		let ids = e.ids + "";
+		let ids = e.ids + "," + e.code;
 		var sContent =
 				"<div style='margin:0px;'>" +
 				"<div>" +
@@ -589,8 +589,11 @@
 				"</div>";
 		return sContent;
 	}
-	function viewdata (id) {
-		$.modal.openTab("鍦哄湴瀵艰埅",ctx+ "/geo/project/navigate?ids="+id);
+	function viewdata (idcode) {
+		var strs = idcode.split(",");
+		var id =strs[0];
+		var code = strs[1];
+		$.modal.openTab(code + " 鍦哄湴瀵艰埅",ctx+ "/geo/project/navigate?ids="+id);
 	}
 
 	function addClickHandler(content, marker) {
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
index 36e1a40..7f0a1f3 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
@@ -84,7 +84,10 @@
                     field : 'fullName', 
                     title : '鍦哄湴鍚嶇О',
                     formatter: function(value, row, index) {
-                      return '<a onclick="navigate(\'' + row.ids + '\')">'+row.fullName+'</a>'                    
+                        var id = row.ids;
+                        var code = row.code;
+                        var str = id + "," + code;
+                      return '<a onclick="navigate(\'' + str + '\')">'+row.fullName+'</a>'
                    },           
                    sortable:true           
                 },
@@ -123,9 +126,11 @@
         });
         
         
-       function navigate(id){   
-            
-            $.modal.openTab("鍦哄湴瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
+       function navigate(idcode){
+            var strs = idcode.split(",");
+            var id =strs[0];
+            var code = strs[1];
+            $.modal.openTab(code + " 鍦哄湴瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
         }
     </script>
 </body>

--
Gitblit v1.9.1