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

# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java
hechu1
何楚 6 years ago
parent c7b82d7e82
commit f82ba25a31

@ -0,0 +1,94 @@
.blank-frame-sub{
width: 100%;
min-height: 825px;
border: 1px solid rgba(255, 255, 255, 0);
}
.sub-msg{
background-color: white;
width: 960px;
min-height: 400px;
border-radius: 5px;
margin: 100px 10px 0px 18px;
border: 1px solid rgba(0, 0, 0, 0.23);
}
.sub-fill-frame{
height: 80px;
width: 940px;
margin: 20px 10px;
}
.sub-fill-frame input{
float: left;
margin-right: 10px;
padding-left: 12px;
background-color: #f5f5f5;
border-radius: 5px;
height: 40px;
width: 300px;
border:1px solid rgba(0, 0, 0, 0.27);
}
.sub-fill-frame input:hover{
border:1px solid rgb(120, 190, 255);
background-color: #ffffff;
}
.sub-fill-frame input:focus{
border:1px solid rgb(120, 190, 255);
background-color: #ffffff;
}
.sub-fill-frame select{
appearance:none;
-moz-appearance:none;
-webkit-appearance:none;
width: 150px;
height: 40px;
color: rgba(0,0,0,0.58);
border:1px solid rgba(0, 0, 0, 0.41);
padding-left: 12px;
border-radius: 5px;
}
.sub-scb-text{
width: 700px;
height: 120px;
border-radius: 10px;
border: 1px solid rgba(0, 0, 0, 0.2);
resize: none;
padding: 10px 10px;
background-color: #f4f4f4;
}
.sub-scb-text:focus{
border: 1px solid rgb(55, 157, 255);
background-color: white;
}
.sub-scb-text:hover{
background-color: white;
border: 1px solid rgb(55, 157, 255);
}
.sub-fill-frame.sub-scb{
height:120px ;
}
.sub-tips{
text-align: right;
line-height: 40px;
margin-right: 20px;
width: 150px;
height: 100%;
float: left;
}
.sub-input-button{
width: 100px;
height: 40px;
color: white;
background-color: #d74144;
border-radius: 5px;
margin: 20px 430px;
border: 0px;
cursor: pointer;
}
.sub-input-button:hover{
background-color: #eb4548;
}
.sub-fill-frame select:focus{
border: 1px solid rgb(55, 157, 255);
}
.sub-fill-frame select:hover{
border: 1px solid rgb(55, 157, 255);
}

