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

# Conflicts: # src/gdms/GDMS.java
6 years ago · 34c30c37d4
parent 139d16b702
commit 34c30c37d4
16 changed files with 8 additions and 4 deletions
--- a/out/production/GDMS/core/process/C_CollegeFillOpeningReportOpinion.class
+++ b/out/production/GDMS/core/process/C_CollegeFillOpeningReportOpinion.class
--- a/out/production/GDMS/core/process/C_MentorFillOpeningReportOpinion.class
+++ b/out/production/GDMS/core/process/C_MentorFillOpeningReportOpinion.class
--- a/out/production/GDMS/core/process/C_MentorFillReview.class
+++ b/out/production/GDMS/core/process/C_MentorFillReview.class
--- a/out/production/GDMS/core/process/C_SecretaryFillOpeningReportRecord.class
+++ b/out/production/GDMS/core/process/C_SecretaryFillOpeningReportRecord.class
--- a/out/production/GDMS/core/process/C_SecretaryFillReplyRecord.class
+++ b/out/production/GDMS/core/process/C_SecretaryFillReplyRecord.class
--- a/out/production/GDMS/core/process/C_StudentSearchTeacher.class
+++ b/out/production/GDMS/core/process/C_StudentSearchTeacher.class
--- a/out/production/GDMS/core/process/C_StudentSelectTeacher.class
+++ b/out/production/GDMS/core/process/C_StudentSelectTeacher.class
--- a/out/production/GDMS/core/process/C_StudentUploadFinishedProduct.class
+++ b/out/production/GDMS/core/process/C_StudentUploadFinishedProduct.class
--- a/out/production/GDMS/core/process/C_StudentUploadOpeningReport.class
+++ b/out/production/GDMS/core/process/C_StudentUploadOpeningReport.class
--- a/out/production/GDMS/core/process/C_TeacherSearchStudent.class
+++ b/out/production/GDMS/core/process/C_TeacherSearchStudent.class
--- a/out/production/GDMS/core/process/C_TeacherTeamFillOpeningReportOpinion.class
+++ b/out/production/GDMS/core/process/C_TeacherTeamFillOpeningReportOpinion.class
--- a/out/production/GDMS/core/process/C_TeacherTeamFillScoreOpinion.class
+++ b/out/production/GDMS/core/process/C_TeacherTeamFillScoreOpinion.class
--- a/out/production/GDMS/core/process/C_UploadFile.class
+++ b/out/production/GDMS/core/process/C_UploadFile.class
--- a/web/home/home.jsp
+++ b/web/home/home.jsp
@ -93,7 +93,7 @@
                </div>
                <c:forEach items="${list}">
                    <div class="a-process">
-                        <a href="<%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point">
+                        <a href="<%=(condition.get(num)).getJspURL()%>?<%=index++%>" class="link-point">
                            <div class="a-process-decoration">
                                <img src=<%=condition.get(num).getIconURL()%>>
                            </div>
--- a/web/jsFile/test.js
+++ b/web/jsFile/test.js
@ -1,6 +1,7 @@
-$(document).ready(
+$(document).ready(
    function () {
-      alert("你好");
+      sessionStorage.setItem("hello","hha");
      alert(sessionStorage.getItem("hello"));
    })
 function alet() {
  alert("成功");
--- a/web/test.jsp
+++ b/web/test.jsp
@ -13,7 +13,10 @@
    <script charset="GBK" type="text/javascript" src="jsFile/test.js" language="JavaScript"></script>
 </head>
 <body>
 <%  String a="abc";
 %>
 <button class="but">nihao</button>
-<div>hhhhhhhhhhhhhh</div>
+<div><%=session.getAttribute("hello")%></div>
 </body>
 </html>