diff --git a/web/WEB-INF/tld/fn.tld b/web/WEB-INF/tld/fn.tld index 12d4ca8..a3f8bed 100644 --- a/web/WEB-INF/tld/fn.tld +++ b/web/WEB-INF/tld/fn.tld @@ -94,7 +94,6 @@ You have ${fn:length(shoppingCart.products)} in your shopping cart. - Returns a string resulting from replacing in an input string all occurrences diff --git a/web/cssFile/download_style.css b/web/cssFile/download_style.css index a05af51..008bf7c 100644 --- a/web/cssFile/download_style.css +++ b/web/cssFile/download_style.css @@ -1,5 +1,5 @@ .downloadList{ - margin: 20px; + margin: 10px 20px 20px 20px; position: relative; width: 900px; height: 600px; @@ -20,5 +20,24 @@ height: 40px; } .link-frame:hover{ - background-color: #ff5a5f; + background-color: rgba(210, 66, 73, 0.89); +} +.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; } \ No newline at end of file diff --git a/web/cssFile/fill-style.css b/web/cssFile/fill-style.css index a1f5105..51c193b 100644 --- a/web/cssFile/fill-style.css +++ b/web/cssFile/fill-style.css @@ -9,9 +9,9 @@ } .fill-frame{ position:absolute; - top: 20px; - right: 30px; - width: 900px; + top: 100px; + right: 10px; + width: 960px; max-height: 700px; overflow-y: scroll; } @@ -116,4 +116,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; +} diff --git a/web/cssFile/home.css b/web/cssFile/home.css index 85e4dfd..33ee37f 100644 --- a/web/cssFile/home.css +++ b/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-delay:0.3s; + transition: 0.5s; background-color: #f3f3f3; border-top: 1px solid rgba(0, 0, 0, 0.26); } -.notice-child .notice-title:hover + .notice-text{ - display: block; -} -.notice-child .notice-text:hover{ - display: block; +.notice-child.select .notice-text{ + min-height: 100px; + font-size: 15px; } .notice-child .notice-title .expend{ position: relative; @@ -334,12 +336,15 @@ width: 35px; margin: 0px 120px; } .notice-choose{ - width: 80px; - height: 200px; + box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.16); + border-radius: 10px; + background-color: #ffffff; + width: 90px; + height: 400px; position: absolute; - top: 370px; - right: 62px; - border: 1px solid rgba(255, 255, 255, 0); + top: 300px; + right: 45px; + border: 1px solid rgb(157, 157, 157); } .notice-choose .notice-class{ margin: 8px 0; @@ -350,9 +355,57 @@ 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; } \ No newline at end of file diff --git a/web/cssFile/personal.css b/web/cssFile/personal.css index 45aa445..c621e6a 100644 --- a/web/cssFile/personal.css +++ b/web/cssFile/personal.css @@ -2,10 +2,6 @@ ul{ padding: 0; margin: 0; } -.updated{ - width: 100%; - height: 100%; -} .personal-choose{ position: absolute; top: 70px; @@ -127,4 +123,7 @@ ul{ } .change-pw-frame .sm-input-style:hover{ background-color: #517fff; +} +.personal-frame{ + background-color: white; } \ No newline at end of file diff --git a/web/cssFile/select-style.css b/web/cssFile/select-style.css index 1ff8235..d06576a 100644 --- a/web/cssFile/select-style.css +++ b/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; - right: 90px; - background-color: rgba(0, 0, 0, 0.14); + top:10px; + right: 20px; + 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; - top: 100px; - position: absolute; + margin:100px 0px 0px 198px; 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); @@ -163,4 +161,13 @@ 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; } \ No newline at end of file diff --git a/web/cssFile/upload_style.css b/web/cssFile/upload_style.css index 328aa93..45948ae 100644 --- a/web/cssFile/upload_style.css +++ b/web/cssFile/upload_style.css @@ -1,8 +1,8 @@ .upload-frame{ - position: relative; - top: 50px; - left: 60px; - width: 900px; + position:absolute; + top: 100px; + right: 10px; + width: 960px; height: 200px; border: 1px solid rgba(0, 0, 0, 0.33); background-color: white; diff --git a/web/download.jsp b/web/download.jsp index 2747b13..bc2d5c9 100644 --- a/web/download.jsp +++ b/web/download.jsp @@ -14,6 +14,11 @@
+
+
+ 资料下载 +
+
diff --git a/web/fill_Information.jsp b/web/fill_Information.jsp index 6e58f96..24a2543 100644 --- a/web/fill_Information.jsp +++ b/web/fill_Information.jsp @@ -29,8 +29,8 @@ pageContext.setAttribute("type",type); %>
+
-
${map.姓名}
diff --git a/web/home.jsp b/web/home.jsp index c87358d..c68ff37 100644 --- a/web/home.jsp +++ b/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"%> 毕业设计管理系统 @@ -24,6 +25,7 @@ +<%String type="teacher";pageContext.setAttribute("userType",type);%>
@@ -46,109 +48,120 @@
-
-
-
- -
- -
-
个人信息
- -
-
- -
- -
-
资料下载
- -
-
- -
- -
-
选择老师
- -
-
- -
- -
-
填写信息
- -
-
- -
- -
-
上传文件
- -
-
-
-
- -
-
-
公告
-
-
-
-
欢迎使用
-
欢迎使用GDMS
-
-
-
寒假通知
-
早点回去吧
+
+ +
+ +
+
填写信息
+
-
-
-
开题截至日期
-
开题截至日期一月七号
+
+ +
+ +
+
上传文件
+
-
-
-
评阅截至日期
-
评阅截至日期四月七号
+ +
+
+
+
+
+
+
+
+ +
+
+
公告
+
+
+
+
欢迎使用
+
欢迎使用GDMS
+
+
+
+
寒假通知
+
早点回去吧
+
+
+
+
开题截至日期
+
开题截至日期一月七号
+
+
+
+
评阅截至日期
+
评阅截至日期四月七号
+
+
+
学校
+
老师
+
学院
+
-
-
学校
-
老师
-
学院
-
-
+
+
+ +

team bys

diff --git a/web/jsFile/homeActive.js b/web/jsFile/homeActive.js index 0df5fb0..933c1f7 100644 --- a/web/jsFile/homeActive.js +++ b/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"); +} \ No newline at end of file diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index 2c76ace..3e08fba 100644 --- a/web/jsFile/upload_action.js +++ b/web/jsFile/upload_action.js @@ -22,7 +22,7 @@ function sendFile() { success:function (data,status) { if(status=="success") { - alert("选择成功"); + alert("上传成功"); } } }) diff --git a/web/select.jsp b/web/select.jsp index a093faf..9596534 100644 --- a/web/select.jsp +++ b/web/select.jsp @@ -16,9 +16,11 @@
-
- -
+
+
+ +
+
已选学生
diff --git a/web/upload_file.jsp b/web/upload_file.jsp index cc2421a..a5db1e3 100644 --- a/web/upload_file.jsp +++ b/web/upload_file.jsp @@ -15,6 +15,7 @@
+
上传定稿