Browse Source

显示优化

shenhao 5 years ago
parent
commit
c172f7c705

+ 1 - 0
src/main/java/com/ssj/sys/controller/SysProblemController.java

@@ -835,6 +835,7 @@ public String updateviplist(Model model,
 		model.addAttribute("search", params);
 		model.addAttribute("grade", sortService.getParamValByCode("grade"));//年级
 		model.addAttribute("zyb_course", sortService.getParamValByCode("zyb_course"));//科目
+		model.addAttribute("version",SystemResourceLocator.getVersionList());
 		return "sys/problem/schoolBanbenlist";
 	}
 

+ 6 - 16
src/main/resources/templates/sys/problem/schoolBanbenlist.html

@@ -75,22 +75,12 @@
 
 				<td th:text="${cnArealist.get('course_name')}"></td>
 				<td th:text="${cnArealist.get('grade')}"></td>
-				<td th:if="${cnArealist.get('course_name') eq '语文'}" th:switch="${cnArealist.get('banben')}">
-					<span th:case=2 >人教(部编)</span>
-				</td>
-				<td th:if="${cnArealist.get('course_name') eq '英语'}" th:switch="${cnArealist.get('banben')}">
-					<span th:case=2 th:if="${cnArealist.get('course_name') eq '英语'}">教科版</span>
-					<span th:case=3 th:if="${cnArealist.get('course_name') eq '英语'}">沪教版(新)</span>
-					<span th:case=4 th:if="${cnArealist.get('course_name') eq '英语'}">人教版</span>
-					<span th:case=5 th:if="${cnArealist.get('course_name') eq '英语'}">剑桥版</span>
-					<span th:case=6 th:if="${cnArealist.get('course_name') eq '英语'}">外研版</span>
-					<span th:case=7 th:if="${cnArealist.get('course_name') eq '英语'}">朗文版</span>
-					<span th:case=8 th:if="${cnArealist.get('course_name') eq '英语'}">人教版(PEP)</span>
-					<span th:case=10 th:if="${cnArealist.get('course_name') eq '英语'}">外研版</span>
-				</td>
-				<td th:if="${cnArealist.get('course_name') eq '数学'}" th:switch="${cnArealist.get('banben')}">
-					<span th:case=1 th:if="${cnArealist.get('course_name') eq '数学'}">北师大</span>
-					<span th:case=2 th:if="${cnArealist.get('course_name') eq '数学'}">人教版</span>
+				<td>
+					<div th:remove="tag" th:each="map:${version}">
+						<div th:remove="tag" th:each="item:${map.value}">
+							<span th:if="${cnArealist.get('course_name') eq item.courseName && cnArealist.get('banben') == item.versionType}" th:text="${item.versionName}"></span>
+						</div>
+					</div>
 				</td>
 				<td>
 					<a href="javascript:void(0)" th:onclick="'knowHowAdd(\''+${cnArealist.get('id')}+'\')'"  class="tablelink" >修改</a>