Browse Source

修正on click順序

manto07m 3 years ago
parent
commit
3c32a3ee32
2 changed files with 24 additions and 19 deletions
  1. 3 2
      C3/Index.php
  2. 21 17
      script/js/main.js

+ 3 - 2
C3/Index.php

@@ -67,7 +67,7 @@ include($_SERVER['DOCUMENT_ROOT'] . "/Authorization/script/php/permission/check_
 		<!-- end: header -->
 		<div class="inner-wrapper">
 			<!-- start: sidebar -->
-			<side-bar></side-bar>			
+			<side-bar></side-bar>
 			<!-- end: sidebar -->
 			<section role="main" class="content-body">
 				<header class="page-header">
@@ -220,6 +220,7 @@ include($_SERVER['DOCUMENT_ROOT'] . "/Authorization/script/php/permission/check_
 		<script>
 			vm.mount('.body');
 			addUserImage(userName.charAt(0), role);
+			
 		</script>
 
 		<!-- Vendor -->
@@ -259,7 +260,7 @@ include($_SERVER['DOCUMENT_ROOT'] . "/Authorization/script/php/permission/check_
 		<script src="/BIM-Monitor/assets/javascripts/theme.init.js"></script>
 		<!-- Examples -->
 		<script src="/BIM-Monitor/assets/javascripts/ui-elements/examples.modals.js"></script>
-		
+
 		<!-- <script src='/BIM-Monitor/script/js/warning.js'></script> -->
 		<!-- Unity loader -->
 		<script src="/BIM-Monitor/script/js/unity-loader.js"></script>

+ 21 - 17
script/js/main.js

@@ -438,23 +438,7 @@ function ResetCamera() {
     myGameInstance.SendMessage("MainCamera", "ResetCamera");
 }
 
-$(".monitor").on('click', function(){
-    let option = $(this).attr("monitor");
-    isAll = true;
-    isCompare = false;
-    passString(option);
-    document.getElementById("monitorName").innerHTML = option + "監測儀器";
-    if (lastNode != null) {
-        lastNode.style = "color:#abb4be;";
-    }
-    document.getElementById("errorCheck").checked = false;
-    document.getElementById("compareCheck").checked = false;
 
-    lastNode = document.getElementById(option).parentNode;
-    lastNode.style = "color:#0088cc;";
-
-    LoadPage();
-});
 
 function SetList() {
     var wellNameListsLocal = "";
@@ -1258,4 +1242,24 @@ function reset() {
     table.className = "display";
     //table.style.width = "100%";
     myNode.appendChild(table);
-}
+}
+
+$(document).ready(function() {
+    $(".monitor").on('click', function() {
+        let option = $(this).attr("monitor");
+        isAll = true;
+        isCompare = false;
+        passString(option);
+        document.getElementById("monitorName").innerHTML = option + "監測儀器";
+        if (lastNode != null) {
+            lastNode.style = "color:#abb4be;";
+        }
+        document.getElementById("errorCheck").checked = false;
+        document.getElementById("compareCheck").checked = false;
+
+        lastNode = document.getElementById(option).parentNode;
+        lastNode.style = "color:#0088cc;";
+
+        LoadPage();
+    });
+})