Browse Source

孙洋洋

syyang 2 years ago
parent
commit
0361c0bcb5

+ 69 - 13
leiSP-admin/src/main/resources/static/css/login.min.css

@@ -4,17 +4,17 @@ html {
 
 body.signin {
     height: auto;
-    background: url(../img/login-background1.jpg) no-repeat center fixed;
-    -webkit-background-size: cover;
-    -moz-background-size: cover;
-    -o-background-size: cover;
-    background-size: cover;
+    background: url(../img/thjk_dlbg.png) no-repeat center fixed;
+    -webkit-background-size: 100%;
+    -moz-background-size: 100%;
+    -o-background-size: 100%;
+    background-size: 100%;
     color: rgba(255, 255, 255, .95)
 }
 
 .signinpanel {
-    width: 900px;
-    margin: 15% auto 0
+    width: 1100px;
+    margin: 4% auto 0
 }
 
 .signinpanel .logopanel {
@@ -31,10 +31,53 @@ body.signin {
 }
 
 .signinpanel .signin-info h6 {
-    font-size: 36px;
+
+    background: url(../img/thjk_dltit.png) no-repeat center;
+    padding-left: 260px;
+    height: 137px;
+    letter-spacing: 7px;
+    line-height: 185px;
+}
+.signinpanel .signin-info h6 i{
+    font-size: 42px;
     font-weight: bold;
     padding: 0;
-    margin: 90px 0
+    margin: 90px 0;
+    background: url(../img/thjk_dltit.png) no-repeat center;
+    height: 137px;
+    letter-spacing: 7px;
+    line-height: 185px;
+    background-image:-webkit-linear-gradient(right,#2497d5,#3bf1ec,#218ad2);
+    -webkit-background-clip:text;
+    -webkit-text-fill-color:transparent;
+}
+.signinpanel .signin-info i.xx_i{
+    position: absolute;
+    right: 12px;
+    top: 67px;
+    -webkit-animation: twinkling 2s infinite ease-in-out
+}
+.animated{
+    -webkit-animation-duration: 2s;
+    animation-duration: 2s;
+    -webkit-animation-fill-mode: both;
+    animation-fill-mode: both
+}
+@-webkit-keyframes twinkling{
+    0%{
+        opacity: 0.7;
+    }
+    100%{
+        opacity: 1;
+    }
+}
+@keyframes twinkling{
+    0%{
+        opacity: 0.7;
+    }
+    100%{
+        opacity: 1;
+    }
 }
 .signinpanel .form-control {
     display: block;
@@ -62,20 +105,22 @@ body.signin {
 }
 
 .signinpanel form {
-    background: rgba(255, 255, 255, 1);
-    border: 1px solid rgba(255, 255, 255, .3);
+    background: url("../img/thjk_dlk.png") no-repeat center;
     -moz-box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
     -webkit-box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
     box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     border-radius: 3px;
-    padding: 35px
+    padding: 75px 50px;
+    background-size: 100% 100%;
+    margin-top: 120px;
 }
 .btn-success-login {
     background-color: #1c84c6;
     border-color: #1c84c6;
     color: #FFFFFF;
+    height: 40px;
 }
 
 .signup-footer {
@@ -177,9 +222,20 @@ body.signin {
 .form-control {
     border-radius: 1px !important;
     padding: 6px 12px !important;
-    height: 34px !important
+    height: 40px !important;
 }
 
 .form-control:focus {
     border-color: #1ab394 !important
+}
+
+#btnSubmit:hover{
+    color: #fff;
+    background: rgba(35,88,255,0.85);
+}
+#large-header{
+    position: fixed;
+    width: 100%;
+    height: 918px;
+    z-index: 0;
 }

BIN
leiSP-admin/src/main/resources/static/img/thjk_dlbg.png


BIN
leiSP-admin/src/main/resources/static/img/thjk_dlimg.png


BIN
leiSP-admin/src/main/resources/static/img/thjk_dlimg2.png


BIN
leiSP-admin/src/main/resources/static/img/thjk_dlimg3.png


BIN
leiSP-admin/src/main/resources/static/img/thjk_dlk.png


BIN
leiSP-admin/src/main/resources/static/img/thjk_dltit.png


File diff suppressed because it is too large
+ 12 - 0
leiSP-admin/src/main/resources/static/js/EasePack.min.js


File diff suppressed because it is too large
+ 12 - 0
leiSP-admin/src/main/resources/static/js/TweenLite.min.js


+ 178 - 0
leiSP-admin/src/main/resources/static/js/canvasindex.js

@@ -0,0 +1,178 @@
+
+;(function() {
+        var s, i, l, d, f, n, r, c = true;
+        k();
+        j();
+        a();
+        function k() {
+            s = window.innerWidth;
+            i = window.innerHeight;
+            r = {
+                x: s / 2,
+                y: i / 2
+            };
+            l = document.getElementById("large-header");
+            l.style.height = i + "px";
+            d = document.getElementById("demo-canvas");
+            d.width = s;
+            d.height = i;
+            f = d.getContext("2d");
+            n = [];
+            for (var G = 0; G < s; G = G + s / 20) {
+                for (var H = 0; H < i; H = H + i / 20) {
+                    var E = G + Math.random() * s / 20;
+                    var F = H + Math.random() * i / 20;
+                    var A = {
+                        x: E,
+                        originX: E,
+                        y: F,
+                        originY: F
+                    };
+                    n.push(A)
+                }
+            }
+            for (var v = 0; v < n.length; v++) {
+                var u = [];
+                var B = n[v];
+                for (var w = 0; w < n.length; w++) {
+                    var C = n[w];
+                    if (!(B == C)) {
+                        var D = false;
+                        for (var z = 0; z < 5; z++) {
+                            if (!D) {
+                                if (u[z] == undefined) {
+                                    u[z] = C;
+                                    D = true
+                                }
+                            }
+                        }
+                        for (var z = 0; z < 5; z++) {
+                            if (!D) {
+                                if (h(B, C) < h(B, u[z])) {
+                                    u[z] = C;
+                                    D = true
+                                }
+                            }
+                        }
+                    }
+                }
+                B.closest = u
+            }
+            for (var v in n) {
+                var t = new e(n[v],2 + Math.random() * 2,"rgba(255,255,255,0.3)");
+                n[v].circle = t
+            }
+        }
+        function a() {
+            if (!("ontouchstart"in window)) {
+                window.addEventListener("mousemove", m)
+            }
+            window.addEventListener("scroll", p);
+            window.addEventListener("resize", o)
+        }
+        function m(t) {
+            var u = posy = 0;
+            if (t.pageX || t.pageY) {
+                u = t.pageX;
+                posy = t.pageY
+            } else {
+                if (t.clientX || t.clientY) {
+                    u = t.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
+                    posy = t.clientY + document.body.scrollTop + document.documentElement.scrollTop
+                }
+            }
+            r.x = u;
+            r.y = posy
+        }
+        function p() {
+            if (document.body.scrollTop > i) {
+                c = false
+            } else {
+                c = true
+            }
+        }
+        function o() {
+            s = window.innerWidth;
+            i = window.innerHeight;
+            l.style.height = i + "px";
+            d.width = s;
+            d.height = i
+        }
+        function j() {
+            b();
+            for (var t in n) {
+                q(n[t])
+            }
+        }
+        function b() {
+            if (c) {
+                f.clearRect(0, 0, s, i);
+                for (var t in n) {
+                    if (Math.abs(h(r, n[t])) < 4000) {
+                        n[t].active = 0.3;
+                        n[t].circle.active = 0.6
+                    } else {
+                        if (Math.abs(h(r, n[t])) < 20000) {
+                            n[t].active = 0.1;
+                            n[t].circle.active = 0.3
+                        } else {
+                            if (Math.abs(h(r, n[t])) < 40000) {
+                                n[t].active = 0.02;
+                                n[t].circle.active = 0.1
+                            } else {
+                                n[t].active = 0;
+                                n[t].circle.active = 0
+                            }
+                        }
+                    }
+                    g(n[t]);
+                    n[t].circle.draw()
+                }
+            }
+            requestAnimationFrame(b)
+        }
+        function q(t) {
+            TweenLite.to(t, 1 + 1 * Math.random(), {
+                x: t.originX - 50 + Math.random() * 100,
+                y: t.originY - 50 + Math.random() * 100,
+                ease: Circ.easeInOut,
+                onComplete: function() {
+                    q(t)
+                }
+            })
+        }
+        function g(u) {
+            if (!u.active) {
+                return
+            }
+            for (var t in u.closest) {
+                f.beginPath();
+                f.moveTo(u.x, u.y);
+                f.lineTo(u.closest[t].x, u.closest[t].y);
+                f.strokeStyle = "rgba(156,217,249," + u.active + ")";
+                f.stroke()
+            }
+        }
+        function e(v, w, u) {
+            var t = this;
+            (function() {
+                    t.pos = v || null;
+                    t.radius = w || null;
+                    t.color = u || null
+                }
+            )();
+            this.draw = function() {
+                if (!t.active) {
+                    return
+                }
+                f.beginPath();
+                f.arc(t.pos.x, t.pos.y, t.radius, 0, 2 * Math.PI, false);
+                f.fillStyle = "rgba(156,217,249," + t.active + ")";
+                f.fill()
+            }
+        }
+        function h(t, u) {
+            return Math.pow(t.x - u.x, 2) + Math.pow(t.y - u.y, 2)
+        }
+    }
+)();

+ 19 - 4
leiSP-admin/src/main/resources/templates/login.html

@@ -21,19 +21,30 @@
     </script>
 </head>
 <body class="signin">
+<div id="large-header">
+    <canvas id="demo-canvas"></canvas>
+</div>
     <div class="signinpanel">
+
         <div class="row">
-            <div class="col-sm-7">
+            <div class="col-sm-12">
                 <div class="signin-info">
 
-                    <h6>通化市数据共享交换前置机平台</h6>
-
+                    <h6><i>通化市数据共享交换前置机平台</i></h6>
+                    <i class="xx_i"><img src="../img/thjk_dlimg2.png"/> </i>
                     <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号? <a th:href="@{/register}">立即注册&raquo;</a></strong>
                 </div>
             </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-7">
+                <div class="dl_left">
+
+                </div>
+            </div>
             <div class="col-sm-5">
                 <form id="signupForm" autocomplete="off">
-                    <h4  style="color: #333333;font-size: 18px;">登录:</h4>
+                    <h4  style="color: #fff;font-size: 18px;">登录:</h4>
                     <input type="text"     name="username" class="form-control uname" placeholder="用户名" value="" />
                     <input type="password" name="password" class="form-control pword" placeholder="密码"   value="" />
 					<!--<div class="row m-t" th:if="${captchaEnabled==true}">-->
@@ -66,5 +77,9 @@
 <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}"></script>
 <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
+<script src="../static/js/EasePack.min.js" th:src="@{/js/EasePack.min.js}"></script>
+<script src="../static/js/TweenLite.min.js" th:src="@{/js/TweenLite.min.js}"></script>
+<script src="../static/js/canvasindex.js" th:src="@{/js/canvasindex.js}"></script>
+
 </body>
 </html>

+ 15 - 4
mybusiness/src/main/resources/static/visualization/css/th_yj.css

@@ -1236,13 +1236,24 @@ color: #e22020!important;
 	margin-top: 20px;
 	margin-right: 20px;
 }
-#gjsj2{
-	width: 790px;
+#gjsj_can{
+	width: 750px;
 	height: 280px;
 	float: left;
 }
+#gjsj_can h2{
+	height: 30px;
+	line-height: 30px;
+	color: #fff;
+	font-size: 16px;
+	padding-left: 40px;
+}
+#gjsj2{
+	width: 750px;
+	height: 250px;
+}
 #gjsj_bt{
-	width: 300px;
+	width: 340px;
 	height: 280px;
 	float: left;
 }
@@ -1308,4 +1319,4 @@ appearance:none;
 	font-family: electronicFont;
 	text-decoration: none;
 	max-width: 380px;
-}
+}

+ 7 - 2
mybusiness/src/main/resources/templates/visualization/tk_iframe.html

@@ -110,7 +110,12 @@
         </div>
         <!--共享应用分析 饼图-->
         <div id="gjsj_bt"></div>
-        <div id="gjsj2"></div>
+
+        <div id="gjsj_can">
+            <h2>按月份统计的折线图</h2>
+            <div id="gjsj2"></div>
+
+        </div>
     </div>
     <div class="tk_bottom2 tk_bg fl">
         <div class="con_tit clearfix">
@@ -681,7 +686,7 @@
         function getEhartsOption(data) {
             var option;
             return option ={
-                color:["#FFD600", "#00A2FF","#6924FE","#CA44FB","#6B61FF"],
+                color:["#00ff00", "#fd6d08","#ff6aac","#0cc5fc","#7c3cff"],
                 title : {
                     text: data.title,
                     subtext: data.subtext,