@ -410,8 +410,9 @@ ul{
color: #7b7b7b;
}
.model-info{
text-align: center;
float: left;
width: 100px;
width: 150px;
height: 40px;
margin: 15px 10px;
background-color: #e4e4e4;

Binary file not shown.

After

Width:  |  Height:  |  Size: 334 B

@ -0,0 +1,65 @@
<%--
Created by IntelliJ IDEA.
User: lenovo
Date: 2019/1/14
Time: 15:53
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>填写选题信息</title>
<link type="text/css" rel="stylesheet" href="cssFile/blank-style.css">
<script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
<script type="text/javascript" src="jsFile/sub-msg-input.js"></script>
</head>
</bod>
<div class="updated">
<div class="blank-frame-sub">
<div class="fill-top-blank"><div class="model-info">填写选题信息</div></div>
<div class="sub-msg">
<form>
<div class="sub-fill-frame sub-name">
<div class="sub-tips">论文题目:</div>
<input class="sub-input" name="chinese_name" value="" type="text"
placeholder="中文名">
<input class="sub-input" 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=""
placeholder="请输入类别">
</div>
<div class="sub-fill-frame sub-src">
<div class="sub-tips">题目来源:</div>
<select class="sub-select" name="source_of_design">
<option value="">请选择来源</option>
<option value="教师科研课题">教师科研课题</option>
<option value="企事业单位委托课题">企事业单位委托课题</option>
<option value="自拟题目">自拟题目</option>
</select>
</div>
<div class="sub-fill-frame sub-ct">
<div class="sub-tips">题目性质:</div>
<select class="sub-select" name="nature_of_design">
<option value="">请选择题目性质</option>
<option value="教学研究">教学研究</option>
<option value="应用研究">应用研究</option>
<option value="自拟题目">基础研究</option>
<option value="其他">其他</option>
</select>
</div>
<div class="sub-fill-frame sub-scb">
<div class="sub-tips">题目描述:</div>
<textarea class="sub-scb-text" placeholder="请填写题目描述" name="description_of_topic"></textarea>
</div>
<input class="sub-input-button" type="button" value="提交">
</form>
</div>
</div>
</div>
</div>
</body>
</html>

@ -1,6 +1,8 @@
<%@ page import="core.user.User" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.HashMap" %><%--
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.ArrayList" %><%--
Created by IntelliJ IDEA.
User: lenovo
Date: 2019/1/12
@ -17,15 +19,19 @@
<script type="text/javascript" src="jsFile/fill-action.js"></script>
</head>
<body>
<%Map<String,String> map2=new HashMap<String,String>();
<%
Map<String,String> map2=new HashMap<String,String>();
Map<String,String> map3=new HashMap<String,String>();
map2.put("姓名","李先生");
map2.put("学号","201630126050");
map2.put("电话","18711191679");
map2.put("题目","论文");
map2.put("5","李先生2");
map2.put("6","李先生2");
map3.put("姓名","王先生");
map3.put("学号","201630126051");
map3.put("电话","18711191679");
List<Map<String,String>> list=new ArrayList<Map<String,String>>();
pageContext.setAttribute("map",map2);
String type ="student";
User user=(User)session.getAttribute("user");
String type=user.getType();
pageContext.setAttribute("type",type);
%>
<div class="updated">
@ -33,16 +39,18 @@
<div class="fill-frame bar-change">
<div class="fill-child">
<div class="fill-name">${map.姓名}</div>
<c:if test="${type=='teacher'}">
<div class="upload-status"></div>
<div class="download-file"></div>
</c:if>
<div class="other-tips-msgs">
<c:forEach items="${map}" var="z" begin="1">
<div class="tips-msg">${z.key}:${z.value}</div>
</c:forEach>
</div>
<form class="fill-form" action="" method="post">
<textarea class="fill-ipt-text bar-change" name="text" placeholder="请输入信息"></textarea>
<c:if test="${type!='teacher'}">
<textarea placeholder="请输入信息" class="fill-ipt-text bar-change" name="text"></textarea>
<c:if test="${type=='teacher'}">
<input class="score-area" name="score" placeholder="请输入分数">
</c:if>
<input type="button" class="submit-text" value="提交">

@ -16,6 +16,7 @@
<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/download_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 type="text/javascript" src="jsFile/homeActive.js"></script>
<script type="text/javascript" src="jsFile/home-update.js"></script>
@ -23,6 +24,7 @@
<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/upload_action.js"></script>
<script type="text/javascript" src="jsFile/sub-msg-input.js"></script>
</head>
<body>
<%String type="teacher";pageContext.setAttribute("userType",type);%>
@ -40,7 +42,7 @@
<div class="opt-options">
<div class="opt-to-perm"><a class="update-to-perm" href="personal_setting.jsp">
个人信息</a></div>
<div class="to-logout"><a>退出登录</a></div>
<div class="to-logout"><a href="login.jsp">退出登录</a></div>
</div>
</div>
</div>
@ -91,6 +93,14 @@
<div class="nav-info">上传文件</div>
</a>
</div>
<div class="a-process">
<a href="fillSbjMsg.jsp" class="link-point">
<div class="a-process-decoration">
<img src="cssFile/images/filText.png">
</div>
<div class="nav-info">填写选题信息</div>
</a>
</div>
</c:if>
</div>
<div class="update-frame">

@ -0,0 +1,33 @@
$(document).ready(
function () {
$(document).off('click',sendSub).on('click','.sub-input-button',sendSub);
}
)
function sendSub() {
var Url3='testfrom.jsp';
if( $('.sub-input').eq(0).val()==''|| $('.sub-input').eq(1).val()==''
|| $('.sub-input').eq(2).val()=='')
{
alert("请将信息填写完整");
return;
}
if( $('.sub-select').eq(0).val()==''|| $('.sub-select').eq(1).val()=='')
{
alert("请将信息填写完整");
return;
}
if($('.sub-scb-text').val()=='')
{
alert("请将信息填写完整");
return;
}
var fillDate=$(this).parent().serialize();
$.post(Url3,fillDate,function(data,status) {
if(status=='success')
{
alert("提交成功");
}
}
);
}

@ -6,6 +6,13 @@
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" %>
<%@ page import="core.user.User" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="core.process.C_TeacherSearchStudent" %>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<head>
<title>Title</title>
@ -14,10 +21,25 @@
<script type="text/javascript" src="jsFile/search.js"></script>
</head>
<body>
<%
C_TeacherSearchStudent searchStudent=new C_TeacherSearchStudent();
List<Map<String,String>> list=new ArrayList<>();
pageContext.setAttribute("list",list);
User user=(User)session.getAttribute("user");
String type=user.getType();
pageContext.setAttribute("type",type);
%>
<div class="updated">
<div class="select-frame">
<div class="top-blank">
<div class="model-info">选择学生</div>
<div class="model-info">
<c:if test="${type=='teacher'}">
${"选择学生"}
</c:if>
<c:if test="${type=='student'}">
${"选择老师"}
</c:if>
</div>
<div class="search-frame">
<input class="search-input" type="text" name="id" value="" placeholder="输入学号查找">
<div class="search-button"></div>
@ -28,37 +50,18 @@
<div class="select-blank"></div>
<div class="selected-bottom"></div>
</div>
<div class="list-frame bar-hange">c
<div class="list-frame bar-change">
<c:forEach items="${list}" var="z">
<div class="list-child">
<div class="name"><span class="the-name">李先生</span></div>
<div class="name"><span class="the-name">${z.姓名}</span></div>
<div class="other-msgs">
<div class="one-msg">电话号码18711191679</div>
<div class="one-msg">邮箱823169880@qq.com</div>
<div class="one-msg">年级2016</div>
<div class="one-msg">专业:软件工程</div>
<div class="one-msg">电话号码18711191679</div>
<div class="one-msg">邮箱823169880@qq.com</div>
</div>
<button class="select-it">选择</button>
</div>
<div class="list-child"><div class="name"></div>
<button class="select-it"></button>
</div>
<div class="list-child"><div class="name"></div>
<button class="select-it"></button>
</div>
<div class="list-child"><div class="name"></div>
<button class="select-it"></button>
</div>
<div class="list-child"><div class="name"></div>
<button class="select-it"></button>
</div>
<div class="list-child"><div class="name"></div>
<button class="select-it"></button>
<c:forEach items="${z}" var="msg" begin="1">
<div class="one-msg">${msg.key}${msg.value}</div>
</c:forEach>
</div>
<div class="list-child"><div class="name"></div>
<button class="select-it"></button>
<button class="select-it" value="${z.学号}">选择</button>
</div>
</c:forEach>
</div>
</div>
</div>

Loading…
Cancel
Save