process

.idea/artifacts/gdms_Web_exploded.xml

@@ -2,8 +2,11 @@
   <artifact type="exploded-war" name="gdms:Web exploded">
     <output-path>$PROJECT_DIR$/out/artifacts/gdms_Web_exploded</output-path>
     <root id="root">
+      <element id="javaee-facet-resources" facet="GDMS/web/Web" />
       <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes" />
+        <element id="directory" name="classes">
+          <element id="module-output" name="gdms" />
+        </element>
         <element id="directory" name="lib">
           <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" />
         </element>

.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51/storage_v2/_src_/schema/gdms.Q1cwAA.meta

@@ -0,0 +1 @@
+#n:gdms

.idea/encodings.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="file://$PROJECT_DIR$/web/jsFile/login.js" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
 </project>

.idea/libraries/com_hynnet_json_lib_2_4.xml

@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="com.hynnet:json-lib:2.4" type="repository">
+    <properties maven-id="com.hynnet:json-lib:2.4" />
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/json-lib-2.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-beanutils-1.8.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-collections-3.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-lang-2.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/ezmorph-1.0.6.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

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

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/gdms.iml" filepath="$PROJECT_DIR$/gdms.iml" />
+      <module fileurl="file://$PROJECT_DIR$/GDMS.iml" filepath="$PROJECT_DIR$/GDMS.iml" />
     </modules>
   </component>
 </project>

GDMS.iml

@@ -4,11 +4,10 @@
     <facet type="web" name="Web">
       <configuration>
         <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/out/artifacts/GDMS_war_exploded/WEB-INF/classes/conf/web.xml" />
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/out/artifacts/GDMS_war_exploded/WEB-INF/classes/conf/web/WEB-INF/web.xml" />
         </descriptors>
         <webroots>
-          <root url="file://$MODULE_DIR$/out/artifacts/GDMS_war_exploded/WEB-INF/classes/conf" relative="/WEB-INF" />
+          <root url="file://$MODULE_DIR$/web" relative="/" />
         </webroots>
       </configuration>
     </facet>
@@ -20,6 +19,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="mariadb-java-client-2.3.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.14" level="application_server_libraries" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 9.0/lib/tomcat-jdbc.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="com.hynnet:json-lib:2.4" level="project" />
   </component>
 </module>

src/core/process/C_FillInformation.java

@@ -4,5 +4,4 @@ public abstract class C_FillInformation extends TempProcess {
     public String getJspURL(){
         return "/home/fill_Information.jsp";
     }
-
 }

src/core/process/C_StudentSelectTeacher.java

