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

# Conflicts:
#	src/gdms/GlobalTimePoint.json

src/gdms/GlobalTimePoint.json

@@ -1,9 +1,9 @@
 {
-  "teacher_choose_student_start_date":"",
-  "student_choose_teacher_start_date": "",
-  "choose_end_date": "",
-  "opening_report_opinion_deadline_date": "",
-  "finished_product_deadline_date": "",
-  "finished_product_review_deadline_date": "",
-  "reply_opition_deadline_date": ""
+  "teacher_choose_student_start_date":"";,
+  "student_choose_teacher_start_date": "",;
+  "choose_end_date": "",;
+  "opening_report_opinion_deadline_date": "",;
+  "finished_product_deadline_date": "",;
+  "finished_product_review_deadline_date": "",;
+  "reply_opition_deadline_date": "";
 }

src/servlet/S_CollegeFillOpeningReportOpinion.java

@@ -1,5 +1,4 @@
-package servlet.Submit;
-
+package servlet;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -7,17 +6,14 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/textsubmit")
-public class S_TextSubmit extends HttpServlet {
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        super.doPost(request, response);
-        String content=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8");
-        String score=request.getParameter("score");
-        try {
 
+@WebServlet(name = "S_CollegeFillOpeningReportOpinion")
+public class S_CollegeFillOpeningReportOpinion extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
-        } catch (Exception e) {
-            e.printStackTrace();
     }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
     }
 }

src/servlet/S_CollegeFillScoreOpinion.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_CollegeFillScoreOpinion")
+public class S_CollegeFillScoreOpinion extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/S_MentorFillOpeningReportOpinion.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_MentorFillOpeningReportOpinion")
+public class S_MentorFillOpeningReportOpinion extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/S_MentorFillReview.java

@@ -1,15 +1,19 @@
-package servlet.Submit;
+package servlet;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-public class S_ScoreSubmit extends HttpServlet {
+@WebServlet(name = "S_MentorFillReview")
+public class S_MentorFillReview extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        super.doPost(request, response);
-        String score = request.getParameter("score");
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
     }
 }

src/servlet/S_ReviewerFillReview.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_ReviewerFillReview")
+public class S_ReviewerFillReview extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/S_SchoolFillScoreOpinion.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_SchoolFillScoreOpinion")
+public class S_SchoolFillScoreOpinion extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/S_SecretaryFillOpeningReportRecord.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_SecretaryFillOpeningReportRecord")
+public class S_SecretaryFillOpeningReportRecord extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/S_SecretaryFillReplyRecord.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_SecretaryFillReplyRecord")
+public class S_SecretaryFillReplyRecord extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/S_StudentFillGraduationDesignInformation.java

@@ -1,12 +1,14 @@
-package servlet.Submit;
+package servlet;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-public class S_StudentFillTopicInformation extends HttpServlet {
+@WebServlet("/student-fill-graduation-design-information")
+public class S_StudentFillGraduationDesignInformation extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);
         String content1=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8");

src/servlet/S_StudentSelectTeacher.java

@@ -1,4 +1,4 @@
-package servlet.Select;
+package servlet;
 
 import core.process.C_StudentSearchTeacher;
 import core.process.C_StudentSelectTeacher;
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/studentselectteacher")
+@WebServlet("/student-select-teacher")
 public class S_StudentSelectTeacher extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);
@@ -17,11 +17,13 @@ public class S_StudentSelectTeacher extends HttpServlet {
         User user=(User)request.getSession().getAttribute("user");
         String student_id=user.getId();
         try {
-            C_StudentSelectTeacher test=new C_StudentSelectTeacher();
-            test.setTeacherId(teacher_id);
-            test.setStudentId(student_id);
+            C_StudentSelectTeacher SST=new C_StudentSelectTeacher();
+            SST.setTeacherId(teacher_id);
+            SST.setStudentId(student_id);
+            SST.select();
         } catch (Exception e) {
             e.printStackTrace();
+            response.sendRedirect("/op_fail.jsp");
         }
     }
 }

src/servlet/S_StudentUploadFinishedProduct.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_StudentUploadFinishedProduct")
+public class S_StudentUploadFinishedProduct extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/S_StudentUploadOpeningReport.java

@@ -1,4 +1,4 @@
-package servlet.Submit;
+package servlet;
 
 import core.user.User;
 
