現在類別位置反白、副檔名修改、點圖片直接進詳細資料

component-favorite.php

@@ -84,6 +84,18 @@ if (!isset($_SESSION['loggedin'])) {
 	<script>
 		$(document).ready(function() {
 
+			var aTags = document.getElementsByTagName("a");
+			var searchText = "清單列表";
+			var found;
+
+			for (var i = 0; i < aTags.length; i++) {
+				if (aTags[i].textContent == searchText) {
+					found = aTags[i];
+					break;
+				}
+			}
+			found.classList.add("highlight");
+
 			$.ajax({
 				url: "./script/php/equipment_group_favorite.php",
 				type: "GET",

component-list.php

@@ -81,6 +81,23 @@ if (!isset($_SESSION['loggedin'])) {
 	<?php include("bim-support-body.html"); ?>
 	<script type="application/javascript">
 		$(function() {
+
+			for (var i = 0; i < jsonData.length; i++) {
+				if (jsonData[i]["equipment_code"].includes(type)) {
+					var aTags = document.getElementsByTagName("a");
+					var searchText = jsonData[i]["equipment_name"];
+					var found;
+
+					for (var i = 0; i < aTags.length; i++) {
+						if (aTags[i].textContent == searchText) {
+							found = aTags[i];
+							break;
+						}
+					}
+					found.classList.add("highlight");
+				}
+			}
+
 			$.ajax({
 				url: "./script/php/equipment_group.php",
 				type: "GET",
@@ -102,10 +119,12 @@ if (!isset($_SESSION['loggedin'])) {
 						itemSelector: ".isotope-item",
 						layoutMode: 'fitRows'
 					});
-				}).then(function(){
-					setTimeout(function(){$grid.isotope()}, 100);
+				}).then(function() {
+					setTimeout(function() {
+						$grid.isotope()
+					}, 100);
 				});
-				
+
 			}).error(function(error) {
 				console.log(error);
 			});
@@ -125,7 +144,6 @@ if (!isset($_SESSION['loggedin'])) {
 				console.log(error);
 			});
 
-
 		});
 	</script>
 	<script src="script/js/3Dpic.js" type="module"></script>

script/js/3Dpic-favorite.js

@@ -31,7 +31,7 @@
 			content.appendChild(isotope);
 
 			const thumbnail = document.createElement('div');
-			thumbnail.className = 'thumbnail2';
+			thumbnail.className = 'thumbnail';
 			isotope.appendChild(thumbnail);
 
 			const element = document.createElement('div');
@@ -55,11 +55,15 @@
 			const sceneElement = document.createElement('div');
 			element.appendChild(sceneElement);
 
+			const aImg = document.createElement('a');
+			aImg.setAttribute("href", "component-detail.php?object=" + type[1] + "&type=" + type[0]);
+			sceneElement.appendChild(aImg);
+
 			const img = document.createElement('img');
 			img.src = "assets/images/projects/project-8.png";
 			img.className = 'img-responsive';
 			img.alt = 'Project';
-			sceneElement.appendChild(img);
+			aImg.appendChild(img);
 
 
 
@@ -73,7 +77,7 @@
 			thumbnail.appendChild(h5);
 
 			const smallRvt = document.createElement('small');
-			smallRvt.innerText = ".rvt";
+			smallRvt.innerText = ".rfa";
 			h5.appendChild(smallRvt);
 
 			h5.innerText = ellipsis(h5.innerText);
@@ -142,6 +146,11 @@
 			controls.maxDistance = 10;
 			controls.maxPolarAngle = 0.5 * Math.PI;
 			controls.autoRotate = true;
+			controls.mouseButtons = {
+				LEFT: '',
+				TOP: '',
+				RIGHT: ''
+			}
 			scene.userData.controls = controls;
 
 			

script/js/3Dpic.js

@@ -51,11 +51,15 @@
 			const sceneElement = document.createElement('div');
 			element.appendChild(sceneElement);
 
+			const aImg = document.createElement('a');
+			aImg.setAttribute("href", "component-detail.php?object=" + rvtName[i] + "&type=" + type);
+			sceneElement.appendChild(aImg);
+
 			const img = document.createElement('img');
 			img.src = "assets/images/projects/project-8.png";
 			img.className = 'img-responsive';
 			img.alt = 'Project';
-			sceneElement.appendChild(img);
+			aImg.appendChild(img);
 
 
 
@@ -69,7 +73,7 @@
 			thumbnail.appendChild(h5);
 
 			const smallRvt = document.createElement('small');
-			smallRvt.innerText = ".rvt";
+			smallRvt.innerText = ".rfa";
 			h5.appendChild(smallRvt);
 
 			h5.innerText = ellipsis(h5.innerText);
@@ -135,14 +139,20 @@
 			const grid = new THREE.GridHelper(50, 50, 0x888888, 0x888888);
 			scene.add(grid);
 
+			
 			const controls = new OrbitControls(scene.userData.camera, scene.userData.element);
 			controls.target.set(0, 2, 0);
 			controls.minDistance = 0.5;
 			controls.maxDistance = 10;
 			controls.maxPolarAngle = 0.5 * Math.PI;
 			controls.autoRotate = true;
+			controls.mouseButtons = {
+				LEFT: '',
+				TOP: '',
+				RIGHT: ''
+			}
 			scene.userData.controls = controls;
-
+			
 
 
 			var loader = new GLTFLoader();

script/js/getEquipmentJson.js

@@ -2,6 +2,7 @@ var jsonData;
 var getUrl = window.location;
 var baseUrl = getUrl .protocol + "//" + getUrl.host + "/" + getUrl.pathname.split('/')[1];
 var requestURL = baseUrl + '/assets/equipmentTable.json';
+//var requestURL = baseUrl + '/assets/equipmentTable2.json';
 var request = new XMLHttpRequest();
 request.onreadystatechange = function () {
     if (this.readyState == 4 && this.status == 200) {