Эх сурвалжийг харах

Merge branch 'DEV' of http://10.1.1.202:3030/steve07s/DataBase into DEV

manto07m 3 жил өмнө
parent
commit
77dac0f719
2 өөрчлөгдсөн 50 нэмэгдсэн , 7 устгасан
  1. 32 7
      index.php
  2. 18 0
      script/js/jstreeAJAX.js

+ 32 - 7
index.php

@@ -303,7 +303,7 @@ if (!isset($_SESSION['loggedin'])) {
 
 				},
 				opacity: .75,
-				showAttribution:false,
+				showAttribution: false,
 
 			});
 
@@ -335,7 +335,7 @@ if (!isset($_SESSION['loggedin'])) {
 
 
 			window.view = view;
-			
+
 			view.ui.empty("top-left");
 			//view.ui.empty("manual");
 			view.ui.add(
@@ -406,7 +406,11 @@ if (!isset($_SESSION['loggedin'])) {
 
 			function zoomToLayer(layer) {
 				return layer.queryExtent().then((response) => {
-					view.goTo(response.extent).catch((error) => {
+					view.goTo({
+						target: response.extent,
+						tilt: 55,
+						heading: 0,
+					}).catch((error) => {
 						console.error(error);
 					});
 				});
@@ -415,9 +419,15 @@ if (!isset($_SESSION['loggedin'])) {
 			$('#treeAjaxHTML').on("select_node.jstree", function(e, data) {
 				if (data.node.text.includes("-")) {
 					project_id = data.node.text.split("-")[0];
-					featureLayer.definitionExpression = "計畫編號 = "+ project_id;
+					featureLayer.definitionExpression = "計畫編號 = " + project_id;
 					zoomToLayer(featureLayer);
 				}
+				/*else{
+									type = data.node.text;
+									console.log(type);
+									featureLayer.definitionExpression = "工程類別 = '"+ type + "'";
+									zoomToLayer(featureLayer);
+								}*/
 			});
 			view.when(function() {
 
@@ -431,15 +441,30 @@ if (!isset($_SESSION['loggedin'])) {
 
 <body>
 	<script type="application/javascript">
+		var test;
 		var i = 0;
 		var download;
 		var fileName;
 		var folder;
 		var software;
 		var userName = 'maabim';
-		var searchURL = window.location.search;
-		searchURL = searchURL.substring(1, searchURL.length);
-		object = decodeURIComponent(searchURL.split("&")[0].split("=")[1]);
+
+
+		jQuery(window).load(function() {
+			var searchURL = window.location.search;
+			searchURL = searchURL.substring(1, searchURL.length);
+			if (searchURL.includes("=")) {
+				projectId = decodeURIComponent(searchURL.split("&")[1].split("=")[1]);
+				var projectNode = $(".jstree-anchor").filter(function() {
+					return $(this).text().includes(projectId);
+				});
+				var projectId = projectNode[0].attributes.id.value;
+				$('#treeAjaxHTML').jstree("select_node", projectId);
+				$("#treeAjaxHTML").jstree("close_all");
+			}
+		});
+
+		//var typeId = node[0].attributes.id.value;
 	</script>
 	<section class="body">
 		<!-- start: header -->

+ 18 - 0
script/js/jstreeAJAX.js

@@ -128,6 +128,23 @@ $(document).ready(function() {
             }
         },
         'plugins': ['types', 'search', 'wholerow']
+    }).bind("loaded.jstree", function(event, data) {
+        var searchURL = window.location.search;
+        searchURL = searchURL.substring(1, searchURL.length);
+        if (searchURL.includes("=")) {
+            type = decodeURIComponent(searchURL.split("&")[0].split("=")[1]);
+            $(this).jstree("open_all");
+        }
+
+        /*var typeNode = $(".jstree-anchor").filter(function() {
+            return $(this).text() == type;
+        });
+
+        var typeId = typeNode[0].attributes.id.value;
+
+        $(this).jstree("select_node", typeId);*/
+
+
     }).on(
         'select_node.jstree',
         function(event, data) {
@@ -362,4 +379,5 @@ $(document).ready(function() {
         }
 
     }
+
 });