From a265fc242e5d4b8e49663a41cdb07ad0b6aadea4 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Sat, 17 Nov 2018 13:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/tamguo/web/BookController.java   |  2 +-
 .../main/resources/templates/book/book.html   | 31 +++++++++++--------
 .../resources/templates/book/document.html    | 12 +++----
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/tamguo-bms/src/main/java/com/tamguo/web/BookController.java b/tamguo-bms/src/main/java/com/tamguo/web/BookController.java
index 420eea3..07b90ed 100644
--- a/tamguo-bms/src/main/java/com/tamguo/web/BookController.java
+++ b/tamguo-bms/src/main/java/com/tamguo/web/BookController.java
@@ -59,7 +59,7 @@ public class BookController {
 		return model;
 	}
 	
-	@RequestMapping(value="document/{id}" , method=RequestMethod.POST)
+	@RequestMapping(value="document/{id}.html" , method=RequestMethod.POST)
 	@ResponseBody
 	public Result getDocument(@PathVariable String id) {
 		try {
diff --git a/tamguo-bms/src/main/resources/templates/book/book.html b/tamguo-bms/src/main/resources/templates/book/book.html
index cfd5cae..b1b1f5f 100644
--- a/tamguo-bms/src/main/resources/templates/book/book.html
+++ b/tamguo-bms/src/main/resources/templates/book/book.html
@@ -79,22 +79,27 @@
                         <div class="catalog-list read-book-preview" id="sidebar">
                         	<ul th:if="${doc.parentId} eq '0'" th:each="doc,status:${documentList}">
                         		<li th:id="${doc.id}">
-                        			<a th:href="${domainName + 'document/' + doc.id}" th:title="${doc.id}" th:text="${doc.name}">测试项目类型</a>
-                        			<ul>
-                        				<li th:id="${d.id}" th:each="d,status:${documentList}">
-                        					<a th:href="${domainName + 'document/' + d.id }" th:title="${d.id}" th:text="${d.name}" th:class="${d.id == document.id ? 'jstree-clicked' : ''}">普通文档类型</a>
-                        					<!-- <ul>
-		                        				<li th:id="${dd.id}" th:each="dd,status:${d.children}">
-		                        					<a th:href="${domainName + 'document/' + dd.id + '.html'}" th:title="${dd.id}" data-version="1541647449" th:text="${dd.name}" th:class="${dd.id == document.id ? 'jstree-clicked' : ''}">普通文档类型</a>
+                        			<a th:href="${domainName + 'document/' + doc.id + '.html'}" th:title="${doc.id}" th:text="${doc.name}">测试项目类型</a>
+                        			<ul th:if="${doc.parentId} eq '0'" th:each="doc,status:${documentList}">
+		                        		<li th:id="${doc.id}">
+		                        			<a th:href="${domainName + 'document/' + doc.id + '.html'}" th:title="${doc.id}" th:text="${doc.name}">测试项目类型</a>
+		                        			<ul>
+		                        				<li th:if="${d.parentId == doc.id}" th:id="${d.id}" th:each="d,status:${documentList}">
+		                        					<a th:href="${domainName + 'document/' + d.id + '.html'}" th:title="${d.id}" th:text="${d.name}" th:class="${d.id == document.id ? 'jstree-clicked' : ''}">普通文档类型</a>
 		                        					<ul>
-				                        				<li th:id="${ddd.id}" th:each="ddd,status:${dd.children}">
-				                        					<a th:href="${domainName + 'document/' + ddd.id + '.html'}" th:title="${ddd.id}" data-version="1541647449" th:text="${ddd.name}" th:class="${ddd.id == document.id ? 'jstree-clicked' : ''}" >普通文档类型</a>
+				                        				<li th:if="${d.parentId == dd.id}" th:id="${dd.id}" th:each="dd,status:${d.children}">
+				                        					<a th:href="${domainName + 'document/' + dd.id + '.html'}" th:title="${dd.id}" data-version="1541647449" th:text="${dd.name}" th:class="${dd.id == document.id ? 'jstree-clicked' : ''}">普通文档类型</a>
+				                        					<ul>
+						                        				<li th:if="${dd.parentId == ddd.id}" th:id="${ddd.id}" th:each="ddd,status:${dd.children}">
+						                        					<a th:href="${domainName + 'document/' + ddd.id + '.html'}" th:title="${ddd.id}" data-version="1541647449" th:text="${ddd.name}" th:class="${ddd.id == document.id ? 'jstree-clicked' : ''}" >普通文档类型</a>
+						                        				</li>
+						                        			</ul>
 				                        				</li>
 				                        			</ul>
 		                        				</li>
-		                        			</ul> -->
-                        				</li>
-                        			</ul>
+		                        			</ul>
+		                        		</li>
+		                        	</ul>
                         		</li>
                         	</ul>
                         </div>
@@ -235,7 +240,7 @@
 $(function () {
     $("#searchList").on("click","a",function () {
         var id = $(this).attr("data-id");
-        var url = "[[${domainName}]]" + "/document/[[${book.id}]]";
+        var url = "[[${domainName}]]" + "/document/[[${book.id}]].html";
         $(this).parent("li").siblings().find("a").removeClass("active");
         $(this).addClass("active");
         loadDocument(url,id,function (body) {
diff --git a/tamguo-bms/src/main/resources/templates/book/document.html b/tamguo-bms/src/main/resources/templates/book/document.html
index 97ca209..aaae9b1 100644
--- a/tamguo-bms/src/main/resources/templates/book/document.html
+++ b/tamguo-bms/src/main/resources/templates/book/document.html
@@ -79,20 +79,20 @@
                         <div class="catalog-list read-book-preview" id="sidebar">
                         	<ul th:if="${doc.parentId} eq '0'" th:each="doc,status:${documentList}">
                         		<li th:id="${doc.id}">
-                        			<a th:href="${domainName + 'document/' + doc.id}" th:title="${doc.id}" th:text="${doc.name}">测试项目类型</a>
+                        			<a th:href="${domainName + 'document/' + doc.id + '.html'}" th:title="${doc.id}" th:text="${doc.name}">测试项目类型</a>
                         			<ul>
                         				<li th:if="${d.parentId == doc.id}" th:id="${d.id}" th:each="d,status:${documentList}">
-                        					<a th:href="${domainName + 'document/' + d.id}" th:title="${d.id}" th:text="${d.name}" th:class="${d.id == document.id ? 'jstree-clicked' : ''}">普通文档类型</a>
-                        					<!-- <ul>
-		                        				<li th:id="${dd.id}" th:each="dd,status:${d.children}">
+                        					<a th:href="${domainName + 'document/' + d.id + '.html'}" th:title="${d.id}" th:text="${d.name}" th:class="${d.id == document.id ? 'jstree-clicked' : ''}">普通文档类型</a>
+                        					<ul>
+		                        				<li th:if="${d.parentId == dd.id}" th:id="${dd.id}" th:each="dd,status:${d.children}">
 		                        					<a th:href="${domainName + 'document/' + dd.id + '.html'}" th:title="${dd.id}" data-version="1541647449" th:text="${dd.name}" th:class="${dd.id == document.id ? 'jstree-clicked' : ''}">普通文档类型</a>
 		                        					<ul>
-				                        				<li th:id="${ddd.id}" th:each="ddd,status:${dd.children}">
+				                        				<li th:if="${dd.parentId == ddd.id}" th:id="${ddd.id}" th:each="ddd,status:${dd.children}">
 				                        					<a th:href="${domainName + 'document/' + ddd.id + '.html'}" th:title="${ddd.id}" data-version="1541647449" th:text="${ddd.name}" th:class="${ddd.id == document.id ? 'jstree-clicked' : ''}" >普通文档类型</a>
 				                        				</li>
 				                        			</ul>
 		                        				</li>
-		                        			</ul> -->
+		                        			</ul>
                         				</li>
                         			</ul>
                         		</li>