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

# Conflicts:
#	src/core/process/C_TeacherSearchStudent.java
#	web/jsFile/upload_action.js

GDMS.iml

@@ -28,6 +28,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.14" level="application_server_libraries" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9" level="application_server_libraries" />
   </component>
 </module>

web/home/home.jsp

@@ -36,7 +36,7 @@
     String type=user.getType();
     pageContext.setAttribute("userType",type);
     Condition condition=user.getCondition();
-    List<Process> pList=condition.getProcesses();
+    /*List<Process> pList=condition.getProcesses();*/
     int length=0;
     int index=0;
 %>

web/home/result_list.jsp

@@ -7,19 +7,17 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" %>
 
-<%String a=request.getParameter("id");
-String b[][]=new String[3][3];
-for(int i=0;i<3;i++)
-  for(int j=0;j<3;j++)
-    b[i][j]="hello";
+<%
+  String id=request.getParameter("id");
+  String searchType=request.getParameter("searchType");
 %>
 <%%>
 <div class="list-child">
-  <div class="name"><span class="the-name"><%=a%></span></div>
+  <div class="name"><span class="the-name"><%=searchType%></span></div>
   <div class="other-msgs">
     <%for(int k=0;k<2;k++)
       for (int n=0;n<2;n++)
-        out.print(" <div class=\"one-msg\">电话号码："+b[k][n]+"</div>");
+        out.print(" <div class=\"one-msg\">电话号码："+k+n+"</div>");
     %>
     <div class="one-msg">电话号码：18711191679</div>
   </div>

web/home/select.jsp

@@ -54,7 +54,7 @@
             </div>
             <div class="search-frame">
                 <input class="search-input" type="text" name="id" value="" placeholder="输入学号查找">
-                <div class="search-button"></div>
+                <div class="search-button ${type}"></div>
             </div>
         </div>
         <div class="count-select">

web/jsFile/search.js

@@ -1,10 +1,12 @@
 $(document).ready(function () {
-  $(document).off('click',searchmsg).on('click','.search-button',searchmsg);
-  $(document).off('keydown',searchmsg).on('keydown','.search-input',KDsearchmsg);
+  $(document).off('click',searchStuMsg).on('click','.search-button.teacher',searchStuMsg);
+  $(document).off('click',searchTeaMsg).on('click','.search-button.student',searchTeaMsg);
+  $(document).off('keydown',KDsearchSmsg).on('keydown','.search-button.teacher',KDsearchSmsg);
+  $(document).off('keydown',KDsearchTmsg).on('keydown','.search-button.student',KDsearchTmsg);
   $(document).off('click',teacherSelect).on('click','.select-it.teacher',teacherSelect);
   $(document).off('click',studentSelect).on('click','.select-it.student',studentSelect);
 })
-function searchmsg(e) {
+function searchStuMsg(e) {
   if($('.search-input').val()=='')
   {
     e.preventDefault();
@@ -12,15 +14,36 @@ function searchmsg(e) {
   }
   else {
     var id=$('.search-input').val();
-    var rqDate={"id":id};
+    var searchType='teacher';
+    var rqDate={"id":id,"searchType":searchType};
     var Url1='result_list.jsp';
     $('.list-frame').load(Url1,rqDate);
   }
 }
-function KDsearchmsg(e) {
+function searchTeaMsg(e) {
+  if($('.search-input').val()=='')
+  {
+    e.preventDefault();
+    alert('请输入学号');
+  }
+  else {
+    var id=$('.search-input').val();
+    var searchType='student';
+    var rqDate={"id":id,"searchType":searchType};
+    var Url1='result_list.jsp';
+    $('.list-frame').load(Url1,rqDate);
+  }
+}
+function KDsearchSmsg(e) {
+  if(e.keyCode==13)
+  {
+   searchStuMsg(e);
+  }
+}
+function KDsearchTmsg(e) {
   if(e.keyCode==13)
   {
-    searchmsg(e);
+    searchTeaMsg(e);
   }
 }
 function select_one(Url2,button) {