@@ -12,7 +12,7 @@ import javax.servlet.http.Part;
 import java.io.IOException;
 import java.util.UUID;
 
-@WebServlet("/upload")
+@WebServlet("/student-upload-opening-report")
 @MultipartConfig
 //学生id+文件
 public class S_StudentUploadOpeningReport extends HttpServlet {

src/servlet/S_TeacherSelectStudent.java

@@ -1,4 +1,4 @@
-package servlet.Select;
+package servlet;
 
 import core.process.C_TeacherSelectStudent;
 import core.user.User;
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/teacherselectstudent")
+@WebServlet("/teacher-select-student")
 public class S_TeacherSelectStudent extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);
@@ -17,11 +17,13 @@ public class S_TeacherSelectStudent extends HttpServlet {
         User user=(User)request.getSession().getAttribute("user");
         String teacher_id=user.getId();
         try {
-            C_TeacherSelectStudent test=new C_TeacherSelectStudent();
-            test.setTeacherId(teacher_id);
-            test.setStudentId(student_id);
+            C_TeacherSelectStudent TSS=new C_TeacherSelectStudent();
+            TSS.setTeacherId(teacher_id);
+            TSS.setStudentId(student_id);
+            TSS.select();
         } catch (Exception e) {
             e.printStackTrace();
+            response.sendRedirect("/op_fail.jsp");
         }
     }
 }

src/servlet/S_TeacherTeamFillOpeningReportOpinion.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_TeacherTeamFillOpeningReportOpinion")
+public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/S_TeacherTeamFillScoreOpinion.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "S_TeacherFillTeamFillScoreOpinion")
+public class S_TeacherFillTeamFillScoreOpinion extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}

src/servlet/Utils.java

@@ -0,0 +1,4 @@
+package servlet;
+
+public interface Utils {
+}

src/servlet/account/S_Login.java

@@ -18,10 +18,10 @@ import error.GExcptSQL;
 @WebServlet("/login")
 public class S_Login extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
+            throws IOException {
         String id=request.getParameter("id");
         String password=request.getParameter("password");
-        User user = null;
+        User user;
         try {
             user = AccountManagement.login(id,password);
         } catch (GExcptSQL | SQLException gExcptSQL) {

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);
+}

web/cssFile/fill-style.css

@@ -119,12 +119,3 @@
   right: 220px;
   padding-left: 15px;
 }
-.fill-top-blank{
-  border-radius: 5px;
-  height: 70px;
-  width: 960px;
-  position: absolute;
-  top: 20px;
-  right: 10px;
-  background-color: #323232;
-}

web/cssFile/home.css

@@ -5,6 +5,15 @@ body{
   width: 100%;
   height: 100%;
 }
+.fill-top-blank{
+  border-radius: 5px;
+  height: 70px;
+  width: 960px;
+  position: absolute;
+  top: 20px;
+  right: 10px;
+  background-color: #323232;
+}
 .main2{
   background-color:#fafafa;
 }
@@ -410,14 +419,16 @@ ul{
   color: #7b7b7b;
 }
 .model-info{
+  text-align: center;
   float: left;
-  width: 100px;
+  width: 400px;
   height: 40px;
   margin: 15px 10px;
   background-color: #e4e4e4;
   border-radius: 5px;
-  color: #1b1b1b;
+  color: rgba(27, 27, 27, 0.87);
   padding-left: 10px;
   line-height: 35px;
   font-size: 18px;
+  font-weight: 400;
 }

web/cssFile/personal.css

