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/GDMS.java
hechu1
何楚 6 years ago
parent 34c30c37d4
commit 515442ea75
5 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File

25
web/home/fillSbjMsg.jsp
Unescape View File

@ -1,5 +1,8 @@
<%@ page import="java.util.List" %>
<%@ page import="java.util.ArrayList" %><%--
<%@ page import="java.util.ArrayList" %>
<%@ page import="core.user.User" %>
<%@ page import="core.process.Process" %>
<%@ page import="core.process.TempProcess" %><%--
Created by IntelliJ IDEA.
User: lenovo
Date: 2019/1/14
@ -16,26 +19,31 @@
</head>
<body>
<div class="updated">
<%
int processIndex=Integer.parseInt(request.getParameter("proccessIndex"));
User user=(User)session.getAttribute("user");
TempProcess process= (TempProcess) user.getCondition().get(processIndex);
%>
<div class="blank-frame-sub">
<div class="fill-top-blank"><div class="model-info">填写选题信息</div></div>
<div class="sub-msg">
<form>
<form class="subform">
<div class="sub-fill-frame sub-name">
<div class="sub-tips">论文题目:</div>
<input class="sub-input" name="chinese_name" value="" type="text"
<input class="sub-input chinese_name" name="chinese_name" value="" type="text"
placeholder="中文名">
<input class="sub-input" name="english_name" type="text" value=""
<input class="sub-input english_name" name="english_name" type="text" value=""
placeholder="英文名">
</div>
<div class="sub-fill-frame sub-class">
<div class="sub-tips">题目类别:</div>
<input class="sub-input" name="type_of_topic" value=""
<input class="sub-input type_of_topic" name="type_of_topic" value=""
placeholder="请输入类别">
</div>
<div class="sub-fill-frame sub-src">
<div class="sub-tips">题目来源:</div>
<select class="sub-select" name="source_of_design">
<select class="sub-select source_of_design" name="source_of_design">
<option value="">请选择来源</option>
<option value="教师科研课题">教师科研课题</option>
<option value="企事业单位委托课题">企事业单位委托课题</option>
@ -44,7 +52,7 @@
</div>
<div class="sub-fill-frame sub-ct">
<div class="sub-tips">题目性质:</div>
<select class="sub-select" name="nature_of_design">
<select class="sub-select nature_of_design" name="nature_of_design">
<option value="">请选择题目性质</option>
<option value="教学研究">教学研究</option>
<option value="应用研究">应用研究</option>
@ -54,9 +62,10 @@
</div>
<div class="sub-fill-frame sub-scb">
<div class="sub-tips">题目描述:</div>
<textarea class="sub-scb-text" placeholder="请填写题目描述" name="description_of_topic"></textarea>
<textarea class="sub-scb-text description_of_topic" placeholder="请填写题目描述" name="description_of_topic"></textarea>
</div>
<input class="sub-input-button" type="button" value="提交">
<input class="id" type="text" value="<%=process.getGraduationDesignId()%>">
</form>
</div>
</div>

8
web/home/home.jsp
Unescape View File

@ -83,14 +83,6 @@
<div class="nav-info">资料下载</div>
</a>
</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}">
<div class="a-process">
<a href="<%=(condition.get(num)).getJspURL()%>?<%=index++%>" class="link-point">

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

@ -4,7 +4,7 @@
}
)
function sendSub() {
var Url3='testfrom.jsp';
var Url3='/home/student-fill-graduation-design-information';
if( $('.sub-input').eq(0).val()==''|| $('.sub-input').eq(1).val()==''
|| $('.sub-input').eq(2).val()=='')
{
@ -22,12 +22,11 @@ function sendSub() {
alert("请将信息填写完整");
return;
}
var fillDate=$(this).parent().serialize();
$.post(Url3,fillDate,function(data,status) {
if(status=='success')
{
alert("提交成功");
}
var fillData=$('.subform').serialize();
alert(fillData);
$.post(Url3,fillData,function(data,status) {
alert(status);
}
);
alert(333);
}

8
web/test.jsp
Unescape View File

@ -13,10 +13,12 @@
<script charset="GBK" type="text/javascript" src="jsFile/test.js" language="JavaScript"></script>
</head>
<body>
<% String a="abc";
<%
String a=request.getParameter("chinese_name");
response.getWriter().write(a);
System.out.println(a);
%>
<button class="but">nihao</button>
<div><%=session.getAttribute("hello")%></div>
<div></div>
</body>
</html>

10
web/testfrom.jsp
Unescape View File

@ -1,10 +1,4 @@
<%@ page import="java.util.List" %>
<%@page import="org.apache.commons.fileupload.FileItem" %>
<%@page import="org.apache.commons.fileupload.FileUploadBase"%>
<%@page import="org.apache.commons.fileupload.FileUploadException"%>
<%@page import="org.apache.commons.fileupload.ProgressListener"%>
<%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"%>
<%@page import="org.apache.commons.fileupload.servlet.ServletFileUpload"%>
<%@page import="java.io.File"%>
<%@ page import="java.io.PrintWriter" %>
<%--
@ -16,5 +10,7 @@
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%
String name=request.getParameter("chinese_name");
response.getWriter().write(name);
%>
<div>hello</div>
<div></div>

Write Preview
Loading…
Cancel
Save