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

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

GDMS.iml

@@ -17,10 +17,18 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="10" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="lib" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
+    <orderEntry type="library" name="lib" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="tomcat-lib" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>

src/gdms/test.java

@@ -17,18 +17,6 @@ public class test {
             System.out.println(i);
         }while(i<3);
 
-        List<String> list = new ArrayList<>();
-        list.add("q");
-        list.add("w");
-        Map<String,String> map=new HashMap<>();
-        map.put("a","b");
-        map.put("c","d");
-        Select sql = new Select(list,"zx",map,1,2);
-        System.out.println(sql.getSQL());
-        System.out.println(Utils.getFilePathName("a","b"));
-        String a = "a";
-        changeB(a);
-        System.out.println(a);
     }
     static void changeB(String a){
         a="B";

src/servlet/S_StudentUploadFinishedProduct.java

@@ -13,7 +13,8 @@ import java.io.IOException;
 public class S_StudentUploadFinishedProduct extends HttpServlet {
     static String fileType = "graduation_design_finished_product";
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        String id = request.getParameter("id");
+        String id = "000";
+        //String id = request.getParameter("id");
         String fileURL = servlet.Utils.saveFile(request, fileType);
     }
 }

src/servlet/Utils.java

@@ -1,7 +1,6 @@
 package servlet;
 
 import gdms.Configuration;
-import org.apache.coyote.Request;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

web/cssFile/home.css