@@ -41,9 +41,8 @@ ul{
   top: 70px;
   left: 250px;
   width: 600px;
-  border: 1px solid rgba(0, 0, 0, 0.27);
+  border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 5px;
-  box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.23);
 }
 .personal-msg-frame .personal-msg-part{
   width: 100%;

web/cssFile/select-style.css

@@ -77,6 +77,9 @@ a{
   border: 0px;
   transition: all 0.3s;
 }
+.select-it.on{
+  background-color: rgba(88, 137, 238, 0.97);
+}
 .select-it:hover{
   width: 100px;
 }
@@ -162,12 +165,3 @@ a{
 .one-msg:hover{
   background-color: rgba(39, 39, 39, 0.78);
 }
-.top-blank{
-  position: absolute;
-  height: 70px;
-  width: 960px;
-  top: 20px;
-  left: 20px;
-  background-color: #323232;
-  border-radius: 5px;
-}

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" %>
+<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>

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 @@
     <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'}">
+            <form class="fill-form" action="testfrom.jsp" method="post">
+                <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="提交">

web/home.jsp

@@ -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">

web/jsFile/fill-action.js

@@ -2,7 +2,8 @@ $(document).ready(function () {
   $(document).off('click',submit_text).on('click','.submit-text',submit_text);
 })
 function submit_text() {
-  var Url3='testfrom.jsp';
+  var Url3=$(this).parent().attr("action");
+  alert(Url3);
   var fillDate=$(this).parent().serialize();
   var upddateit=$('.updated');
   alert(fillDate);

web/jsFile/homeActive.js

@@ -1,6 +1,6 @@
 $(document).ready(function () {
   $('.a-process').on('click',moveBar);
-  $('.update-to-perm').on('click',upadateFrame);
+  $('.update-to-perm').on('click',showPerMsg);
   $('.notice-child').on('mouseenter',shownoticeText).on('mouseleave',hideText);
 })
 function moveBar() {
@@ -54,3 +54,7 @@ function shownoticeText() {
 function hideText() {
   $(this).removeClass("select");
 }
+function showPerMsg(e) {
+  e.preventDefault();
+  $('.link-point').eq(0).click();
+}

web/jsFile/search.js

@@ -1,7 +1,8 @@
 $(document).ready(function () {
   $(document).off('click',searchmsg).on('click','.search-button',searchmsg);
   $(document).off('keydown',searchmsg).on('keydown','.search-input',KDsearchmsg);
-  $(document).off('click',select_one).on('click','.select-it',select_one);
+  $(document).off('click',teacherSelect).on('click','.select-it.teacher',teacherSelect);
+  $(document).off('click',studentSelect).on('click','.select-it.teacher',studentSelect);
 })
 function searchmsg(e) {
   if($('.search-input').val()=='')
@@ -22,16 +23,22 @@ function KDsearchmsg(e) {
     searchmsg(e);
   }
 }
-function select_one() {
-  var id=$(this).val();
-  var button=$(this);
+function select_one(Url2,button) {
+  var id=button.val();
   var selectDate={"id":id};
-  var Url2='testfrom.jsp';
-  $.post(Url2,selectDate,function (data,status) {
+  if(button.html()!="已选")
+  {$.post(Url2,selectDate,function (data,status) {
     if(status=='success')
     {
-      button.css('background-color','rgba(88, 137, 238, 0.97)')
-      .html("已选")
+      button.addClass('on').html("已选");
     }
-  });
+  })}
+}
+function studentSelect() {
+  var button=$(this);
+  select_one("testfrom.jsp",button);
+}
+function teacherSelect() {
+  var button=$(this);
+  select_one("testfrom.jsp",button);
 }

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("提交成功");
+        }
+      }
+  );
+}

web/jsFile/upload_action.js

@@ -41,4 +41,6 @@ function showMsg() {
   $('.file-name').html(filename);
   $('.file-msg').css("left","340px");
   $('.file-input-frame').css("right","20px")
+  $('.select-file').html("重新选择");
+  $('.select-file').css("background-color","#eb4548");
 }

web/select.jsp

@@ -6,6 +6,14 @@
   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" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <html>
 <head>
     <title>Title</title>
@@ -14,10 +22,36 @@
     <script type="text/javascript" src="jsFile/search.js"></script>
 </head>
 <body>
+<%
+    Map<String,String> map1=new HashMap<String,String>();
+    Map<String,String> map2=new HashMap<>();
+    map1.put("姓名","hehcu");
+    map1.put("学号","201630126050");
+    map1.put("电话","18711191679");
+    map1.put("状态","选择");
+    map2.put("姓名","laoshi");
+    map2.put("学号","54646546");
+    map2.put("电话","18711191679");
+    map2.put("状态","已选");
+    List<Map<String,String>> list=new ArrayList<>();
+    list.add(map1);
+    list.add(map2);
+    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="fill-top-blank">
+            <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 +62,19 @@
             <div class="select-blank"></div>
             <div class="selected-bottom"></div>
         </div>
-        <div class="list-frame bar-hange">
+        <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" end="${fn:length(z)-2}">
+                    <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 ${type} <c:if test="${z.状态=='已选'}">on</c:if>" value="${z.学号}">
+                        ${z.状态}</button>
             </div>
+        </c:forEach>
         </div>
     </div>
 </div>