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 aa7d6ce390
commit bd91d5b5b7
4 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File

18
GDMS.iml
Unescape View File

@ -29,5 +29,23 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/web/WEB-INF/lib/commons-fileupload-1.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/web/WEB-INF/lib/commons-io-2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>

4
web/cssFile/home.css
Unescape View File

@ -207,7 +207,7 @@ width: 35px;
height: 900px; height: 900px;
} }
.scroll-ads{ .scroll-ads{
height: 320px; height: 250px;
width: 900px; width: 900px;
background-color: #ffffff; background-color: #ffffff;
position: absolute; position: absolute;
@ -247,7 +247,7 @@ width: 35px;
} }
.notice-frame{ .notice-frame{
background-color: white; background-color: white;
margin:370px auto 0px 45px; margin:300px auto 0px 45px;
position: relative; position: relative;
width: 800px; width: 800px;
height: 400px; height: 400px;

15
web/home.jsp
Unescape View File

@ -9,16 +9,19 @@
<html> <html>
<head> <head>
<title>毕业设计管理系统</title> <title>毕业设计管理系统</title>
<link type="text/css" rel="stylesheet" href="cssFile/upload_style.css">
<link type="text/css" rel="stylesheet" href="cssFile/home.css"> <link type="text/css" rel="stylesheet" href="cssFile/home.css">
<link type="text/css" rel="stylesheet" href="cssFile/personal.css"> <link type="text/css" rel="stylesheet" href="cssFile/personal.css">
<link type="text/css" rel="stylesheet" href="cssFile/select-style.css"> <link type="text/css" rel="stylesheet" href="cssFile/select-style.css">
<link type="text/css" rel="stylesheet" href="cssFile/fill-style.css"> <link type="text/css" rel="stylesheet" href="cssFile/fill-style.css">
<link type="text/css" rel="stylesheet" href="cssFile/download_style.css">
<script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script> <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
<script type="text/javascript" src="jsFile/homeActive.js"></script> <script type="text/javascript" src="jsFile/homeActive.js"></script>
<script type="text/javascript" src="jsFile/home-update.js"></script> <script type="text/javascript" src="jsFile/home-update.js"></script>
<script type="text/javascript" src="jsFile/personal.js"></script> <script type="text/javascript" src="jsFile/personal.js"></script>
<script type="text/javascript" src="jsFile/search.js"></script> <script type="text/javascript" src="jsFile/search.js"></script>
<script type="text/javascript" src="jsFile/fill-action.js"></script> <script type="text/javascript" src="jsFile/fill-action.js"></script>
<script type="text/javascript" src="jsFile/upload_action.js"></script>
</head> </head>
<body> <body>
<div class="main"> <div class="main">
@ -54,7 +57,7 @@
</a> </a>
</div> </div>
<div class="a-process aux-fun"> <div class="a-process aux-fun">
<a href="#" 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>
@ -74,7 +77,15 @@
<div class="a-process-decoration"> <div class="a-process-decoration">
<img src="cssFile/images/fill.png"> <img src="cssFile/images/fill.png">
</div> </div>
<div class="nav-info">秘书填写信息</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> </a>
</div> </div>
</div> </div>

2
web/login.jsp
Unescape View File

@ -53,7 +53,7 @@
placeholder="请输入电话"> placeholder="请输入电话">
<input class="register-input-text check-password-text" type="password" name="password-check" <input class="register-input-text check-password-text" type="password" name="password-check"
placeholder="请确认密码"> placeholder="请确认密码">
<select class="id-check"> <select class="id-check" name="usertype">
<option value="">身份</option> <option value="">身份</option>
<option value="student">学生</option> <option value="student">学生</option>
<option value="teacher">老师</option> <option value="teacher">老师</option>

Write Preview
Loading…
Cancel
Save