4 vuotta sitten · 91bb775d7c
--- a/src/main/java/com/zglc/fm/schedule/ScheduleTasks.java
+++ b/src/main/java/com/zglc/fm/schedule/ScheduleTasks.java
@@ -172,6 +172,7 @@ public class ScheduleTasks {
 
				                 BookEntity book = new BookEntity();
			
 
				                 book.setBook_name(name);
			
 
				                 book.setFile_path(filePath);
			
 
				+                book.setIs_catalogue(0);
			
 
				                 SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
			
 
				                 book.setInput_time(date.format(new Date()));
			
 
				                 bookService.add(book);
			
--- a/src/main/java/com/zglc/fm/service/BookService.java
+++ b/src/main/java/com/zglc/fm/service/BookService.java
@@ -41,6 +41,7 @@ public class BookService {
 
				 
			
 
				     public Result<String> add(BookEntity data) {
			
 
				         data.setId(null);
			
 
				+//        data.setIs_catalogue(0);
			
 
				         boolean flag = true;
			
 
				         String msg = "";
			
 
				         int index = bookDao.insertSelective(data);
			
@@ -147,7 +148,7 @@ public class BookService {
 
				         String msg = "";
			
 
				         boolean flag = true;
			
 
				         BookEntity tmpData = bookDao.selectByPrimaryKey(id);
			
 
				-        List<CatalogueEntity> lst = DocToPdf.GetDoccatalogue(tmpData.getFile_path(),id);
			
 
				+        List<CatalogueEntity> lst = DocToPdf.GetDoccatalogue("d:\\"+tmpData.getFile_path(),id);
			
 
				         for (CatalogueEntity lsttmp : lst) {
			
 
				             int index = catalogueDao.insertSelective(lsttmp);
			
 
				             if (index == 0) {
			
--- a/src/main/resources/static/admin/UbookSee.html
+++ b/src/main/resources/static/admin/UbookSee.html
@@ -22,18 +22,19 @@
 
				     #box {
			
 
				         position: absolute;
			
 
				         top: 0%;
			
 
				-        width: 70%;
			
 
				+        width: 60%;
			
 
				         height: 97%;
			
 
				         border: 1px solid #000000;
			
 
				         left: 0%;
			
 
				     }
			
 
				     
			
 
				     #book {
			
 
				+        margin-top: -35px;
			
 
				         position: absolute;
			
 
				         top: 3%;
			
 
				-        left: 76%;
			
 
				-        width: 21%;
			
 
				-        height: 30%;
			
 
				+        left: 66%;
			
 
				+        width: 16%;
			
 
				+        height: 100%;
			
 
				     }
			
 
				     
			
 
				     #outFaultList {
			
@@ -62,11 +63,6 @@
 
				         background-color: #eee;
			
 
				     }
			
 
				     
			
 
				-    .layui-table-view {
			
 
				-        height: 248px!important;
			
 
				-        border-color: #e6e6e6;
			
 
				-    }
			
 
				-    
			
 
				     .layui-table-main {
			
 
				         height: 18%!important;
			
 
				     }
			
@@ -79,18 +75,38 @@
 
				                 <div>
			
 
				                     .<iframe id="box" src=""></iframe>
			
 
				                 </div>
			
 
				-            </div>
			
 
				-            <div id="book">
			
 
				-                <table id="bookFaultList" class="layui-table" lay-filter="bookFaultList" lay-data="{id:'bookFaultList'}">
			
 
				+                <div id="book">
			
 
				+                    <table id="bookFaultList" class="layui-table" lay-filter="bookFaultList" lay-data="{id:'bookFaultList'}">
			
 
				 
			
 
				-                </table>
			
 
				-            </div>
			
 
				-            <div class="search">
			
 
				-                <table id="FaultList" class="layui-table" lay-filter="FaultList" lay-data="{id:'FaultList'}">
			
 
				-                </table>
			
 
				+                    </table>
			
 
				+                </div>
			
 
				             </div>
			
 
				+
			
 
				+
			
 
				         </form>
			
 
				     </div>
			
 
				+    <script type="text/html" id="typeTpl">
			
 
				+        <a target="_blank " href="Ubookfault.html"> {{d.fault_name}}</a>
			
 
				+
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        $(function() {
			
 
				+            var params = window.location.href.split("?");
			
 
				+            var filePath;
			
 
				+            var pageNum;
			
 
				+            if (params.length > 1) {
			
 
				+                values = params[1].split("&");
			
 
				+                if (values.length > 1) {
			
 
				+                    filePath = values[0].replace("file_path=", "");
			
 
				+                    pageNum = values[1].replace("page=", "");
			
 
				+                }
			
 
				+            }
			
 
				+            if (filePath !== '') {
			
 
				+                $("#box").attr('src', "../other/pdfjs/web/viewer.html?file=" + urlBase + filePath + "&page=" + pageNum + "&top=150&zoom=1.5");
			
 
				+            }
			
 
				+
			
 
				+        });
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/admin/Ubookfault.html
+++ b/src/main/resources/static/admin/Ubookfault.html
@@ -0,0 +1,77 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="zh-cmn-Hans">
			
 
				+
			
 
				+<head>
			
 
				+    <meta charset="UTF-8">
			
 
				+    <title>维修保障故障资源平台</title>
			
 
				+    <meta name="renderer" content="webkit">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				+    <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8">
			
 
				+    <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
			
 
				+    <link rel="stylesheet" href="./css/font.css">
			
 
				+    <link rel="stylesheet" href="./css/xadmin.css">
			
 
				+    <script src="./lib/jquery.min.js"></script>
			
 
				+    <script src="./lib/layui/layui.js" charset="utf-8"></script>
			
 
				+    <script src="./js/xadmin.js"></script>
			
 
				+    <script src="../other/js/functions.js"></script>
			
 
				+    <style>
			
 
				+        #box {
			
 
				+            position: absolute;
			
 
				+            top: 0;
			
 
				+            left: 0;
			
 
				+            width: 97%;
			
 
				+            height: 700px!important;
			
 
				+        }
			
 
				+    </style>
			
 
				+</head>
			
 
				+
			
 
				+<body>
			
 
				+
			
 
				+    <div class="x-body layui-anim layui-anim-up">
			
 
				+        <form class="layui-form">
			
 
				+            .<iframe id="box" src=""></iframe>
			
 
				+        </form>
			
 
				+    </div>
			
 
				+</body>
			
 
				+
			
 
				+<script>
			
 
				+    $(function() {
			
 
				+        var params = window.location.href.split("?");
			
 
				+        if (params.length > 1) {
			
 
				+            values = params[1].split("&");
			
 
				+            if (values.length > 13) {
			
 
				+                var funcId = values[0].replace("id=", "");
			
 
				+
			
 
				+                var funcfile_path = "";
			
 
				+
			
 
				+                if (funcId !== "0") {
			
 
				+
			
 
				+                    funcfile_path = decodeURI(values[8].replace("file_path=", ""));
			
 
				+
			
 
				+                }
			
 
				+            }
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        $("#file_path").val(funcfile_path);
			
 
				+        $("#box").attr('src', urlBase + funcfile_path);
			
 
				+
			
 
				+
			
 
				+
			
 
				+        layui.use("form", function() {
			
 
				+            layui.form.render();
			
 
				+        });
			
 
				+
			
 
				+        layui.use(["form", "layer", ], function() {
			
 
				+            $ = layui.jquery;
			
 
				+            var form = layui.form;
			
 
				+            var layer = layui.layer;
			
 
				+
			
 
				+
			
 
				+        });
			
 
				+
			
 
				+    });
			
 
				+</script>
			
 
				+</script>
			
 
				+
			
 
				+</html>
			
--- a/src/main/resources/static/admin/Ubookshow.html
+++ b/src/main/resources/static/admin/Ubookshow.html
@@ -0,0 +1,87 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="zh-cmn-Hans">
			
 
				+
			
 
				+<head>
			
 
				+    <meta charset="UTF-8">
			
 
				+    <title>外场维修保障故障资源平台</title>
			
 
				+    <meta name="renderer" content="webkit">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				+    <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8">
			
 
				+    <link rel="stylesheet" href="./lib/layui/css/layui.css">
			
 
				+    <link rel="stylesheet" href="./css/font.css">
			
 
				+    <link rel="stylesheet" href="./css/xadmin.css">
			
 
				+    <script src="./lib/jquery.min.js"></script>
			
 
				+    <script src="./lib/layui/layui.js" charset="utf-8"></script>
			
 
				+    <script src="./js/xadmin.js"></script>
			
 
				+    <script src="../other/js/functions.js"></script>
			
 
				+    <script src="./js/Ubookshow.js"></script>
			
 
				+    <style>
			
 
				+        .x-body {
			
 
				+            width: 100%;
			
 
				+            height: 100%;
			
 
				+        }
			
 
				+        
			
 
				+        .search {
			
 
				+            margin-top: -20px;
			
 
				+            width: 300px;
			
 
				+            height: 100%;
			
 
				+            float: right;
			
 
				+            margin-right: 100px
			
 
				+        }
			
 
				+        /* #realName {
			
 
				+            display: inline-block;
			
 
				+            width: 300px;
			
 
				+            height: 40px;
			
 
				+        } */
			
 
				+        
			
 
				+        .layui-table-view {
			
 
				+            height: 380px;
			
 
				+            /* width: 800px; */
			
 
				+            border-color: #e6e6e6;
			
 
				+            float: left;
			
 
				+        }
			
 
				+        /* .layui-border-box {
			
 
				+            height: 413px!important;
			
 
				+        }
			
 
				+        
			
 
				+        .layui-table-body {
			
 
				+            height: 385px!important;
			
 
				+        } */
			
 
				+    </style>
			
 
				+</head>
			
 
				+
			
 
				+<body class="layui-anim layui-anim-up">
			
 
				+
			
 
				+    <div class="x-body">
			
 
				+        <!-- <form class="layui-form">
			
 
				+
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 1246px;height: 36px;'>
			
 
				+                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                  <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="first.html" title="退出">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe65c;</i>返回
			
 
				+            </a>
			
 
				+        </form> -->
			
 
				+        <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				+        </table>
			
 
				+        <!-- <div id="pagination"></div> -->
			
 
				+        <script type="text/html" id="operationToolbar">
			
 
				+            <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
			
 
				+
			
 
				+        </script>
			
 
				+        <div class="search">
			
 
				+            <table id="FaultList" class="layui-table" lay-filter="FaultList" lay-data="{id:'FaultList'}" style="width: 200px!important;">
			
 
				+            </table>
			
 
				+        </div>
			
 
				+
			
 
				+    </div>
			
 
				+    <script type="text/html" id="typeTpl">
			
 
				+        <a target="_blank " href="Ubooktext.html"> {{d.book_name}}</a>
			
 
				+
			
 
				+    </script>
			
 
				+</body>
			
 
				+
			
 
				+</html>
			
--- a/src/main/resources/static/admin/Ubooktext.html
+++ b/src/main/resources/static/admin/Ubooktext.html
@@ -0,0 +1,86 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="zh-cmn-Hans">
			
 
				+
			
 
				+<head>
			
 
				+    <meta charset="UTF-8">
			
 
				+    <title>维修保障故障资源平台</title>
			
 
				+    <meta name="renderer" content="webkit">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				+    <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8">
			
 
				+    <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
			
 
				+    <link rel="stylesheet" href="./css/font.css">
			
 
				+    <link rel="stylesheet" href="./css/xadmin.css">
			
 
				+    <script src="./lib/jquery.min.js"></script>
			
 
				+    <script src="./lib/layui/layui.js" charset="utf-8"></script>
			
 
				+    <script src="./js/xadmin.js"></script>
			
 
				+    <script src="../other/js/functions.js"></script>
			
 
				+    <style>
			
 
				+        #box {
			
 
				+            position: absolute;
			
 
				+            top: 0;
			
 
				+            left: 0;
			
 
				+            width: 97%;
			
 
				+            height: 700px!important;
			
 
				+        }
			
 
				+    </style>
			
 
				+</head>
			
 
				+
			
 
				+<body>
			
 
				+
			
 
				+    <div class="x-body layui-anim layui-anim-up">
			
 
				+        <form class="layui-form">
			
 
				+            .<iframe id="box" src=""></iframe>
			
 
				+        </form>
			
 
				+    </div>
			
 
				+</body>
			
 
				+
			
 
				+<script>
			
 
				+    $(function() {
			
 
				+        var params = window.location.href.split("?");
			
 
				+        if (params.length > 1) {
			
 
				+            values = params[1].split("&");
			
 
				+            if (values.length > 13) {
			
 
				+                var funcId = values[0].replace("id=", "");
			
 
				+
			
 
				+                var funcfile_path = "";
			
 
				+
			
 
				+                if (funcId !== "0") {
			
 
				+
			
 
				+                    funcfile_path = decodeURI(values[8].replace("file_path=", ""));
			
 
				+
			
 
				+                }
			
 
				+            }
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        var url = sessionStorage.getItem('url');
			
 
				+        var newurl = url.substr(1, url.length);
			
 
				+        //截取到source/16081801024792. pdf
			
 
				+        url = newurl.substr(newurl.indexOf('\\') + 1, url.length);
			
 
				+        // 截取到文件16081801024792
			
 
				+        newurl = url.substr(0, url.indexOf('.'))
			
 
				+            // urlBase:http://127.0.0.1:11083/+16081801024792+.pdf
			
 
				+        newurl = urlBase + "source\\" + newurl + ".pdf";
			
 
				+        console.log(newurl)
			
 
				+        $("#newurl").val(funcfile_path);
			
 
				+        $("#box").attr('src', urlBase + funcfile_path);
			
 
				+
			
 
				+
			
 
				+
			
 
				+        layui.use("form", function() {
			
 
				+            layui.form.render();
			
 
				+        });
			
 
				+
			
 
				+        layui.use(["form", "layer", ], function() {
			
 
				+            $ = layui.jquery;
			
 
				+            var form = layui.form;
			
 
				+            var layer = layui.layer;
			
 
				+
			
 
				+
			
 
				+        });
			
 
				+
			
 
				+    });
			
 
				+</script>
			
 
				+</script>
			
 
				+
			
 
				+</html>
			
--- a/src/main/resources/static/admin/Uoutline-edit.html
+++ b/src/main/resources/static/admin/Uoutline-edit.html
@@ -37,19 +37,17 @@
 
				 
			
 
				 <script>
			
 
				     $(function() {
			
 
				+        let funcfile_path = '';
			
 
				         var params = window.location.href.split("?");
			
 
				-        var filePath ;
			
 
				-        var pageNum;
			
 
				         if (params.length > 1) {
			
 
				-            values = params[1].split("&");
			
 
				-            if (values.length > 1) {
			
 
				-                filePath = values[0].replace("file_path=", "");
			
 
				-                pageNum = values[1].replace("page=", "");
			
 
				+            values = params[1].split("=");
			
 
				+            if (values[1].length > 13) {
			
 
				+                funcfile_path = decodeURI(values[1]);
			
 
				             }
			
 
				         }
			
 
				-        if (filePath !== '')
			
 
				+        if (funcfile_path !== '')
			
 
				         {
			
 
				-            $("#box").attr('src',"../other/pdfjs/web/viewer.html?file=" + urlBase+ filePath+"&page="+pageNum+"&top=150&zoom=1.5");
			
 
				+            $("#box").attr('src',"../other/pdfjs/web/viewer.html?file=" + urlBase+ funcfile_path+"&page=12&top=150&zoom=1.5");
			
 
				         }
			
 
				 
			
 
				     });
			
--- a/src/main/resources/static/admin/js/Ubook.js
+++ b/src/main/resources/static/admin/js/Ubook.js
@@ -74,7 +74,6 @@ $(function() {
 
				                             });
			
 
				                         }
			
 
				 
			
 
				-                        console.log(data.data.list[1].id)
			
 
				                         tableOption.data = data.data.list;
			
 
				 
			
 
				                         table.render(tableOption);
			
@@ -103,7 +102,6 @@ $(function() {
 
				                         }
			
 
				 
			
 
				                         tableOption.data = data.data;
			
 
				-                        // console.log(data.data)
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
@@ -137,12 +135,11 @@ $(function() {
 
				         // 监听表内工具条
			
 
				         table.on("tool(outLineList)", function(obj) {
			
 
				             var data = obj.data;
			
 
				-            console.log(data)
			
 
				             if (obj.event === "edit") {
			
 
				                 x_admin_show(
			
 
				                     "在线预览",
			
 
				                     encodeURI(
			
 
				-                        "../admin/UbookSee.html?bookName=" + data.book_name + "&file_path=" + data.file_path + "&id=" + data.id + "&chapter=" + data.chapter
			
 
				+                        "../admin/Ubookshow.html?bookName=" + data.book_name + "&file_path=" + data.file_path + "&id=" + data.id
			
 
				                     ),
			
 
				                     1400,
			
 
				                     700,
			
@@ -153,10 +150,10 @@ $(function() {
 
				                 var data = obj.data.file_path;
			
 
				 
			
 
				                 file = urlBase + data
			
 
				-                    // console.log(flie)
			
 
				                 sessionStorage.setItem("url", file)
			
 
				-
			
 
				-
			
 
				+				
			
 
				+				var book_name = obj.data.book_name
			
 
				+				sessionStorage.setItem("book_name", book_name)
			
 
				             }
			
 
				 
			
 
				         });
			
--- a/src/main/resources/static/admin/js/UbookSee.js
+++ b/src/main/resources/static/admin/js/UbookSee.js
@@ -16,9 +16,6 @@ $(function() {
 
				     }
			
 
				 
			
 
				     // word转换成pdf
			
 
				-    $("#file_path").val(funcfile_path);
			
 
				-
			
 
				-    $("#box").attr('src', urlBase + funcfile_path);
			
 
				     var url = sessionStorage.getItem('url');
			
 
				     var newurl = url.substr(1, url.length);
			
 
				     //截取到source/16081801024792. pdf
			
@@ -28,9 +25,9 @@ $(function() {
 
				         // urlBase:http://127.0.0.1:11083/+16081801024792+.pdf
			
 
				     newurl = urlBase + "source\\" + newurl + ".pdf";
			
 
				     console.log(newurl)
			
 
				-    window.location.href = newurl
			
 
				-
			
 
				-
			
 
				+    $("#newurl").val(funcfile_path);
			
 
				+    $("#box").attr('src', urlBase + funcfile_path);
			
 
				+    // window.location.href = newurl
			
 
				     layui.use("form", function() {
			
 
				         layui.form.render();
			
 
				     });
			
@@ -39,123 +36,23 @@ $(function() {
 
				         $ = layui.jquery;
			
 
				         var form = layui.form;
			
 
				         var layer = layui.layer;
			
 
				-
			
 
				-
			
 
				-    });
			
 
				-    // 拿到每条数据的data.data.list.id传给目录bookId参数
			
 
				-    // 解析目录
			
 
				-    var catalogue = window.location.href.split("=")[3];
			
 
				-    console.log(catalogue)
			
 
				-
			
 
				-    const data = {
			
 
				-        bookId: catalogue,
			
 
				-    };
			
 
				-    $.ajax({
			
 
				-        type: "get",
			
 
				-        url: "api/book/listAllDoccatalogue",
			
 
				-        async: true,
			
 
				-        data: data,
			
 
				-        headers: {
			
 
				-            token: sessionStorage.getItem('token')
			
 
				-        },
			
 
				-        success: function(data) {
			
 
				-            // console.log(data)
			
 
				-            let str = "";
			
 
				-            // 拿到数据
			
 
				-            var page_num = '';
			
 
				-            var contents = "";
			
 
				-
			
 
				-            page_num = data.page_num;
			
 
				-            contents = data.contents;
			
 
				-            // 内容跳转
			
 
				-            str +=
			
 
				-                '<li class="search-data-item"><a href=javascript:>' +
			
 
				-                page_num + '</a><p>' + contents +
			
 
				-                '</p>  </li>'
			
 
				-
			
 
				-
			
 
				-        },
			
 
				-        error: xhr => {
			
 
				-            // console.log(xhr)
			
 
				-        }
			
 
				     });
			
 
				 
			
 
				-});
			
 
				 
			
 
				-//相关的书信息
			
 
				-$(function() {
			
 
				-        var params = window.location.href.split("?")[1];
			
 
				-        var bookName = params.trim().slice(9)
			
 
				-        var defaultPage = 0;
			
 
				-        var defaultSize = 10;
			
 
				-        var currentPage = defaultPage;
			
 
				-        var currentSize = defaultSize;
			
 
				-        var tableFirstLoad = true;
			
 
				-        layui.use(["form", "table", "laypage", "layer"], function() {
			
 
				-            var table = layui.table;
			
 
				-            var laypage = layui.laypage;
			
 
				-            var layer = layui.layer;
			
 
				-
			
 
				-            function loadAirList(page, size) {
			
 
				-                if (page === null || page === undefined) page = defaultPage;
			
 
				-                if (size === null || size === undefined) size = defaultSize;
			
 
				-
			
 
				-                var tableOption = {
			
 
				-                    elem: "#FaultList",
			
 
				-                    height: "full-81",
			
 
				-                    limit: size,
			
 
				-                    cols: [
			
 
				-                        [{
			
 
				-                                field: "book_name",
			
 
				-                                title: "相关的书信息",
			
 
				-                                // templet: '#typeTpl',
			
 
				-                                align: "left"
			
 
				-                            },
			
 
				-
			
 
				-                        ]
			
 
				-                    ]
			
 
				-                };
			
 
				-                var searchTitle = bookName;
			
 
				-                var url = "api/book/relevantBook?bookName=" + searchTitle + "&page=" + (page + 1) + "&size=" + size;
			
 
				-                fetchJSON(url, {}, "get", function(data) {
			
 
				-                    if (data.status === 0) {
			
 
				-                        if (tableFirstLoad) {
			
 
				-                            tableFirstLoad = false;
			
 
				-                            laypage.render({
			
 
				-                                curr: page + 1,
			
 
				-                                elem: "pagination",
			
 
				-                                count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				-                                jump: function(obj, first) {
			
 
				-                                    if (first) return;
			
 
				-                                    currentPage = obj.curr - 1;
			
 
				-                                    currentSize = obj.limit;
			
 
				-                                    loadAirList(currentPage, currentSize);
			
 
				-                                }
			
 
				-                            });
			
 
				-                        }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data.list;
			
 
				-                        table.render(tableOption);
			
 
				-                    } else {
			
 
				-                        showMsg(data.msg, 2, 2000);
			
 
				-                    }
			
 
				-                });
			
 
				 
			
 
				+});
			
 
				 
			
 
				 
			
 
				-            }
			
 
				-            loadAirList();
			
 
				-        })
			
 
				-    })
			
 
				+var params = window.location.href.split("?");
			
 
				+console.log(params)
			
 
				+var values = params[1].split("&");
			
 
				+console.log(values)
			
 
				+var contents = values[3].replace("contents=", "");
			
 
				+console.log(contents)
			
 
				+var book_name = sessionStorage.getItem('book_name')
			
 
				+console.log(book_name)
			
 
				     //案例
			
 
				 $(function() {
			
 
				-    var params = window.location.href.split("?")[1];
			
 
				-    console.log(params);
			
 
				-    var bookName = params.trim().slice(9)
			
 
				-    console.log(bookName);
			
 
				-    var chapter = window.location.href.split("=")[4];
			
 
				-    console.log(chapter);
			
 
				     var defaultPage = 0;
			
 
				     var defaultSize = 10;
			
 
				     var currentPage = defaultPage;
			
@@ -185,9 +82,7 @@ $(function() {
 
				                     ]
			
 
				                 ]
			
 
				             };
			
 
				-            var searchTitle = bookName;
			
 
				-            var chapter = chapter;
			
 
				-            var url = "api/book/relevantFault?bookName=" + searchTitle + "&chapter=" + chapter + "&page=" + (page + 1) + "&size=" + size;
			
 
				+            var url = "api/book/relevantFault?bookName=" + book_name + "&chapter=" + contents + "&page=" + (page + 1) + "&size=" + size;
			
 
				             fetchJSON(url, {}, "get", function(data) {
			
 
				                 if (data.status === 0) {
			
 
				                     if (tableFirstLoad) {
			
@@ -205,8 +100,9 @@ $(function() {
 
				                             }
			
 
				                         });
			
 
				                     }
			
 
				-                    // console.log(data.data)
			
 
				+
			
 
				                     tableOption.data = data.data.list;
			
 
				+                    // console.log(data.data)
			
 
				                     table.render(tableOption);
			
 
				                 } else {
			
 
				                     showMsg(data.msg, 2, 2000);
			
--- a/src/main/resources/static/admin/js/Ubookshow.js
+++ b/src/main/resources/static/admin/js/Ubookshow.js
@@ -0,0 +1,166 @@
 
				+ $(function() {
			
 
				+     var defaultPage = 0;
			
 
				+     var defaultSize = 10;
			
 
				+     var currentPage = defaultPage;
			
 
				+     var currentSize = defaultSize;
			
 
				+     var tableFirstLoad = true;
			
 
				+
			
 
				+     layui.use(["form", "table", "laypage", "layer"], function() {
			
 
				+         var table = layui.table;
			
 
				+         var laypage = layui.laypage;
			
 
				+         var layer = layui.layer;
			
 
				+         var title = $("#realName");
			
 
				+         var searchTitleKey = "";
			
 
				+
			
 
				+         function loadoutLineList(page, size, searchTitle) {
			
 
				+             if (page === null || page === undefined) page = defaultPage;
			
 
				+             if (size === null || size === undefined) size = defaultSize;
			
 
				+             var tableOption = {
			
 
				+                 elem: "#outLineList",
			
 
				+                 height: "full-81",
			
 
				+                 limit: size,
			
 
				+                 cols: [
			
 
				+                     [{
			
 
				+                             //field: "outline_name",
			
 
				+                             field: "contents",
			
 
				+                             title: "目录",
			
 
				+                             width: 597,
			
 
				+                             align: "center"
			
 
				+                         },
			
 
				+                         {
			
 
				+
			
 
				+                             field: "page_num",
			
 
				+                             title: "大纲名称",
			
 
				+                             align: "center",
			
 
				+                             hide: true
			
 
				+                         },
			
 
				+                         {
			
 
				+                             fixed: "right",
			
 
				+                             width: 200,
			
 
				+                             title: "操作",
			
 
				+                             toolbar: "#operationToolbar",
			
 
				+                             align: "center"
			
 
				+                         }
			
 
				+                     ]
			
 
				+                 ]
			
 
				+             };
			
 
				+             var catalogue = window.location.href.split("=")[3];
			
 
				+
			
 
				+             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				+                 // fetchJSON("api/outline/listpage?page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				+                 fetchJSON("api/book/listAllDoccatalogue?bookId=" + catalogue, {}, "get", function(
			
 
				+                     data) {
			
 
				+                     if (data.status === 0) {
			
 
				+
			
 
				+
			
 
				+                         tableOption.data = data.data;
			
 
				+                         table.render(tableOption);
			
 
				+                     } else {
			
 
				+                         showMsg(data.msg, 2, 2000);
			
 
				+                     }
			
 
				+                 });
			
 
				+             }
			
 
				+
			
 
				+
			
 
				+         }
			
 
				+
			
 
				+         loadoutLineList();
			
 
				+         // 监听表内工具条
			
 
				+         table.on("tool(outLineList)", function(obj) {
			
 
				+             var data = obj.data;
			
 
				+
			
 
				+             if (obj.event === "edit") {
			
 
				+                 x_admin_show(
			
 
				+                     "在线查看",
			
 
				+                     encodeURI(
			
 
				+                         "../admin/UbooKSee.html?file_path=" +
			
 
				+                         data.file_path + "&page=" + data.page_num +
			
 
				+                         "&book_id=" + data.book_id + "&contents=" + data.contents
			
 
				+                     ),
			
 
				+                     1300,
			
 
				+                     600,
			
 
				+                     function() {
			
 
				+                         loadoutLineList(currentPage, currentSize);
			
 
				+                     }
			
 
				+                 );
			
 
				+                 var data = obj.data.file_path;
			
 
				+
			
 
				+                 file = urlBase + data
			
 
				+                 sessionStorage.setItem("url", file)
			
 
				+             }
			
 
				+         });
			
 
				+
			
 
				+
			
 
				+
			
 
				+     });
			
 
				+ });
			
 
				+ // 相关书籍
			
 
				+ $(function() {
			
 
				+     var params = window.location.href.split("?")[1];
			
 
				+     var bookName = params.trim().slice(9)
			
 
				+     var url = bookName.indexOf("&")
			
 
				+     var book = bookName.slice(0, url)
			
 
				+     var defaultPage = 0;
			
 
				+     var defaultSize = 10;
			
 
				+     var currentPage = defaultPage;
			
 
				+     var currentSize = defaultSize;
			
 
				+     var tableFirstLoad = true;
			
 
				+     layui.use(["form", "table", "laypage", "layer"], function() {
			
 
				+         var table = layui.table;
			
 
				+         var laypage = layui.laypage;
			
 
				+         var layer = layui.layer;
			
 
				+
			
 
				+         function loadAirList(page, size) {
			
 
				+             if (page === null || page === undefined) page = defaultPage;
			
 
				+             if (size === null || size === undefined) size = defaultSize;
			
 
				+
			
 
				+             var tableOption = {
			
 
				+                 elem: "#FaultList",
			
 
				+                 height: "full-81",
			
 
				+                 limit: size,
			
 
				+                 cols: [
			
 
				+                     [{
			
 
				+                             field: "book_name",
			
 
				+                             title: "相关的书信息",
			
 
				+                             templet: '#typeTpl',
			
 
				+                             align: "left"
			
 
				+                         },
			
 
				+
			
 
				+                     ]
			
 
				+                 ]
			
 
				+             };
			
 
				+             var searchTitle = book;
			
 
				+             var url = "api/book/relevantBook?bookName=" + searchTitle + "&page=" + (page + 1) +
			
 
				+                 "&size=" + size;
			
 
				+             fetchJSON(url, {}, "get", function(data) {
			
 
				+                 if (data.status === 0) {
			
 
				+                     if (tableFirstLoad) {
			
 
				+                         tableFirstLoad = false;
			
 
				+                         laypage.render({
			
 
				+                             curr: page + 1,
			
 
				+                             elem: "pagination",
			
 
				+                             count: data.data.total,
			
 
				+                             layout: ["count", "prev", "page", "next", "limit",
			
 
				+                                 "refresh", "skip"
			
 
				+                             ],
			
 
				+                             jump: function(obj, first) {
			
 
				+                                 if (first) return;
			
 
				+                                 currentPage = obj.curr - 1;
			
 
				+                                 currentSize = obj.limit;
			
 
				+                                 loadAirList(currentPage, currentSize);
			
 
				+                             }
			
 
				+                         });
			
 
				+                     }
			
 
				+                     tableOption.data = data.data.list;
			
 
				+                     table.render(tableOption);
			
 
				+                 } else {
			
 
				+                     showMsg(data.msg, 2, 2000);
			
 
				+                 }
			
 
				+             });
			
 
				+
			
 
				+
			
 
				+
			
 
				+         }
			
 
				+         loadAirList();
			
 
				+     })
			
 
				+ })
			
--- a/src/main/resources/static/admin/js/Ucard-edit.js
+++ b/src/main/resources/static/admin/js/Ucard-edit.js
@@ -62,43 +62,6 @@ $(function() {
 
				         var layer = layui.layer;
			
 
				 
			
 
				 
			
 
				-
			
 
				-
			
 
				-        function getTypes() {
			
 
				-            fetchJSON("api/aircraft/listAll", {}, "get", function(ret) {
			
 
				-                console.log(ret)
			
 
				-                if (ret.status === 0) {
			
 
				-                    $("#aircraft_type").empty();
			
 
				-                    $("#aircraft_type").append($("<option>", {
			
 
				-                        value: -1,
			
 
				-                        text: "请选择"
			
 
				-                    }));
			
 
				-                    for (var i = 0; i < ret.data.length; i++) {
			
 
				-                        if (ret.data[i].aircraft_type === funcaircraft_type) {
			
 
				-                            $("#aircraft_type").append(
			
 
				-                                $("<option>", {
			
 
				-                                    value: ret.data[i].id,
			
 
				-                                    text: ret.data[i].aircraft_type,
			
 
				-                                    selected: true
			
 
				-                                })
			
 
				-                            );
			
 
				-                        } else {
			
 
				-                            $("#aircraft_type").append(
			
 
				-                                $("<option>", {
			
 
				-                                    value: ret.data[i].id,
			
 
				-                                    text: ret.data[i].aircraft_type
			
 
				-                                })
			
 
				-                            );
			
 
				-                        }
			
 
				-                    }
			
 
				-                    form.render('select');
			
 
				-                } else {
			
 
				-                    showMsg(ret.msg, 2);
			
 
				-                }
			
 
				-            });
			
 
				-        }
			
 
				-
			
 
				-        getTypes();
			
 
				     });
			
 
				 
			
 
				 });
			
@@ -167,29 +130,6 @@ $(function() {
 
				 
			
 
				         }
			
 
				         loadAirList();
			
 
				-        // 监听表内工具条
			
 
				-        // table.on("tool(outFaultList)", function(obj) {
			
 
				-        //     var data = obj.data;
			
 
				-        //     // console.log(data)
			
 
				-        //     if (obj.event === "edit") {
			
 
				-        //         x_admin_show(
			
 
				-        //             "在线预览",
			
 
				-        //             encodeURI(
			
 
				-        //                 "../admin/UcardSee.html"
			
 
				-        //             ),
			
 
				-        //             1500,
			
 
				-        //             650,
			
 
				-        //             function() {
			
 
				-        //                 loadAirList(currentPage, currentSize);
			
 
				-        //             }
			
 
				-        //         );
			
 
				-
			
 
				-        //         var data = obj.data.file_path
			
 
				-        //         flie = urlBase + data
			
 
				-        //             // console.log(flie)
			
 
				-        //         sessionStorage.setItem("url", flie)
			
 
				-
			
 
				-        //     }
			
 
				-        // });
			
 
				+
			
 
				     });
			
 
				 });
			
--- a/src/main/resources/static/admin/js/Ucard.js
+++ b/src/main/resources/static/admin/js/Ucard.js
@@ -137,78 +137,11 @@ $(function() {
 
				                 sessionStorage.setItem("url", flie)
			
 
				 
			
 
				 
			
 
				-            } else if (obj.event === "delete") {
			
 
				-                // console.log(data)
			
 
				-                // 删除
			
 
				-                var ids = [];
			
 
				-                ids.push(data.id);
			
 
				-                layer.confirm("确认要删除吗？", function() {
			
 
				-                    fetchJSON("api/card/delete", {
			
 
				-                        ids: ids
			
 
				-                    }, "post", function(data) {
			
 
				-                        if (data.status === 0) {
			
 
				-                            showMsg("已删除!", 1, 2000);
			
 
				-                            tableFirstLoad = true;
			
 
				-                            loadAirList(currentPage, currentSize);
			
 
				-                        } else {
			
 
				-                            showMsg(data.msg, 2, 2000);
			
 
				-                        }
			
 
				-                    });
			
 
				-                });
			
 
				-            }
			
 
				-        });
			
 
				-        // 批量删除
			
 
				-        $("#batchDelete").on("click", function(e) {
			
 
				-            e.preventDefault();
			
 
				-            var checkedData = table.checkStatus("outLineList").data;
			
 
				-            if (checkedData.length === 0) {
			
 
				-                showMsg("未选择需要删除的日志", 2, 2000);
			
 
				-                return;
			
 
				             }
			
 
				-            layer.confirm("确认要删除吗？", function() {
			
 
				-                var ids = [];
			
 
				-                for (var i = 0; i < checkedData.length; i++) {
			
 
				-                    ids.push(checkedData[i].id);
			
 
				-                }
			
 
				-
			
 
				-                fetchJSON("api/card/delete", {
			
 
				-                    ids: ids
			
 
				-                }, "post", function(data) {
			
 
				-                    if (data.status === 0) {
			
 
				-                        showMsg("已删除!");
			
 
				-                        tableFirstLoad = true;
			
 
				-                        loadAirList(currentPage, currentSize);
			
 
				-                    } else {
			
 
				-                        showMsg(data.msg, 2, 2000);
			
 
				-                    }
			
 
				-                });
			
 
				-            });
			
 
				-        });
			
 
				-        // 导入
			
 
				-        //表格导入
			
 
				-        $("#tolead").on("click", function(e) {
			
 
				-            e.preventDefault();
			
 
				-            tableFirstLoad = true;
			
 
				-            x_admin_show("导入",
			
 
				-                "../admin/faul-add.html",
			
 
				-                350,
			
 
				-                200,
			
 
				-                function() {
			
 
				-                    loadAirList(currentPage, currentSize);
			
 
				-                });
			
 
				-        });
			
 
				-        // 新建用户
			
 
				-        $("#add").on("click", function(e) {
			
 
				-            e.preventDefault();
			
 
				-            tableFirstLoad = true;
			
 
				-            x_admin_show("添加",
			
 
				-                "../admin/card-add.html?id=0&card_name=&aircraft_type=&major_type=&description=&file_path=&input_time=&remarks=",
			
 
				-                800,
			
 
				-                450,
			
 
				-                function() {
			
 
				-                    loadAirList(currentPage, currentSize);
			
 
				-                });
			
 
				         });
			
 
				 
			
 
				+
			
 
				+
			
 
				+
			
 
				     });
			
 
				 });
			
