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/gdms/test.java
hechu1
何楚 6 years ago
parent e744f97b8c
commit 574638756c
13 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File

5
.idea/encodings.xml
Unescape View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" /> <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$/web/jsFile/login.js" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project> </project>

3
.idea/misc.xml
Unescape View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES5" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>

4
web/WEB-INF/web.xml
Unescape View File

@ -11,10 +11,6 @@
<servlet-class>init.Init</servlet-class> <servlet-class>init.Init</servlet-class>
<load-on-startup>1</load-on-startup> <load-on-startup>1</load-on-startup>
</servlet> </servlet>
<context-param>
<param-name>charset</param-name>
<param-value>UTF-8</param-value>
</context-param>
<servlet-mapping> <servlet-mapping>
<servlet-name>Init</servlet-name> <servlet-name>Init</servlet-name>
<url-pattern>/init</url-pattern> <url-pattern>/init</url-pattern>

8
web/home/fill_Information.jsp
Unescape View File

@ -14,9 +14,9 @@
<html> <html>
<head> <head>
<title>填写信息</title> <title>填写信息</title>
<link type="text/css" rel="stylesheet" href="cssFile/fill-style.css"> <link type="text/css" rel="stylesheet" href="../cssFile/fill-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/fill-action.js"></script> <script type="text/javascript" src="../jsFile/fill-action.js"></script>
</head> </head>
<body> <body>
<% <%
@ -48,7 +48,7 @@
<div class="tips-msg">${z.key}:${z.value}</div> <div class="tips-msg">${z.key}:${z.value}</div>
</c:forEach> </c:forEach>
</div> </div>
<form class="fill-form" action="testfrom.jsp" method="post"> <form class="fill-form" action="##" method="post">
<textarea placeholder="请输入信息" class="fill-ipt-text bar-change" name="text"></textarea> <textarea placeholder="请输入信息" class="fill-ipt-text bar-change" name="text"></textarea>
<c:if test="${type=='teacher'}"> <c:if test="${type=='teacher'}">
<input class="score-area" name="score" placeholder="请输入分数"> <input class="score-area" name="score" placeholder="请输入分数">

26
web/home/home.jsp
Unescape View File

@ -21,14 +21,14 @@
<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"> <link type="text/css" rel="stylesheet" href="../cssFile/download_style.css">
<link type="text/css" rel="stylesheet" href="../cssFile/blank-style.css"> <link type="text/css" rel="stylesheet" href="../cssFile/blank-style.css">
<script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script> <script charset="" type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
<script type="text/javascript" src="../jsFile/homeActive.js"></script> <script charset="" type="text/javascript" src="../jsFile/homeActive.js"></script>
<script type="text/javascript" src="../jsFile/home-update.js"></script> <script charset="" type="text/javascript" src="../jsFile/home-update.js"></script>
<script type="text/javascript" src="../jsFile/personal.js"></script> <script charset="" type="text/javascript" src="../jsFile/personal.js"></script>
<script type="text/javascript" src="../jsFile/search.js"></script> <script charset="" type="text/javascript" src="../jsFile/search.js"></script>
<script type="text/javascript" src="../jsFile/fill-action.js"></script> <script charset="" type="text/javascript" src="../jsFile/fill-action.js"></script>
<script type="text/javascript" src="../jsFile/upload_action.js"></script> <script charset="" type="text/javascript" src="../jsFile/upload_action.js"></script>
<script type="text/javascript" src="../jsFile/sub-msg-input.js"></script> <script charset="" type="text/javascript" src="../jsFile/sub-msg-input.js"></script>
</head> </head>
<body> <body>
<% <%
@ -82,9 +82,17 @@
<div class="nav-info">资料下载</div> <div class="nav-info">资料下载</div>
</a> </a>
</div> </div>
<div class="a-process aux-fun">
<a href="fill_Information.jsp?002" class="link-point aux-fun-page">
<div class="a-process-decoration download">
<img src="../cssFile/images/fill.png">
</div>
<div class="nav-info">资料下载</div>
</a>
</div>
<c:forEach items="${list}"> <c:forEach items="${list}">
<div class="a-process"> <div class="a-process">
<a href="<%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point"> <a href="<!%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point">
<div class="a-process-decoration"> <div class="a-process-decoration">
<img src=<%=condition.get(num).getIconURL()%>> <img src=<%=condition.get(num).getIconURL()%>>
</div> </div>

2
web/home/result_list.jsp
Unescape View File

@ -21,5 +21,5 @@
%> %>
<div class="one-msg">电话号码：18711191679</div> <div class="one-msg">电话号码：18711191679</div>
</div> </div>
<button class="select-it" value="<%=123%>">选择</button> <button class="select-it <%=searchType%>" value="<%=123%>">选择</button>
</div> </div>

2
web/jsFile/fill-action.js
Unescape View File

