Merge remote-tracking branch 'remotes/origin/hechu1'

web/WEB-INF/tld/fn.tld

@@ -94,7 +94,6 @@
       You have ${fn:length(shoppingCart.products)} in your shopping cart.
     </example>
   </function>
-
   <function>
     <description>
       Returns a string resulting from replacing in an input string all occurrences

web/cssFile/download_style.css

@@ -1,5 +1,5 @@
 .downloadList{
-  margin: 20px;
+  margin: 10px 20px 20px 20px;
   position: relative;
   width: 900px;
   height: 600px;
@@ -11,6 +11,8 @@
   margin: 20px;
 }
 .link-frame{
+  transition: 0.3s;
+  line-height: 40px;
   margin: 10px;
   padding-left: 20px;
   border-radius: 10px;
@@ -20,5 +22,25 @@
   height: 40px;
 }
 .link-frame:hover{
-  background-color: #ff5a5f;
+  background-color: rgba(210, 66, 73, 0.89);
+  height: 50px;
+}
+.download-select{
+  margin: 20px 20px 0 20px;
+  background-color: #323232;
+  height: 70px;
+  width: 900px;
+  border-radius: 10px;
+}
+.download-retrieval{
+  color: white;
+  text-align: center;
+  font-size: 20px;
+  line-height: 50px;
+  float: left;
+  height:54px;
+  width: 884px;
+  margin: 5px;
+  border: 3px solid #6e6e6e;
+  border-radius: 10px;
 }

web/cssFile/fill-style.css

@@ -1,17 +1,20 @@
 .fill-child{
   position: relative;
-  margin: 20px 0px;
+  margin: 10px 10px;
   background-color: white;
-  width: 98%;
+  width: 97%;
   height: 200px;
   border-radius: 10px;
   border: 1px solid rgba(0, 0, 0, 0.26);
 }
 .fill-frame{
+  border-radius: 5px;
+  border: 1px solid rgba(0, 0, 0, 0.35);
   position:absolute;
-  top: 20px;
+  background-color: white;
-  right: 30px;
+  top: 100px;
-  width: 900px;
+  right: 10px;
+  width: 960px;
   max-height: 700px;
   overflow-y: scroll;
 }
@@ -116,4 +119,12 @@
   right: 220px;
   padding-left: 15px;
 }
-.
+.fill-top-blank{
+  border-radius: 5px;
+  height: 70px;
+  width: 960px;
+  position: absolute;
+  top: 20px;
+  right: 10px;
+  background-color: #323232;
+}

web/cssFile/home.css

@@ -1,13 +1,16 @@
 body{
   margin: 0px;
   padding: 0px;
-  background-color:#f5f5f5;
+  background-color: #f0f0f0;
   width: 100%;
   height: 100%;
 }