--- a/src/main/resources/static/admin/js/Uoutline.js
+++ b/src/main/resources/static/admin/js/Uoutline.js
@@ -20,19 +20,15 @@ $(function() {
 
				                 height: "full-81",
			
 
				                 limit: size,
			
 
				                 cols: [
			
 
				-                    [{
			
 
				-                            //field: "outline_name",
			
 
				-                            field: "contents",
			
 
				+                    [
			
 
				+
			
 
				+                        {
			
 
				+                            field: "outline_name",
			
 
				                             title: "大纲名称",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				 
			
 
				-                            field: "page_num",
			
 
				-                            title: "大纲名称",
			
 
				-                            align: "center",
			
 
				-                            hide: true
			
 
				-                        },
			
 
				+
			
 
				                         {
			
 
				                             fixed: "right",
			
 
				                             title: "操作",
			
@@ -45,25 +41,24 @@ $(function() {
 
				 
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 fetchJSON("api/outline/listpage?page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				-                    // fetchJSON("api/book/listAllDoccatalogue?bookId=" +  80, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				-                        // /*if (tableFirstLoad) {
			
 
				-                        //     tableFirstLoad = false;
			
 
				-                        //     laypage.render({
			
 
				-                        //         curr: page + 1,
			
 
				-                        //         elem: "pagination",
			
 
				-                        //         count: data.data.total,
			
 
				-                        //         layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				-                        //         jump: function(obj, first) {
			
 
				-                        //             if (first) return;
			
 
				-                        //             currentPage = obj.curr - 1;
			
 
				-                        //             currentSize = obj.limit;
			
 
				-                        //             loadoutLineList(currentPage, currentSize, searchTitleKey);
			
 
				-                        //         }
			
 
				-                        //     });
			
 
				-                        // }*/
			
 
				+                        if (tableFirstLoad) {
			
 
				+                            tableFirstLoad = false;
			
 
				+                            laypage.render({
			
 
				+                                curr: page + 1,
			
 
				+                                elem: "pagination",
			
 
				+                                count: data.data.total,
			
 
				+                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                jump: function(obj, first) {
			
 
				+                                    if (first) return;
			
 
				+                                    currentPage = obj.curr - 1;
			
 
				+                                    currentSize = obj.limit;
			
 
				+                                    loadoutLineList(currentPage, currentSize, searchTitleKey);
			
 
				+                                }
			
 
				+                            });
			
 
				+                        }
			
 
				 
			
 
				-                        tableOption.data = data.data;
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
@@ -126,7 +121,7 @@ $(function() {
 
				                 x_admin_show(
			
 
				                     "在线查看",
			
 
				                     encodeURI(
			
 
				-                        "../admin/Uoutline-edit.html?file_path=" + "sourcefm\\1617893572816.pdf" + "&page=" + data.page_num
			
 
				+                        "../admin/Uoutline-edit.html?file_path=" + data.file_path
			
 
				                     ),
			
 
				                     1300,
			
 
				                     600,
			
@@ -135,9 +130,9 @@ $(function() {
 
				                     }
			
 
				                 );
			
 
				                 // console.log(data.file_path)
			
 
				-                // var data = obj.data.file_path
			
 
				-                //  flie = urlBase + data
			
 
				-                // sessionStorage.setItem("url", flie)
			
 
				+                var data = obj.data.file_path
			
 
				+                flie = urlBase + data
			
 
				+                sessionStorage.setItem("url", flie)
			
 
				             } else if (obj.event === "delete") {
			
 
				                 // console.log(data)
			
 
				                 // 删除
			
--- a/src/main/resources/static/admin/modelSelection.html
+++ b/src/main/resources/static/admin/modelSelection.html
@@ -23,7 +23,8 @@
 
				 
			
 
				     </div> -->
			
 
				     <div class="close" style="float:right;margin-top:-140px">
			
 
				-        <span class="iconfont " style="color:red;">&#58983;</span>
			
 
				+        <!-- <span class="iconfont " style="color:red;">&#58983;</span> -->
			
 
				+        <a href="../Ordinary/index-list.html" style="color:red;margin-right:20px">管理后台 </a>
			
 
				         <a href="../index.html" style="color:red;margin-right:20px">注销   </a>
			
 
				     </div>
			
 
				 
			
--- a/src/main/resources/static/other/js/functions.js
+++ b/src/main/resources/static/other/js/functions.js
@@ -1,7 +1,7 @@
 
				 //var urlBase = window.location.origin + "/";
			
 
				 
			
 
				 var urlBase = "http://180.76.52.24:11083/"; //网络版
			
 
				- // var urlBase = "http://127.0.0.1:11083/"; //本地版
			
 
				+// var urlBase = "http://127.0.0.1:11083/"; //本地版
			
 
				 
			
 
				 function loginout() {
			
 
				     /*if ($("#loginMenu").text() == "登录") {