From f82ba25a312142d6de6cfff83022ef49378dc436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E6=A5=9A?= <823169880@qq.com> Date: Mon, 14 Jan 2019 18:54:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into hechu1 # Conflicts: # src/core/operation/Select.json # src/core/process/Process.java --- web/cssFile/blank-style.css | 94 +++++++++++++++++++++++++++++++++ web/cssFile/home.css | 3 +- web/cssFile/images/filText.png | Bin 0 -> 334 bytes web/fillSbjMsg.jsp | 65 +++++++++++++++++++++++ web/fill_Information.jsp | 28 ++++++---- web/home.jsp | 12 ++++- web/jsFile/sub-msg-input.js | 33 ++++++++++++ web/select.jsp | 59 +++++++++++---------- 8 files changed, 254 insertions(+), 40 deletions(-) create mode 100644 web/cssFile/blank-style.css create mode 100644 web/cssFile/images/filText.png create mode 100644 web/fillSbjMsg.jsp create mode 100644 web/jsFile/sub-msg-input.js diff --git a/web/cssFile/blank-style.css b/web/cssFile/blank-style.css new file mode 100644 index 0000000..fa2bd36 --- /dev/null +++ b/web/cssFile/blank-style.css @@ -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); +} \ No newline at end of file diff --git a/web/cssFile/home.css b/web/cssFile/home.css index b16aac0..a02349a 100644 --- a/web/cssFile/home.css +++ b/web/cssFile/home.css @@ -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; diff --git a/web/cssFile/images/filText.png b/web/cssFile/images/filText.png new file mode 100644 index 0000000000000000000000000000000000000000..6859d43942a7d1ad062652d828d98faf1021c011 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^DImNOnpBiKW%F@3H=U`tkC)rO!&w z-7`-)kEetd?^(QZ#Hj!Xc#W(W3xlSnRZ@ILk?_F<`3-x0xSn s0h@5<2j9o~565SKoxlk8PDA}SroC%qyHlp~y#@(*y85}Sb4q9e0N1T{j{pDw literal 0 HcmV?d00001 diff --git a/web/fillSbjMsg.jsp b/web/fillSbjMsg.jsp new file mode 100644 index 0000000..422ac55 --- /dev/null +++ b/web/fillSbjMsg.jsp @@ -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" %> + + + 填写选题信息 + + + + + +
+
+
填写选题信息
+ +
+
+
+
论文题目:
+ + +
+
+
题目类别:
+ +
+
+
题目来源:
+ +
+
+
题目性质:
+ +
+
+
题目描述:
+ +
+ +
+
+
+
+ + + diff --git a/web/fill_Information.jsp b/web/fill_Information.jsp index 94913d4..5b34830 100644 --- a/web/fill_Information.jsp +++ b/web/fill_Information.jsp @@ -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 @@ -<%Map map2=new HashMap(); +<% + Map map2=new HashMap(); + Map map3=new HashMap(); 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> list=new ArrayList>(); pageContext.setAttribute("map",map2); - String type ="student"; + User user=(User)session.getAttribute("user"); + String type=user.getType(); pageContext.setAttribute("type",type); %>
@@ -33,16 +39,18 @@
${map.姓名}
-
-
+ +
+
+
${z.key}:${z.value}
- - + + diff --git a/web/home.jsp b/web/home.jsp index c68ff37..56d3d00 100644 --- a/web/home.jsp +++ b/web/home.jsp @@ -16,6 +16,7 @@ + @@ -23,6 +24,7 @@ + <%String type="teacher";pageContext.setAttribute("userType",type);%> @@ -40,7 +42,7 @@
个人信息
-
退出登录
+
退出登录
@@ -91,6 +93,14 @@
上传文件
+
+ +
+ +
+
填写选题信息
+ +
diff --git a/web/jsFile/sub-msg-input.js b/web/jsFile/sub-msg-input.js new file mode 100644 index 0000000..f01d9bb --- /dev/null +++ b/web/jsFile/sub-msg-input.js @@ -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("提交成功"); + } + } + ); +} \ No newline at end of file diff --git a/web/select.jsp b/web/select.jsp index 7f60717..be2c265 100644 --- a/web/select.jsp +++ b/web/select.jsp @@ -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" %> Title @@ -14,10 +21,25 @@ +<% + C_TeacherSearchStudent searchStudent=new C_TeacherSearchStudent(); + List> list=new ArrayList<>(); + pageContext.setAttribute("list",list); + User user=(User)session.getAttribute("user"); + String type=user.getType(); + pageContext.setAttribute("type",type); +%>
-
选择学生
+
+ + ${"选择学生"} + + + ${"选择老师"} + +
@@ -28,37 +50,18 @@
-
c +
+
-
李先生
+
${z.姓名}
-
电话号码：18711191679
-
邮箱：823169880@qq.com
-
年级：2016
-
专业：软件工程
-
电话号码：18711191679
-
邮箱：823169880@qq.com
+ +
${msg.key}：${msg.value}
+
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- +
+