diff --git a/.idea/misc.xml b/.idea/misc.xml index 9486b47..11bca97 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/GDMS.iml b/GDMS.iml index 20dda90..23fde1f 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -17,10 +17,18 @@ - + - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/gdms/test.java b/src/gdms/test.java index ffdddc1..55dbfa0 100644 --- a/src/gdms/test.java +++ b/src/gdms/test.java @@ -17,18 +17,6 @@ public class test { System.out.println(i); }while(i<3); - List list = new ArrayList<>(); - list.add("q"); - list.add("w"); - Map 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"; diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index 266671c..20f2fb5 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ 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); } } diff --git a/src/servlet/Utils.java b/src/servlet/Utils.java index 687b7e9..3cea1d0 100644 --- a/src/servlet/Utils.java +++ b/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; diff --git a/web/cssFile/home.css b/web/cssFile/home.css index f0985a6..51e2e03 100644 --- a/web/cssFile/home.css +++ b/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; diff --git a/web/cssFile/images/topImg.jpg b/web/cssFile/images/topImg.jpg new file mode 100644 index 0000000..8bba19e Binary files /dev/null and b/web/cssFile/images/topImg.jpg differ diff --git a/web/cssFile/select-style.css b/web/cssFile/select-style.css index ac9a999..6a6da37 100644 --- a/web/cssFile/select-style.css +++ b/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); diff --git a/web/fillSbjMsg.jsp b/web/fillSbjMsg.jsp index 422ac55..618f0e6 100644 --- a/web/fillSbjMsg.jsp +++ b/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 @@ - +
填写选题信息
@@ -58,7 +59,6 @@
-
diff --git a/web/home.jsp b/web/home.jsp index 56d3d00..69b6a30 100644 --- a/web/home.jsp +++ b/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 @@ <%String type="teacher";pageContext.setAttribute("userType",type);%> +<%List list=new ArrayList<>(); + list.add("001"); + list.add("002"); + int index=0; + pageContext.setAttribute("list",list); + session.setAttribute("list",list); +%>
@@ -53,7 +61,7 @@
- +
@@ -61,15 +69,14 @@
- +
资料下载
- -
+
@@ -77,7 +84,7 @@
选择老师
-
+
@@ -101,7 +108,16 @@
填写选题信息
- + +
+ +
+ +
+
填写选题信息
+ +
+
diff --git a/web/jsFile/home-update.js b/web/jsFile/home-update.js index 4484f60..bec3aa0 100644 --- a/web/jsFile/home-update.js +++ b/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); } diff --git a/web/jsFile/search.js b/web/jsFile/search.js index c4482c1..b74575a 100644 --- a/web/jsFile/search.js +++ b/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()=='') diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index c3214c9..c756a06 100644 --- a/web/jsFile/upload_action.js +++ b/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 Url4='testfrom.jsp'; + var fileData =new FormData(); + var Url4='student-upload-finished-product'; var file=$('.true-select').files; if($('.true-select').val()=='') {