From 83cace45952c9bb7c1c070c8e0f107f0a427a582 Mon Sep 17 00:00:00 2001
From: ChineseTony <13206573871@163.com>
Date: Wed, 17 Apr 2019 20:19:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=AD=A6=E6=97=B6=E7=9A=84=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/jsp/AddCourse.jsp    | 20 ++++++++++++++++----
 WebContent/jsp/QueryCourse.jsp  | 13 ++++++++++---
 WebContent/jsp/UpdateCourse.jsp | 20 ++++++++++++++++----
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/WebContent/jsp/AddCourse.jsp b/WebContent/jsp/AddCourse.jsp
index 0dac350..34f5c6b 100644
--- a/WebContent/jsp/AddCourse.jsp
+++ b/WebContent/jsp/AddCourse.jsp
@@ -89,6 +89,12 @@
                             <input id="theoretical" name="theoretical" class="form-control" placeholder="请输入理论学时" datatype="n"></input>
                         </div>
                     </div>
+                     <div class="form-group">
+                        <label for="score" class="col-sm-2 control-label">学分</label>
+                        <div class="col-sm-10">
+                            <input id="score" name="score" class="form-control" placeholder="请输入学分"  datatype="n"></input>
+                        </div>
+                    </div>
                     
                     <div class="form-group">
                         <label for="experiement" class="col-sm-2 control-label">实验学时</label>
@@ -98,12 +104,18 @@
                     </div>
                     
                     <div class="form-group">
-                        <label for="score" class="col-sm-2 control-label">学分</label>
-                        <div class="col-sm-10">
-                            <input id="score" name="score" class="form-control" placeholder="请输入学分"  datatype="n"></input>
-                        </div>
+                        <label for="unit" class="col-sm-2 control-label">实验学时单位</label>
+                        <div class="col-sm-4"> 
+								<select id="unit" name="unit"  class="selectpicker show-tick form-control"> 
+								     	<option value="0" selected="selected">时</option> 
+								     	<option value="1">周</option> 
+								</select>	     
+						</div>
                     </div>
                     
+                   
+
+                    
                       <div class="form-group">	 
                      	<label for="academyid" class="col-sm-2 control-label">所属学院</label>                     
 						 <div class="col-sm-4"> 
diff --git a/WebContent/jsp/QueryCourse.jsp b/WebContent/jsp/QueryCourse.jsp
index cd51700..951738d 100644
--- a/WebContent/jsp/QueryCourse.jsp
+++ b/WebContent/jsp/QueryCourse.jsp
@@ -119,6 +119,7 @@
 	                  <th>课程编码</th>                                    
 	                  <th>理论学时</th>
 	                  <th>实验学时</th>
+	                  <th>实验学时单位</th>
 	                  <th>学分</th>
 	                  <th>开课学院</th>
 	                  <th>操作</th>
@@ -131,7 +132,13 @@
 	                  <td>${course.name }</td>                                
 	                  <td>${course.identifier }</td>                                
 	                  <td>${course.theoretical }</td>                                
-	                  <td>${course.experiement }</td>                                
+	                  <td>${course.experiement }</td> 
+	                  <c:if test="${course.unit == 0}">
+	                  		<td>时</td> 
+	                  	</c:if>
+	                  	<c:if test="${course.unit == 1}">
+	                  		<td>周</td> 
+	                  	</c:if>                            
 	                  <td>${course.score }</td>                                
 	                  <%-- <td>${course.academyid }</td>  --%>
 	                   
@@ -142,10 +149,10 @@
 	                  	<%-- <td>${user.id}</td>  --%>
 	                  </c:forEach>                                        
 	                  <td>
-	                <c:if test="${course.specialityid == specialityid}"> 
+	               <%--  <c:if test="${course.specialityid == specialityid}">  --%>
 	                  		<a href="<%=request.getContextPath()%>/CourseController/toUpdateCourse.action?id=${course.id}">更新</a>
 	                  		<a href="javascript:del(${course.id});">删除</a>
-	                 </c:if> 
+	              <%--    </c:if>  --%>
 	                  </td>
 	                </tr>
 	                </c:forEach>	                
diff --git a/WebContent/jsp/UpdateCourse.jsp b/WebContent/jsp/UpdateCourse.jsp
index 26d4b58..41e2adc 100644
--- a/WebContent/jsp/UpdateCourse.jsp
+++ b/WebContent/jsp/UpdateCourse.jsp
@@ -93,19 +93,31 @@
                     </div>
                     
                     <div class="form-group">
-                        <label for="experiement" class="col-sm-2 control-label">实验学时</label>
+                        <label for="score" class="col-sm-2 control-label">学分</label>
                         <div class="col-sm-10">
-                            <input id="experiement" name="experiement" class="form-control" placeholder="请输入实验学时" datatype="n" value="${course.experiement}"></input>
+                            <input id="score" name="score" class="form-control" placeholder="请输入学分"   datatype="n" value="${course.score}"></input>
                         </div>
                     </div>
                     
+                    
                     <div class="form-group">
-                        <label for="score" class="col-sm-2 control-label">学分</label>
+                        <label for="experiement" class="col-sm-2 control-label">实验学时</label>
                         <div class="col-sm-10">
-                            <input id="score" name="score" class="form-control" placeholder="请输入学分"   datatype="n" value="${course.score}"></input>
+                            <input id="experiement" name="experiement" class="form-control" placeholder="请输入实验学时" datatype="n" value="${course.experiement}"></input>
                         </div>
                     </div>
                     
+                      <div class="form-group">
+                        <label for="unit" class="col-sm-2 control-label">实验学时单位</label>
+                        <div class="col-sm-4"> 
+								<select id="unit" name="unit"  class="selectpicker show-tick form-control"> 
+								     	<option value="0" <c:if test="${course.unit == 0}">selected="selected" </c:if>>时</option> 
+								     	<option value="1" <c:if test="${course.unit == 1}">selected="selected" </c:if> >周</option> 
+								</select>	     
+						</div>
+                    </div>
+                    
+    
                        <div class="form-group">	 
                      	<label for="academyid" class="col-sm-2 control-label">所属学院</label>                     
 						 <div class="col-sm-4"> 
-- 
Gitee


From fb26697cc8d0afb9f42ba75a5cb680f87060ea34 Mon Sep 17 00:00:00 2001
From: ChineseTony <13206573871@163.com>
Date: Wed, 17 Apr 2019 20:26:31 +0800
Subject: [PATCH 2/2] aa

---
 WebContent/jsp/QueryCourse.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebContent/jsp/QueryCourse.jsp b/WebContent/jsp/QueryCourse.jsp
index 951738d..67d736a 100644
--- a/WebContent/jsp/QueryCourse.jsp
+++ b/WebContent/jsp/QueryCourse.jsp
@@ -149,10 +149,10 @@
 	                  	<%-- <td>${user.id}</td>  --%>
 	                  </c:forEach>                                        
 	                  <td>
-	               <%--  <c:if test="${course.specialityid == specialityid}">  --%>
+	                <c:if test="${course.specialityid == specialityid}"> 
 	                  		<a href="<%=request.getContextPath()%>/CourseController/toUpdateCourse.action?id=${course.id}">更新</a>
 	                  		<a href="javascript:del(${course.id});">删除</a>
-	              <%--    </c:if>  --%>
+	               </c:if> 
 	                  </td>
 	                </tr>
 	                </c:forEach>	                
-- 
Gitee