-
 .main2{
-  background-color: rgb(249, 248, 255);
+  background-color:#fafafa;
+}
+.updated{
+  position: relative;
+  width: 100%;
 }
 a{
   text-decoration: none;
@@ -22,10 +25,10 @@ ul{
 .top-bar{
   width: 100%;
   height: 55px;
-  position: relative;
+  position: fixed;
   background-color: #c13139;
   z-index: 100;
-  box-shadow: 5px 0px 10px rgba(0,0,0,0.47);
+  box-shadow: 5px 0px 10px rgba(0, 0, 0, 0.3);
 }
 .top-center-bar{
   position: relative;
@@ -109,7 +112,6 @@ ul{
   margin: 10px 10px 10px 10px;
 }
 .opt-options div{
-
   width: 100%;
   height: 30px;
   text-align: center;
@@ -122,7 +124,7 @@ ul{
   background-color: rgba(0, 0, 0, 0.21);
 }
 .personal-opt .opt{
-width: 35px;
+
   height: 100%;
   width: 55px;
   cursor: pointer;
@@ -139,7 +141,7 @@ width: 35px;
   left: 5px;
   width: 100px;
   height: 800px;
-  background-color: #251d20;
+  background-color: #323232;
   box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.35);
 }
 .nav-bar .a-process{
@@ -169,6 +171,7 @@ width: 35px;
   box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.32);
 }
 .main2{
+  top: 55px;
   z-index: 2;
   position: relative;
   width: 1100px;
@@ -204,7 +207,7 @@ width: 35px;
   width: 990px;
   position: relative;
   left: 110px;
-  height: 900px;
+  min-height: 825px;
 }
 .scroll-ads{
   height: 250px;
@@ -214,7 +217,7 @@ width: 35px;
   margin: 20px 45px;
   border-radius: 10px;
   overflow: hidden;
-  border: 1px solid rgba(0, 0, 0, 0.33);
+  border: 1px solid rgba(0, 0, 0, 0.46);
   box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.22);
 }
 .scroll-ads .scroll-ads-imgs .scroll-child{
@@ -306,18 +309,17 @@ width: 35px;
 .notice-child .notice-text{
   color: rgba(0, 0, 0, 0.91);
   width: 100%;
-  min-height: 100px;
+  height: 0px;
+  min-height: 0;
+  font-size: 0px;
   text-align: left;
-  display: none;
+  transition: 0.5s;
-  transition-delay:0.3s;
   background-color: #f3f3f3;
   border-top: 1px solid rgba(0, 0, 0, 0.26);
 }
-.notice-child .notice-title:hover + .notice-text{
+.notice-child.select .notice-text{
-  display: block;
+  min-height: 100px;
-}
+  font-size: 15px;
-.notice-child .notice-text:hover{
-  display: block;
 }
 .notice-child .notice-title .expend{
   position: relative;
@@ -334,12 +336,15 @@ width: 35px;
   margin: 0px 120px;
 }
 .notice-choose{
-  width: 80px;
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.16);
-  height: 200px;
+  border-radius: 10px;
+  background-color: #ffffff;
+  width: 90px;
+  height: 400px;
   position: absolute;
-  top: 370px;
+  top: 300px;
-  right: 62px;
+  right: 45px;
-  border: 1px solid rgba(255, 255, 255, 0);
+  border: 1px solid rgb(157, 157, 157);
 }
 .notice-choose .notice-class{
   margin: 8px 0;
@@ -350,9 +355,69 @@ width: 35px;
   line-height: 45px;
   text-align: center;
   background-color: #c62235;
-  border-radius: 0 10px 10px 0;
+  border-radius: 5px 10px 10px 5px;
   transition: all 0.3s;
 }
 .notice-choose .notice-class:hover{
   width: 110%;
 }
+.small-ads{
+  z-index: 120;
+  right: 350px;
+  top: 225px;
+  position: absolute;
+  width: 200px;
+  height: 20px;
+}
+.sm-one{
+  float: left;
+  margin: 0px 15px;
+  width:20px;
+  transition: 0.3s;
+  height: 10px;
+  border-radius: 10px;
+}
+.sm-one .white-point{
+  margin: 0 auto;
+  width:10px;
+  background-color: white;
+  transition: 0.3s;
+  height: 10px;
+  border-radius: 10px;
+}
+.sm-one .white-point:hover{
+  width:20px;
+}
+.bottom-bar{
+  position: relative;
+  background-color: #323232;
+  height: 250px;
+  width: 100%;
+  top:60px;
+}
+.big-logo{
+  line-height: 150px;
+  font-size: 50px;
+  color: #e7e7e7;
+  text-align: center;
+  width: 100%;
+  height: 160px;
+  border-bottom:1px solid #585858;
+}
+.bottom-bar p{
+  width: 100%;
+  text-align: center;
+  color: #7b7b7b;
+}
+.model-info{
+  float: left;
+  width: 100px;
+  height: 40px;
+  margin: 15px 10px;
+  background-color: #e4e4e4;
+  border-radius: 5px;
+  color: #1b1b1b;
+  padding-left: 10px;
+  line-height: 35px;
+  font-size: 18px;
+}

web/cssFile/personal.css

@@ -2,10 +2,6 @@ ul{
   padding: 0;
   margin: 0;
 }
-.updated{
-  width: 100%;
-  height: 100%;
-}
 .personal-choose{
   position: absolute;
   top: 70px;
@@ -128,3 +124,6 @@ ul{
 .change-pw-frame .sm-input-style:hover{
   background-color: #517fff;
 }
+.personal-frame{
+  background-color: white;
+}

web/cssFile/select-style.css

@@ -2,9 +2,8 @@ button{
   cursor: pointer;
 }
 .select-frame{
-  position: relative;
+  border:1px solid rgba(0, 0, 0, 0);
   width: 100%;
-  height: 100%;
 }
 a{
   text-decoration: none;
@@ -13,9 +12,9 @@ a{
   position: absolute;
   width: 350px;
   height: 50px;
-  top:40px;
+  top:10px;
-  right: 90px;
+  right: 20px;
-  background-color: rgba(0, 0, 0, 0.14);
+  background-color: rgba(255, 255, 255, 0.23);
   border-radius: 5px;
 }
 .search-button{
@@ -62,11 +61,9 @@ a{
   border: 1px solid rgba(0, 0, 0, 0.28);
   border-radius: 10px;
   overflow-y: scroll;
-  right: 90px;
+  margin:100px 0px 0px 198px;
-  top: 100px;
-  position: absolute;
   max-height: 700px;
-  width: 700px;
+  width: 780px;
 }
 .select-it{
   box-shadow:0px 2px 4px rgba(0, 0, 0, 0.22);
@@ -113,15 +110,16 @@ a{
   top: 80px;
 }
 .select-blank{
-  display: none;
+  transition: 0.5s;
+  height: 0;
+  font-size: 0;
+  background-color: #252323;
+  width: 95%;
+  margin:0px 5px;
 }
 .count-select:hover .select-blank{
   display: block;
-  transition: height 1s;
   height: 400px;
-  background-color: #252323;
-  width: 95%;
-  margin:0px 5px;
 }
 .count-select .selected-info{
   width: 100%;
@@ -147,14 +145,14 @@ a{
 .other-msgs{
   font-size: 11px;
   float: left;
-  width: 380px;
+  width: 450px;
   height: 90px;
-  margin: 15px 0 15px 30px;
+  margin: 15px 0 15px 40px;
 }
 .other-msgs .one-msg{
   float:left;
   padding-left: 10px;
-  margin: 5px 2px;
+  margin: 5px 3px;
   width: 45%;
   height:20px;
   background-color: rgba(0, 0, 0, 0.78);
@@ -164,3 +162,12 @@ a{
 .one-msg:hover{
   background-color: rgba(39, 39, 39, 0.78);
 }
+.top-blank{
+  position: absolute;
+  height: 70px;
+  width: 960px;
+  top: 20px;
+  left: 20px;
+  background-color: #323232;
+  border-radius: 5px;
+}

web/cssFile/upload_style.css

@@ -1,8 +1,8 @@
 .upload-frame{
-  position: relative;
+  position:absolute;
-  top: 50px;
+  top: 100px;
-  left: 60px;
+  right: 10px;
-  width:  900px;
+  width:  960px;
   height: 200px;
   border: 1px solid rgba(0, 0, 0, 0.33);
   background-color: white;

web/download.jsp

@@ -14,6 +14,11 @@
 </head>
 <body>
 <div class="updated">
+    <div class="download-select">
+        <div class="download-retrieval">
+            资料下载
+        </div>
+    </div>
 <div class="downloadList">
     <div class="download-list-frame">
         <a href="##">

web/fill_Information.jsp

@@ -29,8 +29,8 @@
     pageContext.setAttribute("type",type);
 %>
 <div class="updated">
+    <div class="fill-top-blank"><div class="model-info">填写意见</div></div>
     <div class="fill-frame bar-change">
-
         <div class="fill-child">
             <div class="fill-name">${map.姓名}</div>
             <div class="upload-status"></div>

web/home.jsp

@@ -6,6 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head>
     <title>毕业设计管理系统</title>
@@ -24,6 +25,7 @@
     <script type="text/javascript" src="jsFile/upload_action.js"></script>
 </head>
 <body>
+<%String type="teacher";pageContext.setAttribute("userType",type);%>
 <div class="main">
     <div class="top-bar">
         <div class="top-center-bar">
@@ -46,109 +48,120 @@
 
     </div>
     <div class="main2">
-        <div class="nav-bar">
+            <div class="nav-bar">
-            <div class="point-bar"></div>
+                <div class="point-bar"></div>
-            <div class="a-process personal-msg">
+                <div class="a-process personal-msg">
-                <a href="personal_setting.jsp" class="link-point personal-msg-page">
+                    <a href="personal_setting.jsp" class="link-point personal-msg-page">
-                    <div class="a-process-decoration personal-set">
+                        <div class="a-process-decoration personal-set">
-                        <img src="cssFile/images/man.png">
+                            <img src="cssFile/images/man.png">
-                    </div>
+                        </div>
-                    <div class="nav-info">个人信息</div>
+                        <div class="nav-info">个人信息</div>
-                </a>
+                    </a>
-            </div>
+                </div>
-            <div class="a-process aux-fun">
+                <div class="a-process aux-fun">
-                <a href="download.jsp" class="link-point aux-fun-page">
+                    <a href="download.jsp" class="link-point aux-fun-page">
-                    <div class="a-process-decoration download">
+                        <div class="a-process-decoration download">
-                        <img src="cssFile/images/download.png">
+                            <img src="cssFile/images/download.png">
-                    </div>
+                        </div>
-                    <div class="nav-info">资料下载</div>
+                        <div class="nav-info">资料下载</div>
-                </a>
+                    </a>
-            </div>
+                </div>
-            <div class="a-process select-area">
+                <c:if test="${userType=='teacher'}">
-                <a href="select.jsp" class="link-point data-download-page">
+                    <div class="a-process select-area">
-                    <div class="a-process-decoration select">
+                        <a href="select.jsp" class="link-point data-download-page">
-                        <img src="cssFile/images/select.png">
+                            <div class="a-process-decoration select">
-                    </div>
+                                <img src="cssFile/images/select.png">
-                    <div class="nav-info">选择老师</div>
+                            </div>
-                </a>
+                            <div class="nav-info">选择老师</div>
-            </div>
-            <div class="a-process file-info">
-                <a href="fill_Information.jsp" class="link-point">
-                    <div class="a-process-decoration">
-                        <img src="cssFile/images/fill.png">
-                    </div>
-                    <div class="nav-info">填写信息</div>
-                </a>
-            </div>
-            <div class="a-process">
-                <a href="upload_file.jsp" class="link-point">
-                    <div class="a-process-decoration">
-                        <img src="cssFile/images/upload.png">
-                    </div>
-                    <div class="nav-info">上传文件</div>
-                </a>
-            </div>
-        </div>
-        <div class="update-frame">
-            <div class="scroll-ads">
-                <ul class="scroll-ads-imgs" style="transform: translateX(0%)">
-                    <li class="scroll-child">
-                        <a>
-                            <img src="cssFile/images/change.jpg">
-                            <div class="ads-text">holle</div>
-                        </a>
-                    </li>
-                    <li class="scroll-child">
-                        <a>
-                            <img src="cssFile/images/change2.jpg">
-                            <div class="ads-text">holle</div>
-                        </a>
-                    </li>
-                    <li class="scroll-child">
-                        <a>
-                            <img src="cssFile/images/change3.jpg">
-                            <div class="ads-text">holle</div>
-                        </a>
-                    </li>
-                    <li class="scroll-child">
-                        <a>
-                            <img src="cssFile/images/change.jpg">
-                            <div class="ads-text">holle</div>
                         </a>
-                    </li>
-                </ul>
-            </div>
-            <div class="notice-frame">
-                <div class="notice-frame-info">公告</div>
-                <div class="notice-cont bar-change">
-                    <div class="notice-child">
-                        <div class="notice-title"><div class="expend"></div>
-                            <div class="title-text">欢迎使用</div></div>
-                        <div class="notice-text">欢迎使用GDMS</div>
                     </div>
-                    <div class="notice-child">
+                    <div class="a-process file-info">
-                        <div class="notice-title"><div class="expend"></div>
+                        <a href="fill_Information.jsp" class="link-point">
-                            <div class="title-text">寒假通知</div></div>
+                            <div class="a-process-decoration">
-                        <div class="notice-text">早点回去吧</div>
+                                <img src="cssFile/images/fill.png">
+                            </div>
+                            <div class="nav-info">填写信息</div>
+                        </a>
                     </div>
-                    <div class="notice-child">
+                    <div class="a-process">
-                        <div class="notice-title"><div class="expend"></div>
+                        <a href="upload_file.jsp" class="link-point">
-                            <div class="title-text">开题截至日期</div></div>
+                            <div class="a-process-decoration">
-                        <div class="notice-text">开题截至日期一月七号</div>
+                                <img src="cssFile/images/upload.png">
+                            </div>
+                            <div class="nav-info">上传文件</div>
+                        </a>
                     </div>
-                    <div class="notice-child">
+                </c:if>
-                        <div class="notice-title"><div class="expend"></div>
+            </div>
-                            <div class="title-text">评阅截至日期</div></div>
+            <div class="update-frame">
-                        <div class="notice-text">评阅截至日期四月七号</div>
+                <div class="small-ads">
+                    <div class="sm-one"><div class="white-point"></div></div>
+                    <div class="sm-one"><div class="white-point"></div></div>
+                    <div class="sm-one"><div class="white-point"></div></div>
+                </div>
+                <div class="scroll-ads">
+                    <ul class="scroll-ads-imgs" style="transform: translateX(0%)">
+                        <li class="scroll-child">
+                            <a>
+                                <img src="cssFile/images/change.jpg">
+                                <div class="ads-text">hello</div>
+                            </a>
+                        </li>
+                        <li class="scroll-child">
+                            <a>
+                                <img src="cssFile/images/change2.jpg">
+                                <div class="ads-text">hello</div>
+                            </a>
+                        </li>
+                        <li class="scroll-child">
+                            <a>
+                                <img src="cssFile/images/change3.jpg">
+                                <div class="ads-text">hello</div>
+                            </a>
+                        </li>
+                        <li class="scroll-child">
+                            <a>
+                                <img src="cssFile/images/change.jpg">
+                                <div class="ads-text">hello</div>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="notice-frame">
+                    <div class="notice-frame-info">公告</div>
+                    <div class="notice-cont bar-change">
+                        <div class="notice-child">
+                            <div class="notice-title"><div class="expend"></div>
+                                <div class="title-text">欢迎使用</div></div>
+                            <div class="notice-text">欢迎使用GDMS</div>
+                        </div>
+                        <div class="notice-child">
+                            <div class="notice-title"><div class="expend"></div>
+                                <div class="title-text">寒假通知</div></div>
+                            <div class="notice-text">早点回去吧</div>
+                        </div>
+                        <div class="notice-child">
+                            <div class="notice-title"><div class="expend"></div>
+                                <div class="title-text">开题截至日期</div></div>
+                            <div class="notice-text">开题截至日期一月七号</div>
+                        </div>
+                        <div class="notice-child">
+                            <div class="notice-title"><div class="expend"></div>
+                                <div class="title-text">评阅截至日期</div></div>
+                            <div class="notice-text">评阅截至日期四月七号</div>
+                        </div>
                     </div>
                 </div>
+                <div class="notice-choose">
+                    <div class="notice-class">学校</div>
+                    <div class="notice-class">老师</div>
+                    <div class="notice-class">学院</div>
+                </div>
             </div>
-            <div class="notice-choose">
+    </div>
-                <div class="notice-class">学校</div>
+    <div class="bottom-bar">
-                <div class="notice-class">老师</div>
+        <div class="big-logo">GDMS</div>
-                <div class="notice-class">学院</div>
+        <p>team bys</p>
-            </div>
-        </div>
     </div>
 </div>
 <script type="text/javascript" src="jsFile/personal.js"></script>

web/jsFile/homeActive.js

@@ -1,6 +1,7 @@
 $(document).ready(function () {
   $('.a-process').on('click',moveBar);
   $('.update-to-perm').on('click',upadateFrame);
+  $('.notice-child').on('mouseenter',shownoticeText).on('mouseleave',hideText);
 })
 function moveBar() {
   var distanse=21+($(this).index()-1)*91;
@@ -17,24 +18,39 @@ function scrollAds() {
     {
       $('.scroll-ads-imgs').css('transition','0.4s');
       scrolling.style.transform='translateX(-100%)';
-
+      $('.white-point').eq(1).css("width","20px");
+      $('.white-point').eq(2).css("width","10px");
+      $('.white-point').eq(0).css("width","10px");
     }
     else if(scrolling.style.transform=="translateX(-100%)")
     {
       scrolling.style.transform='translateX(-200%)';
-
+      $('.white-point').eq(2).css("width","20px");
-
+      $('.white-point').eq(1).css("width","10px");
+      $('.white-point').eq(0).css("width","10px");
     }
     else if(scrolling.style.transform=="translateX(-200%)")
     {
       scrolling.style.transform='translateX(-300%)';
+      $('.white-point').eq(0).css("width","20px");
+      $('.white-point').eq(2).css("width","10px");
+      $('.white-point').eq(1).css("width","10px");
     }
     else if(scrolling.style.transform=="translateX(-300%)")
     {
       $('.scroll-ads-imgs').css('transition','none');
       scrolling.style.transform='translateX(0%)';
       window.setTimeout('scrollAds()',200);
+      $('.white-point').eq(0).css("width","20px");
+      $('.white-point').eq(1).css("width","10px");
+      $('.white-point').eq(2).css("width","10px");
     }
   }
 }
 var start_scoll=window.setInterval('scrollAds()',3000);
+function shownoticeText() {
+  $(this).addClass("select");
+}
+function hideText() {
+  $(this).removeClass("select");
+}

web/jsFile/upload_action.js

@@ -22,7 +22,7 @@ function sendFile() {
     success:function (data,status) {
       if(status=="success")
       {
-        alert("选择成功");
+        alert("上传成功");
       }
     }
   })

web/login.jsp

@@ -47,9 +47,9 @@
                    placeholder="请输入密码">
             <input class="register-input-text name-text" type="text" name="name"
                    placeholder="姓名">
-            <input class="register-input-text e-mail-text" type="text" name="e-mail"
+            <input class="register-input-text e-mail-text" type="text" name="e_mail_location"
                    placeholder="邮箱">
-            <input class="register-input-text phone-number" type="text" name="phone-number"
+            <input class="register-input-text phone-number" type="text" name="phone_number"
                    placeholder="请输入电话">
             <input class="register-input-text check-password-text" type="password" name="password-check"
                    placeholder="请确认密码">

web/select.jsp

@@ -16,9 +16,12 @@
 <body>
 <div class="updated">
     <div class="select-frame">
-        <div class="search-frame">
+        <div class="top-blank">
-            <input class="search-input" type="text" name="id" value="" placeholder="输入学号查找">
+            <div class="model-info">选择学生</div>
-            <div class="search-button"></div>
+            <div class="search-frame">
+                <input class="search-input" type="text" name="id" value="" placeholder="输入学号查找">
+                <div class="search-button"></div>
+            </div>
         </div>
         <div class="count-select">
             <div class="selected-info">已选学生</div>

web/upload_file.jsp

@@ -15,6 +15,7 @@
 </head>
 <body>
 <div class="updated">
+    <div class="fill-top-blank"><div class="model-info">上传定稿</div></div>
         <div class="upload-frame">
             <div class="upload-tips">上传定稿</div>
             <div class="file-msg">