zhailw
/
gdms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java
zgl
何楚 6 years ago
parent 9f6ebaf9fb
commit 8ab7fc962e
14 changed files with 282 additions and 160 deletions
Show Stats Download Patch File Download Diff File

1
web/WEB-INF/tld/fn.tld
Unescape View File

@ -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

23
web/cssFile/download_style.css
Unescape View File

@ -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;
}

16
web/cssFile/fill-style.css
Unescape View File

@ -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;
}

101
web/cssFile/home.css
Unescape View File

@ -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;
}

7
web/cssFile/personal.css
Unescape View File

@ -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;
}

41
web/cssFile/select-style.css
Unescape View File

@ -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);
@ -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;
}

8
web/cssFile/upload_style.css
Unescape View File

@ -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;

5
web/download.jsp
Unescape View File

@ -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="##">

2
web/fill_Information.jsp
Unescape View File

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

21
web/home.jsp
Unescape View File

@ -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">
@ -64,6 +66,7 @@
<div class="nav-info">资料下载</div>
</a>
</div>
<c:if test="${userType=='teacher'}">
<div class="a-process select-area">
<a href="select.jsp" class="link-point data-download-page">
<div class="a-process-decoration select">
@ -88,32 +91,38 @@
<div class="nav-info">上传文件</div>
</a>
</div>
</c:if>
</div>
<div class="update-frame">
<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">holle</div>
<div class="ads-text">hello</div>
</a>
</li>
<li class="scroll-child">
<a>
<img src="cssFile/images/change2.jpg">
<div class="ads-text">holle</div>
<div class="ads-text">hello</div>
</a>
</li>
<li class="scroll-child">
<a>
<img src="cssFile/images/change3.jpg">
<div class="ads-text">holle</div>
<div class="ads-text">hello</div>
</a>
</li>
<li class="scroll-child">
<a>
<img src="cssFile/images/change.jpg">
<div class="ads-text">holle</div>
<div class="ads-text">hello</div>
</a>
</li>
</ul>
@ -150,6 +159,10 @@
</div>
</div>
</div>
<div class="bottom-bar">
<div class="big-logo">GDMS</div>
<p>team bys</p>
</div>
</div>
<script type="text/javascript" src="jsFile/personal.js"></script>
</body>

22
web/jsFile/homeActive.js
Unescape View File

@ -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");
}

2
web/jsFile/upload_action.js
Unescape View File

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

2
web/select.jsp
Unescape View File

@ -16,10 +16,12 @@
<body>
<div class="updated">
<div class="select-frame">
<div class="top-blank">
<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>
<div class="select-blank"></div>

1
web/upload_file.jsp
Unescape View File

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

Write Preview
Loading…
Cancel
Save