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

# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java

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;
 }
@@ -412,13 +421,14 @@ ul{
 .model-info{
   text-align: center;
   float: left;
-  width: 150px;
+  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/fill_Information.jsp

@@ -48,7 +48,7 @@
                 <div class="tips-msg">${z.key}:${z.value}</div>
                 </c:forEach>
             </div>
-            <form class="fill-form" action="" method="post">
+            <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="请输入分数">

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() {
+function select_one(Url2,button) {
-  var id=$(this).val();
+  var id=button.val();
-  var button=$(this);
   var selectDate={"id":id};
-  var Url2='testfrom.jsp';
+  if(button.html()!="已选")
-  $.post(Url2,selectDate,function (data,status) {
+  {$.post(Url2,selectDate,function (data,status) {
     if(status=='success')
     {
-      button.css('background-color','rgba(88, 137, 238, 0.97)')
+      button.addClass('on').html("已选");
-      .html("已选")
     }
-  });
+  })}
+}
+function studentSelect() {
+  var button=$(this);
+  select_one("testfrom.jsp",button);
+}
+function teacherSelect() {
+  var button=$(this);
+  select_one("testfrom.jsp",button);
 }

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

@@ -13,6 +13,7 @@
 <%@ 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>
@@ -22,8 +23,19 @@
 </head>
 <body>
 <%
-    C_TeacherSearchStudent searchStudent=new C_TeacherSearchStudent();
+    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();
@@ -31,7 +43,7 @@
 %>
 <div class="updated">
     <div class="select-frame">
-        <div class="top-blank">
+        <div class="fill-top-blank">
             <div class="model-info">
                <c:if test="${type=='teacher'}">
                    ${"选择学生"}
@@ -55,11 +67,12 @@
             <div class="list-child">
                 <div class="name"><span class="the-name">${z.姓名}</span></div>
                 <div class="other-msgs">
-                <c:forEach items="${z}" var="msg" begin="1">
+                <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>
-                <button class="select-it" value="${z.学号}">选择</button>
+                <button class="select-it ${type} <c:if test="${z.状态=='已选'}">on</c:if>" value="${z.学号}">
+                        ${z.状态}</button>
             </div>
         </c:forEach>
         </div>