@ -1,4 +1,4 @@
$(document).ready(function () { $(document).ready(function () {
$(document).off('click',submit_text).on('click','.submit-text',submit_text); $(document).off('click',submit_text).on('click','.submit-text',submit_text);
}) })
function submit_text() { function submit_text() {

4
web/jsFile/login.js
Unescape View File

@ -1,4 +1,4 @@

function showRegister() { function showRegister() {
$('.register-cont').css('display','block'); $('.register-cont').css('display','block');
$('.login-cont').css('display','none'); $('.login-cont').css('display','none');
@ -47,7 +47,7 @@ function isEmpty2(e)
if($('.id-check').val()=='') if($('.id-check').val()=='')
{ {
e.preventDefault() e.preventDefault()
alert("请选择身份"); alert("请确认身份");
} }
} }
$(document).ready( $(document).ready(

2
web/jsFile/personal.js
Unescape View File

@ -1,4 +1,4 @@
$(document).ready(function () { $(document).ready(function () {
$(document).off('click',pChange).on('click','.choose-child',pChange); $(document).off('click',pChange).on('click','.choose-child',pChange);
$(document).off('click',showpm).on('click','.pm',showpm); $(document).off('click',showpm).on('click','.pm',showpm);
$(document).off('click',showpw).on('click','.pw',showpw); $(document).off('click',showpw).on('click','.pw',showpw);

2
web/jsFile/search.js
Unescape View File

@ -1,4 +1,4 @@
$(document).ready(function () { $(document).ready(function () {
$(document).off('click',searchStuMsg).on('click','.search-button.teacher',searchStuMsg); $(document).off('click',searchStuMsg).on('click','.search-button.teacher',searchStuMsg);
$(document).off('click',searchTeaMsg).on('click','.search-button.student',searchTeaMsg); $(document).off('click',searchTeaMsg).on('click','.search-button.student',searchTeaMsg);
$(document).off('keydown',KDsearchSmsg).on('keydown','.search-button.teacher',KDsearchSmsg); $(document).off('keydown',KDsearchSmsg).on('keydown','.search-button.teacher',KDsearchSmsg);

2
web/jsFile/sub-msg-input.js
Unescape View File

@ -1,4 +1,4 @@
$(document).ready( $(document).ready(
function () { function () {
$(document).off('click',sendSub).on('click','.sub-input-button',sendSub); $(document).off('click',sendSub).on('click','.sub-input-button',sendSub);
} }

2
web/jsFile/upload_action.js
Unescape View File

@ -1,4 +1,4 @@
$(document).ready(function () { $(document).ready(function () {
$(document).off('click',sendFile).on('click','.upload-it',sendFile); $(document).off('click',sendFile).on('click','.upload-it',sendFile);
$(document).off('click',selectFile).on('click','.select-file',selectFile); $(document).off('click',selectFile).on('click','.select-file',selectFile);
$(document).off('change',showMsg).on('change','.true-select',showMsg) $(document).off('change',showMsg).on('change','.true-select',showMsg)

18
web/login.jsp
Unescape View File

@ -10,8 +10,8 @@
<head> <head>
<title>毕业设计管理系统</title> <title>毕业设计管理系统</title>
<link type="text/css" rel="stylesheet" href="cssFile/login-style.css"> <link type="text/css" rel="stylesheet" href="cssFile/login-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" language="JavaScript"></script>
<script type="text/javascript" src="jsFile/login.js"></script> <script type="text/javascript" src="jsFile/login.js" language="JavaScript"></script>
</head> </head>
<body> <body>
<div class="main"> <div class="main">
@ -43,17 +43,17 @@
<form method="post" action="register"> <form method="post" action="register">
<input class="register-input-text sno-text" type="text" name="id" <input class="register-input-text sno-text" type="text" name="id"
placeholder="学号或职工号"> placeholder="学号或职工号" tabindex="1">
<input class="register-input-text password-text" type="password" name="password" <input class="register-input-text password-text" type="password" name="password"
placeholder="请输入密码"> placeholder="请输入密码" tabindex="5">
<input class="register-input-text name-text" type="text" name="name" <input class="register-input-text name-text" type="text" name="name"
placeholder="姓名"> placeholder="姓名" tabindex="2">
<input class="register-input-text e-mail-text" type="text" name="e_mail_location" <input class="register-input-text e-mail-text" type="email" name="e_mail_location"
placeholder="邮箱"> placeholder="邮箱" tabindex="3">
<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="请输入电话"> placeholder="请输入电话" tabindex="4">
<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="请确认密码" tabindex="6">
<select class="id-check" name="userType"> <select class="id-check" name="userType">
<option value="">身份</option> <option value="">身份</option>
<option value="student">学生</option> <option value="student">学生</option>

Write Preview
Loading…
Cancel
Save