@@ -12,7 +12,7 @@ import java.util.Map;
 public class C_StudentSelectTeacher extends C_Select {
     String studentId;
     String teacherId;
-    protected static String buttonName ="选择老师";
+    protected String buttonName ="选择老师";
     protected static String targetURL="/home/student-select-teacher";
     protected static String iconURL="../cssFile/images/select.png";
     protected static String info = "";

src/core/process/C_StudentUploadFinishedProduct.java

@@ -68,4 +68,9 @@ public class C_StudentUploadFinishedProduct extends C_UploadFile {
     public String getButtonName() {
         return buttonName;
     }
+
+    @Override
+    public String getFileType() {
+        return "上传定稿";
+    }
 }

src/core/process/C_StudentUploadOpeningReport.java

@@ -26,6 +26,7 @@ public class C_StudentUploadOpeningReport extends C_UploadFile{
         limits.put("id",this.getGraduationDesignId());
         uploadFileOperation.addOptions("limits",limits);
         uploadFileOperation.execute(null);
+        updateStatus();
     }
 
     protected boolean check() {
@@ -69,4 +70,9 @@ public class C_StudentUploadOpeningReport extends C_UploadFile{
     public String getButtonName() {
         return buttonName;
     }
+
+    @Override
+    public String getFileType() {
+        return "上传开题报告";
+    }
 }

src/core/process/C_UploadFile.java

@@ -4,4 +4,5 @@ public abstract class C_UploadFile extends TempProcess {
     public String getJspURL(){
         return "/home/upload_file.jsp";
     }
+    public abstract String getFileType();
 }

src/core/process/TempProcess.java

@@ -4,6 +4,8 @@ public abstract class TempProcess extends Process {
     private static String process;
     private static String nextProcess;
     private String graduationDesignId;
+    private static String table;
+    private static String fileds;
 
     public String getGraduationDesignId() {
         return graduationDesignId;
@@ -28,4 +30,8 @@ public abstract class TempProcess extends Process {
     public static void setNextProcess(String nextProcess) {
         TempProcess.nextProcess = nextProcess;
     }
+
+    public static void updateStatus(){
+        ;
+    }
 }

src/error/GExcptFileIO.java

@@ -0,0 +1,7 @@
+package error;
+
+public class GExcptFileIO extends GExcpt {
+    public GExcptFileIO(String info) {
+        super(info);
+    }
+}

src/filter/CharSet.java

@@ -0,0 +1,105 @@
+package filter;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+
+@WebFilter(urlPatterns = "/*")
+public class CharSet implements Filter {
+  public void destroy() {
+  }
+
+  public void doFilter(ServletRequest req, ServletResponse resp,
+      FilterChain chain) throws ServletException, IOException {
+    HttpServletRequest httpServletRequest = (HttpServletRequest) req;
+    // 对request包装增强
+    HttpServletRequest myrequest = new MyRequest(httpServletRequest);
+    ((HttpServletResponse)resp).setContentType("text/html;charset=utf-8");
+    chain.doFilter(myrequest, resp);
+
+  }
+
+  public void init(FilterConfig config) throws ServletException {
+
+  }
+}
+class MyRequest extends HttpServletRequestWrapper {
+
+  private HttpServletRequest request;
+
+  private boolean hasEncode;
+
+  public MyRequest(HttpServletRequest request) {
+    super(request);
+    this.request = request;
+  }
+
+  // 对需要增强方法 进行覆盖
+  @Override
+  public Map<String, String[]> getParameterMap() {
+    // 先获得请求方式
+    String method = request.getMethod();
+    if (method.equalsIgnoreCase("post")) {
+      // post请求
+      try {
+        // 处理post乱码
+        request.setCharacterEncoding("utf-8");
+        return request.getParameterMap();
+      } catch (UnsupportedEncodingException e) {
+        e.printStackTrace();
+      }
+    } else if (method.equalsIgnoreCase("get")) {
+      // get请求
+      Map<String, String[]> parameterMap = request.getParameterMap();
+      if (!hasEncode) { // 确保get手动编码逻辑只运行一次
+        for (String parameterName : parameterMap.keySet()) {
+          String[] values = parameterMap.get(parameterName);
+          if (values != null) {
+            for (int i = 0; i < values.length; i++) {
+              try {
+                // 处理get乱码
+                values[i] = new String(values[i].getBytes("ISO-8859-1"), "utf-8");
+              } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+              }
+            }
+          }
+        }
+        hasEncode = true;
+      }
+      return parameterMap;
+    }
+
+    return super.getParameterMap();
+  }
+
+  @Override
+  public String getParameter(String name) {
+    Map<String, String[]> parameterMap = getParameterMap();
+    String[] values = parameterMap.get(name);
+    if (values == null) {
+      return null;
+    }
+    return values[0]; // 取回参数的第一个值
+  }
+
+  @Override
+  public String[] getParameterValues(String name) {
+    Map<String, String[]> parameterMap = getParameterMap();
+    String[] values = parameterMap.get(name);
+    return values;
+  }
+
+}
+

src/gdms/GDMS.java

@@ -1,8 +1,11 @@
 package gdms;
 
 import dao.DBManagement;
+import error.GExcptFileIO;
 import error.GExcptInit;
 import error.GExcptSQL;
+import net.sf.json.JSONObject;
+import utils.Utils;
 
 import java.util.*;
 
@@ -39,7 +42,7 @@ public class GDMS {
                     @Override
                     public void run() {
                         List<String> fields = new ArrayList<>();
-                        fields.add("teacher_choose_student_status");
+                        fields.add("student_choose_teacher_status");
                         try {
                             DBManagement.updateAll("graduation_design",fields,"1");
                         } catch (GExcptSQL gExcptSQL) {
@@ -52,35 +55,148 @@ public class GDMS {
                 return new TimerTask() {
                     @Override
                     public void run() {
-                        ;
+                        List<String> fields = new ArrayList<>();
+                        fields.add("student_choose_teacher_status");
+                        fields.add("teacher_choose_student_status");
+                        try {
+                            DBManagement.updateAll("graduation_design",fields,"4");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
+                        fields = new ArrayList<>();
+                        fields.add("student_fill_graduation_design_information_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_information",fields,"4");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
+                        fields = new ArrayList<>();
+                        fields.add("opening_report_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_opening_report",fields,"1");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
+                        fields = new ArrayList<>();
+                        fields.add("opening_report_mentor_opinion_status");
+                        fields.add("opening_report_teacher_team_opinion_status");
+                        fields.add("opening_report_college_opinion_status");
+                        fields.add("opening_report_secretary_record_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_opening_report_opinion_record",fields,"1");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
                     }
                 };
             case "opening_report_opinion_deadline_date":
                 return new TimerTask() {
                     @Override
                     public void run() {
-                        ;
+                        List<String> fields = new ArrayList<>();
+                        fields.add("opening_report_mentor_opinion_status");
+                        fields.add("opening_report_teacher_team_opinion_status");
+                        fields.add("opening_report_college_opinion_status");
+                        fields.add("opening_report_secretary_record_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_opening_report_opinion_record",fields,"4");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
+                        fields = new ArrayList<>();
+                        fields.add("finished_product_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_finished_product",fields,"1");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
                     }
                 };
             case "finished_product_deadline_date":
                 return new TimerTask() {
                     @Override
                     public void run() {
-                        ;
+                        List<String> fields = new ArrayList<>();
+                        fields.add("finished_product_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_finished_product",fields,"4");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
+                        fields = new ArrayList<>();
+                        fields.add("finished_product_mentor_score_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_finished_product_mentor_score",fields,"1");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
+                        fields = new ArrayList<>();
+                        fields.add("finished_product_reviewer_score_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_finished_product_reviewer_score",fields,"1");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
                     }
                 };
             case "finished_product_review_deadline_date":
                 return new TimerTask() {
                     @Override
                     public void run() {
-                        ;
+                        List<String> fields = new ArrayList<>();
+                        fields.add("finished_product_mentor_score_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_finished_product_mentor_score",fields,"4");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
+                        fields = new ArrayList<>();
+                        fields.add("finished_product_reviewer_score_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_finished_product_reviewer_score",fields,"4");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
+                        fields = new ArrayList<>();
+                        fields.add("reply_mentor_score_status");
+                        fields.add("reply_teacher_team_score_status");
+                        fields.add("reply_college_score_status");
+                        fields.add("reply_secretary_record_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_reply_opinion_record_score",fields,"1");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
                     }
+
                 };
             case "reply_opinion_deadline_date":
                 return new TimerTask() {
                     @Override
                     public void run() {
-                        ;
+                        List<String> fields = new ArrayList<>();
+                        fields.add("reply_mentor_score_status");
+                        fields.add("reply_teacher_team_score_status");
+                        fields.add("reply_college_score_status");
+                        fields.add("reply_secretary_record_status");
+                        try {
+                            DBManagement.updateAll("graduation_design_reply_opinion_record_score",fields,"4");
+                        } catch (GExcptSQL gExcptSQL) {
+                            gExcptSQL.printStackTrace();
+                            System.exit(1);
+                        }
                     }
                 };
         }
@@ -89,6 +205,19 @@ public class GDMS {
     }
 
     private static void initSchedule() {
-
+        schedules = new HashMap<>();
+        String sets= null;
+        try {
+            sets = Utils.readFile(schedulePath);
+        } catch (GExcptFileIO gExcptFileIO) {
+            gExcptFileIO.printStackTrace();
+        }
+        JSONObject jo=JSONObject.fromObject(sets);
+        Iterator it = jo.keys();
+        while (it.hasNext()) {
+            String key = (String)it.next();
+            Object value = jo.get(key);
+            schedules.put(key, new utils.Utils.dateFormat((String) value));
+        }
     }
 }

src/gdms/GlobalTimePoint.json

@@ -1,5 +1,5 @@
 {
-  "teacher_choose_student_start_date":"",
+  "teacher_choose_student_start_date":"2018-12-23 00:00:00",
   "student_choose_teacher_start_date": "",
   "choose_end_date": "",
   "opening_report_opinion_deadline_date": "",

src/utils/Utils.java

@@ -1,5 +1,11 @@
 package utils;
 
+import error.GExcpt;
+import error.GExcptFileIO;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,4 +40,29 @@ public interface Utils {
             return "";
         }
     }
+    static String readFile(String path) throws GExcptFileIO {
+        File file = new File(path);
+        BufferedReader reader = null;
+        String str = "";
+        try {
+            reader = new BufferedReader(new FileReader(file));
+            String tempString;
+            while ((tempString = reader.readLine()) != null) {
+                str = str + tempString;
+            }
+            reader.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new GExcptFileIO(path+" read error");
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+        return str;
+    }
 }

web/WEB-INF/web.xml

@@ -3,7 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
          version="4.0">
-    <servlet>
+    <welcome-file-list>
+      <welcome-file>login.jsp</welcome-file>
+    </welcome-file-list>
+  <servlet>
         <servlet-name>Init</servlet-name>
         <servlet-class>init.Init</servlet-class>
         <load-on-startup>1</load-on-startup>

web/cssFile/home.css

@@ -104,23 +104,40 @@ ul{
 }
 .personal-opt{
   height: 100%;
-  width: 120px;
+  width: 160px;
   position: absolute;
   right: 0px;
 }
 
 .personal-opt .head-img{
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.31);
+  text-align: center;
+  border-radius: 5px;
+  color: #c6333e;
   float: left;
-  margin: 2px;
+  width: 80px;
-  width: 45px;
+  height:35px;
-  height: 45px;
+  line-height: 35px;
+  margin: 10px;
+  transition: 0.3s;
+  background-color: white;
+}
+.head-img:hover{
+  height: 37px;
+  cursor: pointer;
 }
 .opt .img{
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.31);
+  border-radius: 5px;
+  overflow: hidden;
   display: block;
   width: 35px;
   height: 35px;
   margin: 10px 10px 10px 10px;
 }
+.opt .img:hover{
+  height: 36px;
+}
 .opt-options div{
   width: 100%;
   height: 30px;

web/cssFile/login-style.css

@@ -1,21 +1,57 @@
 .img-bar{
   width: 100%;
-  height: 600px;
+  height: 655px;
   background: url("images/login-img2.jpg");
 }
+body{
+  overflow-x: hidden;
+}
+@keyframes showTop {
+  from{top: -55px}
+  to{top:0}
+}
+@keyframes addHeight {
+  from{height: 0}
+  to{height: 70px}
+}
+.call-us{
+  width:60px;
+  height: 70px;
+  color: #e64548;
+  font-size: 30px;
+  background-color: white;
+  font-weight: 600;
+  position: absolute;
+  top: 0px;
+  overflow: hidden;
+  text-align: center;
+  line-height: 70px;
+  right: 240px;
+  transition: 0.5s;
+  cursor: pointer;
+  border-radius: 0 0 5px 5px;
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.33);
+  animation: addHeight 0.3s ease;
+}
+.call-us:hover{
+  line-height: 80px;
+  height: 80px;
+}
 .top-bar{
+  position: fixed;
+  top: 0px;
   width: 100%;
   height: 55px;
   background-color: #c13139;
-  overflow: hidden;
   z-index: 2;
   box-shadow: 5px 0px 10px rgba(0,0,0,0.47);
+  animation:showTop 1s ease;
 }
 .top-center-bar{
   height: 100%;
   width: 900px;
   background-color: #c6333e;
-  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.42);
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.31);
   margin: 0px auto;
 }
 .top-center-bar .logo{
@@ -26,6 +62,19 @@
   font-weight: bolder;
   font-size: 20px;
 }
+@keyframes slowShow {
+  from{opacity: 0.1}
+  to{opacity: 1}
+}
+@keyframes rightFly {
+  from{right: -400px}
+  to{right: 150px}
+}
+@keyframes clickChange {
+  0%{width:100px;opacity: 0}
+  50%{width: 120px;opacity: 0.5}
+  100%{width: 100px;opacity: 1}
+}
 .login-cont{
   box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.44);
   position: absolute;
@@ -35,7 +84,9 @@
   height: 400px;
   top: 150px;
   right: 150px;
+  animation: rightFly 0.8s,slowShow 0.8s ease;
 }
+
 body{
   margin: 0;
 }
@@ -82,6 +133,7 @@ body{
   top: 120px;
   right: 150px;
   box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.44);
+  animation: rightFly 0.8s,slowShow 0.8s ease;
 }
 .register-cont .register-input-text{
   padding: 0px 0px 0px 20px;
@@ -170,7 +222,7 @@ body{
   cursor: pointer;
   background-color: rgba(255, 255, 255, 0.66);
   color: #ffffff;
-  cursor: pointer;
+  animation: clickChange 0.5s ease;
 }
 .register-area .to-any:hover{
   background-color: rgba(255, 255, 255, 0.8);
@@ -196,8 +248,22 @@ body{
 .main{
 }
 .bottom-bar{
-  background-color: #f7edda;
+  position: relative;
-  border: 1px solid rgba(0, 0, 0, 0.16);
+  background-color: #323232;
-  height: 40px;
+  height: 200px;
   width: 100%;
+}
+.big-logo{
+  line-height: 150px;
+  font-size: 50px;
+  color: #e7e7e7;
+  text-align: center;
+  width: 100%;
+  height: 160px;
+  border-bottom:1px solid #3f3f3f;
+}
+.bottom-bar p{
+  width: 100%;
+  text-align: center;
+  color: #7b7b7b;
 }

web/cssFile/personal.css

@@ -68,24 +68,23 @@ ul{
   border-radius: 5px;
 }
 .personal-msg-frame .personal-msg-part .part-name{
-  width: 80px;
+  width: 120px;
   text-align: right;
   line-height: 35px;
-  padding-left: 40px;
   color: rgba(0, 0, 0, 0.78);
   float: left;
   height: 100%;
   font-size: 20px;
 }
 .personal-msg-frame .personal-msg-part .part-cont{
-  width: 450px;
+  width: 400px;
   height: 100%;
   float: left;
   text-align: left;
   color: rgba(0, 0, 0, 0.74);
   line-height: 35px;
   font-size: 20px;
-  padding-left: 20px;
+  padding-left: 40px;
 }
 .updated .change-pw-frame{
   display: none;

web/home/download.jsp

@@ -5,7 +5,7 @@
   Time: 15:18
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <html>
 <head>
     <title>资料下载</title>

web/home/fillSbjMsg.jsp

@@ -6,7 +6,7 @@
   Time: 15:53
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <html>
 <head>
     <title>填写选题信息</title>

web/home/fill_Information.jsp

@@ -9,14 +9,14 @@
   Time: 13:19
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" pageEncoding="UTF-8" %>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head>
     <title>填写信息</title>
-    <link type="text/css" rel="stylesheet" href="cssFile/fill-style.css">
+    <link type="text/css" rel="stylesheet" href="../cssFile/fill-style.css">
-    <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
+    <script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
-    <script type="text/javascript" src="jsFile/fill-action.js"></script>
+    <script type="text/javascript" src="../jsFile/fill-action.js"></script>
 </head>
 <body>
 <%
@@ -48,7 +48,7 @@
                 <div class="tips-msg">${z.key}:${z.value}</div>
                 </c:forEach>
             </div>
-            <form class="fill-form" action="testfrom.jsp" method="post">
+            <form class="fill-form" action="##" 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/home/get_time.jsp

@@ -5,7 +5,8 @@
   Time: 22:30
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" import="java.io.*,java.util.*" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" import="java.io.*,java.util.*"
+pageEncoding="UTF-8" %>
 <html>
 <head>
     <title>Title</title>

web/home/home.jsp

@@ -9,7 +9,7 @@
   Time: 20:32
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="utf-8" %>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head>
@@ -21,14 +21,14 @@
     <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 charset="" type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
-    <script type="text/javascript" src="../jsFile/homeActive.js"></script>
+    <script charset="" type="text/javascript" src="../jsFile/homeActive.js"></script>
-    <script type="text/javascript" src="../jsFile/home-update.js"></script>
+    <script charset="" type="text/javascript" src="../jsFile/home-update.js"></script>
-    <script type="text/javascript" src="../jsFile/personal.js"></script>
+    <script charset="" type="text/javascript" src="../jsFile/personal.js"></script>
-    <script type="text/javascript" src="../jsFile/search.js"></script>
+    <script charset="" type="text/javascript" src="../jsFile/search.js"></script>
-    <script type="text/javascript" src="../jsFile/fill-action.js"></script>
+    <script charset="" type="text/javascript" src="../jsFile/fill-action.js"></script>
-    <script type="text/javascript" src="../jsFile/upload_action.js"></script>
+    <script charset="" type="text/javascript" src="../jsFile/upload_action.js"></script>
-    <script type="text/javascript" src="../jsFile/sub-msg-input.js"></script>
+    <script charset="" type="text/javascript" src="../jsFile/sub-msg-input.js"></script>
 </head>
 <body>
 <%
@@ -36,9 +36,11 @@
     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;
+    pageContext.setAttribute("list",pList);
+    int length=pList.size();
     int index=0;
+    int num=0;
 %>
 <div class="main">
     <div class="top-bar">
@@ -47,7 +49,7 @@
             <div class="logo">GDMS</div>
             <div class="personal-opt">
                 <div class="head-img">
-                    <img src="">
+                    <%=user.getName()%>
                 </div>
                 <div class="opt">
                     <img class="img" src="../cssFile/images/opt.png">
@@ -80,45 +82,22 @@
                         <div class="nav-info">资料下载</div>
                     </a>
                 </div>
+                <div class="a-process aux-fun">
+                    <a href="fill_Information.jsp?002" class="link-point aux-fun-page">
+                        <div class="a-process-decoration download">
+                            <img src="../cssFile/images/fill.png">
+                        </div>
+                        <div class="nav-info">资料下载</div>
+                    </a>
+                </div>
+                <c:forEach items="${list}">
                     <div class="a-process">
-                        <a href="select.jsp" class="link-point data-download-page">
+                        <a href="<!%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point">
-                            <div class="a-process-decoration select">
-                                <img src="../cssFile/images/select.png">
-                            </div>
-                            <div class="nav-info">选择老师</div>
-                        </a>
-                    </div>
-                    <div class="a-process">
-                        <a href="fill_Information.jsp" class="link-point">
-                            <div class="a-process-decoration">
-                                <img src="../cssFile/images/fill.png">
-                            </div>
-                            <div class="nav-info">填写信息</div>
-                        </a>
-                    </div>
-                    <div class="a-process">
-                        <a href="upload_file.jsp" class="link-point">
-                            <div class="a-process-decoration">
-                                <img src="../cssFile/images/upload.png">
-                            </div>
-                            <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: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">
+                                <img src=<%=condition.get(num).getIconURL()%>>
                             </div>
-                            <div class="nav-info">填写选题信息</div>
+                            <div class="nav-info"><%=condition.get(num).getButtonName()%></div>
+                            <%num=num+1;%>
                         </a>
                     </div>
                 </c:forEach>

web/home/personal_setting.jsp

@@ -1,11 +1,11 @@
-<%--
+<%@ page import="core.user.User" %><%--
   Created by IntelliJ IDEA.
   User: lenovo
   Date: 2019/1/9
   Time: 23:33
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <link type="text/css" rel="stylesheet" href="../cssFile/personal.css">
 <script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
 <script type="text/javascript" src="../jsFile/personal.js"></script>
@@ -14,8 +14,10 @@
     <title>个人信息</title>
 </head>
 <body>
+<%
+    User user=(User)session.getAttribute("user");
+%>
 <div class="updated">
-
     <div class="personal-set-frame">
         <div class="personal-choose">
             <ul class="nav-personal-choose">
@@ -28,19 +30,19 @@
                 <div class="info-text">个人信息</div>
             </div>
             <div class="personal-msg-part">
-                <div class="part-name">id</div><div class="part-cont">未知</div>
+                <div class="part-name">id:</div><div class="part-cont"><%=user.getId()%></div>
             </div>
             <div class="personal-msg-part">
-                <div class="part-name">姓名</div><div class="part-cont">未知</div>
+                <div class="part-name">姓名:</div><div class="part-cont"><%=user.getName()%></div>
             </div>
             <div class="personal-msg-part">
-                <div class="part-name">年级</div><div class="part-cont">未知</div>
+                <div class="part-name">年级:</div><div class="part-cont">2016</div>
             </div>
             <div class="personal-msg-part">
-                <div class="part-name">邮箱</div><div class="part-cont">未知</div>
+                <div class="part-name">邮箱:</div><div class="part-cont"><%=user.getE_mail_location()%></div>
             </div>
             <div class="personal-msg-part">
-                <div class="part-name">电话号码</div><div class="part-cont">未知</div>
+                <div class="part-name">电话号码:</div><div class="part-cont"><%=user.getPhone_number()%></div>
             </div>
         </div>
         <div class="personal-frame change-pw-frame">

web/home/result_list.jsp

@@ -5,7 +5,7 @@
   Time: 19:57
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" pageEncoding="UTF-8" %>
 
 <%
   String id=request.getParameter("id");
@@ -21,5 +21,5 @@
     %>
     <div class="one-msg">电话号码：18711191679</div>
   </div>
-  <button class="select-it" value="<%=123%>">选择</button>
+  <button class="select-it <%=searchType%>" value="<%=123%>">选择</button>
 </div>

web/home/select.jsp

@@ -5,7 +5,7 @@
   Time: 11:13
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" pageEncoding="UTF-8" %>
 <%@ page import="core.user.User" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.HashMap" %>

web/home/upload_file.jsp

@@ -5,7 +5,7 @@
   Time: 10:21
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <html>
 <head>
     <title>上传文件</title>

web/jsFile/fill-action.js

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(document).ready(function () {
   $(document).off('click',submit_text).on('click','.submit-text',submit_text);
 })
 function submit_text() {

web/jsFile/login.js

@@ -1,4 +1,4 @@
-
+
 function showRegister() {
   $('.register-cont').css('display','block');
   $('.login-cont').css('display','none');
@@ -47,7 +47,7 @@ function isEmpty2(e)
   if($('.id-check').val()=='')
   {
     e.preventDefault()
-    alert("请选择身份");
+    alert("请确认身份");
   }
 }
 $(document).ready(

web/jsFile/personal.js

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(document).ready(function () {
   $(document).off('click',pChange).on('click','.choose-child',pChange);
   $(document).off('click',showpm).on('click','.pm',showpm);
   $(document).off('click',showpw).on('click','.pw',showpw);

web/jsFile/search.js

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(document).ready(function () {
   $(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);

web/jsFile/sub-msg-input.js

@@ -1,4 +1,4 @@
-$(document).ready(
+$(document).ready(
     function () {
       $(document).off('click',sendSub).on('click','.sub-input-button',sendSub);
     }

web/jsFile/upload_action.js

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(document).ready(function () {
   $(document).off('click',sendFile).on('click','.upload-it',sendFile);
   $(document).off('click',selectFile).on('click','.select-file',selectFile);
   $(document).off('change',showMsg).on('change','.true-select',showMsg)

web/login.jsp

@@ -5,13 +5,13 @@
   Time: 13:07
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <html>
 <head>
     <title>毕业设计管理系统</title>
     <link type="text/css" rel="stylesheet" href="cssFile/login-style.css">
-    <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
+    <script type="text/javascript" src="jsFile/jquery-3.3.1.js" language="JavaScript"></script>
-    <script type="text/javascript" src="jsFile/login.js"></script>
+    <script type="text/javascript" src="jsFile/login.js" language="JavaScript"></script>
 </head>
 <body>
 <div class="main">
@@ -19,6 +19,7 @@
         <div class="top-center-bar">
             <div class="logo">GDMS</div>
         </div>
+        <div class="call-us">G</div>
     </div>
     <div class="img-bar">
 
@@ -42,17 +43,17 @@
 
         <form method="post" action="register">
             <input class="register-input-text sno-text" type="text" name="id"
-                   placeholder="学号或职工号">
+                   placeholder="学号或职工号" tabindex="1">
             <input class="register-input-text password-text" type="password" name="password"
-                   placeholder="请输入密码">
+                   placeholder="请输入密码" tabindex="5">
             <input class="register-input-text name-text" type="text" name="name"
-                   placeholder="姓名">
+                   placeholder="姓名" tabindex="2">
-            <input class="register-input-text e-mail-text" type="text" name="e_mail_location"
+            <input class="register-input-text e-mail-text" type="email" name="e_mail_location"
-                   placeholder="邮箱">
+                   placeholder="邮箱" tabindex="3">
             <input class="register-input-text phone-number" type="text" name="phone_number"
-                   placeholder="请输入电话">
+                   placeholder="请输入电话" tabindex="4">
             <input class="register-input-text check-password-text" type="password" name="password-check"
-                   placeholder="请确认密码">
+                   placeholder="请确认密码" tabindex="6">
             <select class="id-check" name="userType">
                 <option value="">身份</option>
                 <option value="student">学生</option>
@@ -61,7 +62,10 @@
             <input class="register-submit-style" type="submit" value="注册">
         </form>
     </div>
-    <div class="bottom-bar"></div>
+    <div class="bottom-bar">
+        <div class="big-logo">GDMS</div>
+        <p>team bys</p>
+    </div>
 </div>
 </body>
 </html>

web/op_fail.jsp

@@ -11,9 +11,13 @@
     <title>操作失败</title>
 </head>
 <body>
-<div class="option-fail" style="margin: 100px 580px;">
+<div class="option-fail" style="margin: 100px auto;width: 400px;height: 400px;border: 5px solid
-    <img src="cssFile/images/error.png">
+#d64341;border-radius: 10px">
-    <a href="login.jsp" style="margin: 0px auto">返回登陆</a>
+    <img style="display: block;width: 200px;height: 200px;margin: 40px auto" src="cssFile/images/error.png">
+    <a href="login.jsp">
+        <div style="width: 100px;color: white;background-color: #e65e5f;height: 30px;
+    border-radius: 5px;margin: 50px auto;text-align: center;text-decoration: none">返回登陆</div>
+    </a>
 </div>
 </body>
 </html>

web/test2.js

@@ -1 +0,0 @@
-