From 6a58afddd58c7036d996bb5ed54f05234b73efce Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 02 十一月 2022 14:21:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/login.html | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 68a6719..31dc53c 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -6,6 +6,7 @@
<title>登录系统</title>
<meta name="description" content="后台管理框架">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
+<!-- <link href="../static/css/stats.css" th:href="@{/css/stats.css}" rel="stylesheet"/>-->
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
<link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
<link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
@@ -60,6 +61,13 @@
font-weight: 500;
font-size:36px;
}
+ canvas {
+ display: block;
+ vertical-align: bottom;
+ }
+ .apTitleB{
+
+ }
</style>
<script>
if (window.top !== window.self) {
@@ -69,12 +77,15 @@
;
</script>
</head>
+<!-- count particles -->
<!-- particles.js container -->
-<div id="particles-js" style="display: flex;align-items: center;justify-content: center;z-index:-1;">
- <canvas class="particles-js-canvas-el" style="width: 100%; height: 100%;" width="472" height="625"></canvas>
-</div>
+<div id="particles-js"></div>
+<!-- particles.js container -->
+<!--<div id="particles-js" style="display: flex;align-items: center;justify-content: center;z-index:-1;">-->
+<!-- <canvas class="particles-js-canvas-el" style="width: 100%; height: 100%;" width="472" height="625"></canvas>-->
+<!--</div>-->
<body class="signin">
- <h1>新疆国泰新华矿业股份有限公司双重预防系统</h1>
+ <h1 style="color: #01d0ff;">新疆国泰新华矿业股份有限公司双重预防系统</h1>
<div class="signinpanel">
<!-- <div class="col-sm-7">-->
<!-- <div class="signin-info">-->
@@ -122,8 +133,6 @@
技术支持：苏州国科鸿宇科技有限公司
</div>
<!-- scripts -->
-<script src="../static/js/login.js"></script>
-<script src="../static/js/loginApp.js"></script>
<script th:inline="javascript"> var ctx = [[@{
/}]]; var captchaType = [[${captchaType}]]; </script>
@@ -139,5 +148,30 @@
<script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.2.0}"></script>
<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
+<script src="../static/js/login.js" th:src="@{/js/loginApp.js}"></script>
+<script src="../static/js/stats.js" th:src="@{/js/stats.js}"></script>
+<script src="../static/js/stats.js" th:src="@{/js/stats.js}"></script>
+<script src="../static/js/particles.min.js" th:src="@{/js/particles.min.js}"></script>
+<script src="../static/js/app.js" th:src="@{/js/app.js}"></script>
+<!-- <script src="../static/js/loginApp.js" th:src="@{/js/login.js}"></script>-->
+ <script>
+ var count_particles, stats, update;
+ stats = new Stats;
+ stats.setMode(0);
+ stats.domElement.style.position = 'absolute';
+ stats.domElement.style.left = '0px';
+ stats.domElement.style.top = '0px';
+ document.body.appendChild(stats.domElement);
+ count_particles = document.querySelector('.js-count-particles');
+ update = function() {
+ stats.begin();
+ stats.end();
+ if (window.pJSDom[0].pJS.particles && window.pJSDom[0].pJS.particles.array) {
+ count_particles.innerText = window.pJSDom[0].pJS.particles.array.length;
+ }
+ requestAnimationFrame(update);
+ };
+ requestAnimationFrame(update);
+ </script>
</body>
</html>
--
Gitblit v1.9.2