zhailw
/
gdms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	.idea/artifacts/GDMS_war_exploded.xml
#	.idea/artifacts/gdms_Web_exploded.xml
#	.idea/artifacts/gdms_war_exploded.xml
#	.idea/misc.xml
hechu1
何楚 6 years ago
parent 211b4b69ec
commit 4a2ef0ab6d
6 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
.idea/artifacts/gdms_war_exploded.xml
Unescape View File

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

4
GDMS.iml
Unescape View File

@ -17,9 +17,8 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.14" level="application_server_libraries" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
@ -29,5 +28,6 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Tomcat 9" level="application_server_libraries" />
</component> </component>
</module> </module>

2
src/core/process/C_StudentSelectTeacher.java
Unescape View File

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

3
src/gdms/test.java
Unescape View File

@ -14,7 +14,8 @@ public class test {
String s = "graduation_design_finished_product_reviewer_score.reviewer_teacher_id"; String s = "graduation_design_finished_product_reviewer_score.reviewer_teacher_id";
String[] ss = s.split("\\."); String[] ss = s.split("\\.");
System.out.println(ss[0]); System.out.println(ss[0]);
C_StudentSelectTeacher p = new C_StudentSelectTeacher();
System.out.println(p.getButtonName());
} }
static void changeB(String a){ static void changeB(String a){
a="B"; a="B";

1
web/cssFile/login-style.css
Unescape View File

@ -2,7 +2,6 @@
width: 100%; width: 100%;
height: 655px; height: 655px;
background: url("images/login-img2.jpg"); background: url("images/login-img2.jpg");
animation: slowShow 0.8s ease;
} }
body{ body{
overflow-x: hidden; overflow-x: hidden;

42
web/home/home.jsp
Unescape View File

@ -36,8 +36,10 @@
String type=user.getType(); String type=user.getType();
pageContext.setAttribute("userType",type); pageContext.setAttribute("userType",type);
Condition condition=user.getCondition(); Condition condition=user.getCondition();
/*List<Process> pList=condition.getProcesses();*/ List<Process> pList=condition.getProcesses();
int length=0; String name=condition.get(1).getButtonName();
pageContext.setAttribute("list",pList);
int length=pList.size();
int index=0; int index=0;
%> %>
<div class="main"> <div class="main">
@ -80,45 +82,13 @@
<div class="nav-info">资料下载</div> <div class="nav-info">资料下载</div>
</a> </a>
</div> </div>
<div class="a-process"> <c:forEach items="${list}">
<a href="select.jsp" class="link-point data-download-page">
<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"> <div class="a-process">
<a href="fillSbjMsg.jsp?<%=index++%>" class="link-point"> <a href="fillSbjMsg.jsp?<%=index++%>" class="link-point">
<div class="a-process-decoration"> <div class="a-process-decoration">
<img src="../cssFile/images/filText.png"> <img src="../cssFile/images/filText.png">
</div> </div>
<div class="nav-info">填写选题信息</div> <div class="nav-info"><%=name%></div>
</a> </a>
</div> </div>
</c:forEach> </c:forEach>

Write Preview
Loading…
Cancel
Save