@@ -6,13 +6,14 @@ body{
   height: 100%;
 }
 .fill-top-blank{
+  border: 1px solid rgb(238, 238, 238);
   border-radius: 5px;
   height: 70px;
   width: 960px;
   position: absolute;
   top: 20px;
   right: 10px;
-  background-color: #323232;
+  background: url("images/topImg.jpg");
 }
 .main2{
   background-color:#fafafa;
@@ -37,7 +38,7 @@ ul{
   position: fixed;
   background-color: #c13139;
   z-index: 100;
-  box-shadow: 5px 0px 10px rgba(0, 0, 0, 0.3);
+  box-shadow: rgba(0, 0, 0, 0.23) 0 1px 2px;
 }
 .top-center-bar{
   position: relative;
@@ -424,9 +425,9 @@ ul{
   width: 400px;
   height: 40px;
   margin: 15px 10px;
-  background-color: #e4e4e4;
+  background-color: rgba(0, 0, 0, 0.6);
   border-radius: 5px;
-  color: rgba(27, 27, 27, 0.87);
+  color: rgb(255, 255, 255);
   padding-left: 10px;
   line-height: 35px;
   font-size: 18px;

web/cssFile/select-style.css

@@ -14,7 +14,7 @@ a{
   height: 50px;
   top:10px;
   right: 20px;
-  background-color: rgba(255, 255, 255, 0.23);
+  background-color: rgba(0, 0, 0, 0.3);
   border-radius: 5px;
 }
 .search-button{
@@ -38,7 +38,7 @@ a{
   float: left;
   width: 280px;
   height: 40px;
-  background: rgba(255, 255, 255, 0.85);
+  background: rgba(255, 255, 255, 0.91);
 }
 .search-input:hover{
   background: rgb(255, 255, 255);

web/fillSbjMsg.jsp

@@ -1,4 +1,5 @@
-<%--
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %><%--
   Created by IntelliJ IDEA.
   User: lenovo
   Date: 2019/1/14
@@ -13,7 +14,7 @@
     <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>
+<body>
 <div class="updated">
     <div class="blank-frame-sub">
         <div class="fill-top-blank"><div class="model-info">填写选题信息</div></div>
@@ -58,7 +59,6 @@
                     <input class="sub-input-button" type="button" value="提交">
                 </form>
             </div>
-        </div>
     </div>
 </div>
 </body>

web/home.jsp

@@ -1,4 +1,5 @@
-<%--
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %><%--
   Created by IntelliJ IDEA.
   User: lenovo
   Date: 2019/1/9
@@ -28,6 +29,13 @@
 </head>
 <body>
 <%String type="teacher";pageContext.setAttribute("userType",type);%>
+<%List<String> list=new ArrayList<>();
+    list.add("001");
+    list.add("002");
+    int index=0;
+    pageContext.setAttribute("list",list);
+    session.setAttribute("list",list);
+%>
 <div class="main">
     <div class="top-bar">
         <div class="top-center-bar">
@@ -53,7 +61,7 @@
             <div class="nav-bar">
                 <div class="point-bar"></div>
                 <div class="a-process personal-msg">
-                    <a href="personal_setting.jsp" class="link-point personal-msg-page">
+                    <a href="personal_setting.jsp?001" class="link-point personal-msg-page">
                         <div class="a-process-decoration personal-set">
                             <img src="cssFile/images/man.png">
                         </div>
@@ -61,15 +69,14 @@
                     </a>
                 </div>
                 <div class="a-process aux-fun">
-                    <a href="download.jsp" class="link-point aux-fun-page">
+                    <a href="download.jsp?002" class="link-point aux-fun-page">
                         <div class="a-process-decoration download">
                             <img src="cssFile/images/download.png">
                         </div>
                         <div class="nav-info">资料下载</div>
                     </a>
                 </div>
-                <c:if test="${userType=='teacher'}">
+                    <div class="a-process">
-                    <div class="a-process select-area">
                         <a href="select.jsp" class="link-point data-download-page">
                             <div class="a-process-decoration select">
                                 <img src="cssFile/images/select.png">
@@ -77,7 +84,7 @@
                             <div class="nav-info">选择老师</div>
                         </a>
                     </div>
-                    <div class="a-process file-info">
+                    <div class="a-process">
                         <a href="fill_Information.jsp" class="link-point">
                             <div class="a-process-decoration">
                                 <img src="cssFile/images/fill.png">
@@ -101,7 +108,16 @@
                             <div class="nav-info">填写选题信息</div>
                         </a>
                     </div>
-                </c:if>
+                <c:forEach items="${list}" var="value">
+                    <div class="a-process">
+                        <a href="fillSbjMsg.jsp?<%=index++%>" class="link-point">
+                            <div class="a-process-decoration">
+                                <img src="cssFile/images/filText.png">
+                            </div>
+                            <div class="nav-info">填写选题信息</div>
+                        </a>
+                    </div>
+                </c:forEach>
             </div>
             <div class="update-frame">
                 <div class="small-ads">

web/jsFile/home-update.js

@@ -4,6 +4,10 @@ $(document).ready(function () {
 function upadateFrame(e) {
   e.preventDefault();
   var updateUrl=$(this).attr('href');
-  $('.update-frame').load(updateUrl+' .updated');
+  var arr=updateUrl.split('?');
+  var proccessIndex=arr[1];
+  var indexData={"index":proccessIndex};
+  $('.update-frame').load(updateUrl+' .updated',indexData,function (data) {
+  });
   history.pushState(null,null,updateUrl);
 }

web/jsFile/search.js

@@ -2,7 +2,7 @@ $(document).ready(function () {
   $(document).off('click',searchmsg).on('click','.search-button',searchmsg);
   $(document).off('keydown',searchmsg).on('keydown','.search-input',KDsearchmsg);
   $(document).off('click',teacherSelect).on('click','.select-it.teacher',teacherSelect);
-  $(document).off('click',studentSelect).on('click','.select-it.teacher',studentSelect);
+  $(document).off('click',studentSelect).on('click','.select-it.student',studentSelect);
 })
 function searchmsg(e) {
   if($('.search-input').val()=='')

web/jsFile/upload_action.js

@@ -4,8 +4,8 @@ $(document).ready(function () {
   $(document).off('change',showMsg).on('change','.true-select',showMsg)
 })
 function sendFile() {
-  var fileData =new FormData;
+  var fileData =new FormData();
-  var Url4='testfrom.jsp';
+  var Url4='student-upload-finished-product';
   var file=$('.true-select').files;
   if($('.true-select').val()=='')
   {