Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
This commit is contained in:
		
						commit
						690d06cbf4
					
				@ -2066,16 +2066,6 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
 | 
				
			|||||||
    <script src="js/init.js"></script>
 | 
					    <script src="js/init.js"></script>
 | 
				
			||||||
    <script>       
 | 
					    <script>       
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //重新轉址 for Niagara4
 | 
					 | 
				
			||||||
        var temp_cuurent_Url_pathname = window.location.pathname.split("/").slice(0, 3);
 | 
					 | 
				
			||||||
        var redirectionUrl = window.location.origin + "/" +
 | 
					 | 
				
			||||||
            temp_cuurent_Url_pathname[temp_cuurent_Url_pathname.length - 1].replace(":%5E", "/") + "/" +
 | 
					 | 
				
			||||||
            window.location.pathname.split("/").slice(3).join("/");
 | 
					 | 
				
			||||||
        //判斷url是否包含"ord",如果有重新轉址
 | 
					 | 
				
			||||||
        if (temp_cuurent_Url_pathname.findIndex(x => x == "ord") > -1) {
 | 
					 | 
				
			||||||
            document.location.href = redirectionUrl.substr(0, redirectionUrl.length - 1);
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        var jwt = localStorage.getItem("JWT-Authorization");
 | 
					        var jwt = localStorage.getItem("JWT-Authorization");
 | 
				
			||||||
        var pageAct = {};  //記錄全頁面已選擇項目
 | 
					        var pageAct = {};  //記錄全頁面已選擇項目
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
 | 
				
			|||||||
@ -7,3 +7,13 @@ var varPathImg = "/Upload/Images/";
 | 
				
			|||||||
var varPathFile = "/Upload/Files/";
 | 
					var varPathFile = "/Upload/Files/";
 | 
				
			||||||
var statusArr = { 1: "啟用", 0: "未啟用", 9: "刪除" };
 | 
					var statusArr = { 1: "啟用", 0: "未啟用", 9: "刪除" };
 | 
				
			||||||
var objSendData = { Data: null };
 | 
					var objSendData = { Data: null };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					//重新轉址 for Niagara4
 | 
				
			||||||
 | 
					var temp_cuurent_Url_pathname = window.location.pathname.split("/").slice(0, 3);
 | 
				
			||||||
 | 
					var redirectionUrl = window.location.origin + "/" +
 | 
				
			||||||
 | 
					    temp_cuurent_Url_pathname[temp_cuurent_Url_pathname.length - 1].replace(":%5E", "/") + "/" +
 | 
				
			||||||
 | 
					    window.location.pathname.split("/").slice(3).join("/");
 | 
				
			||||||
 | 
					//判斷url是否包含"ord",如果有重新轉址
 | 
				
			||||||
 | 
					if (temp_cuurent_Url_pathname.findIndex(x => x == "ord") > -1) {
 | 
				
			||||||
 | 
					    document.location.href = redirectionUrl.substr(0, redirectionUrl.length - 1);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -27,7 +27,7 @@
 | 
				
			|||||||
    <div class="blankpage-form-field">
 | 
					    <div class="blankpage-form-field">
 | 
				
			||||||
        <div class="page-logo m-0 w-100 align-items-center justify-content-center rounded border-bottom-left-radius-0 border-bottom-right-radius-0 px-4">
 | 
					        <div class="page-logo m-0 w-100 align-items-center justify-content-center rounded border-bottom-left-radius-0 border-bottom-right-radius-0 px-4">
 | 
				
			||||||
            <div class="page-logo-link press-scale-down d-flex align-items-center">
 | 
					            <div class="page-logo-link press-scale-down d-flex align-items-center">
 | 
				
			||||||
                <img src="/img/logo.png" aria-roledescription="logo">
 | 
					                <img src="img/logo.png" aria-roledescription="logo">
 | 
				
			||||||
                <span class="page-logo-text mr-1">全方位監控系統</span>
 | 
					                <span class="page-logo-text mr-1">全方位監控系統</span>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
@ -70,8 +70,8 @@
 | 
				
			|||||||
    </video>
 | 
					    </video>
 | 
				
			||||||
    <!--Base JS-->
 | 
					    <!--Base JS-->
 | 
				
			||||||
    <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js'></script>
 | 
					    <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js'></script>
 | 
				
			||||||
    <script src="lib//vendors.bundle.js"></script>
 | 
					    <script src="lib/vendors.bundle.js"></script>
 | 
				
			||||||
    <script src="lib//app.bundle.js"></script>
 | 
					    <script src="lib/app.bundle.js"></script>
 | 
				
			||||||
    <!-- JQuery Validate -->
 | 
					    <!-- JQuery Validate -->
 | 
				
			||||||
    <script src="lib/jquery-validation/dist/jquery.validate.js"></script>
 | 
					    <script src="lib/jquery-validation/dist/jquery.validate.js"></script>
 | 
				
			||||||
    <script src="lib/jquery-validation/dist/additional-methods.min.js"></script>
 | 
					    <script src="lib/jquery-validation/dist/additional-methods.min.js"></script>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user