4 lat temu · 5b986a664f
--- a/src/main/java/com/zglc/fm/controller/BookController.java
+++ b/src/main/java/com/zglc/fm/controller/BookController.java
@@ -175,10 +175,12 @@ public class BookController {
 
				     @GetMapping("get")
			
 
				     public  Result<BookEntity> get(@RequestParam Integer id){return  Result.success(bookService.getOutline(id));}
			
 
				 
			
 
				+
			
 
				     @ApiOperation("按名称查询")
			
 
				     @GetMapping("getByName")
			
 
				-    public Result<List<BookEntity>> findByName(@RequestParam("name") String name){
			
 
				-        return bookService.findByName(name);
			
 
				+    public Result<PageInfo<BookEntity>> findByName(@RequestParam("name") String name,Integer page, Integer size){
			
 
				+        PageHelper.startPage(page, size, "id desc");
			
 
				+        return  Result.success(new PageInfo<>(bookService.findByName(name)));
			
 
				     }
			
 
				 
			
 
				     @ApiOperation("增添")
			
--- a/src/main/java/com/zglc/fm/service/BookService.java
+++ b/src/main/java/com/zglc/fm/service/BookService.java
@@ -100,12 +100,16 @@ public class BookService {
 
				         return Result.result(flag, msg, msg);
			
 
				     }
			
 
				 
			
 
				-    public Result<List<BookEntity>> findByName(String name){
			
 
				-        if (name == null ||"".equals(name)){
			
 
				-            return Result.result(false, "名称不能为空" ,null);
			
 
				-        }
			
 
				+//    public Result<List<BookEntity>> findByName(String name){
			
 
				+//        if (name == null ||"".equals(name)){
			
 
				+//            return Result.result(false, "名称不能为空" ,null);
			
 
				+//        }
			
 
				+//        List<BookEntity> list = bookDao.findByName("%" + name + "%");
			
 
				+//        return Result.success(list);
			
 
				+//    }
			
 
				+    public List<BookEntity> findByName(String name){
			
 
				         List<BookEntity> list = bookDao.findByName("%" + name + "%");
			
 
				-        return Result.success(list);
			
 
				+        return list;
			
 
				     }
			
 
				 
			
 
				     public List<BookEntity> findByName1(String name){
			
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ spring:
 
				       driverClassName: com.mysql.jdbc.Driver
			
 
				 
			
 
				       url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
			
 
				-  #    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
			
 
				+#      url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
			
 
				 
			
 
				       username: root
			
 
				 
			
@@ -16,7 +16,7 @@ spring:
 
				       driverClassName: com.mysql.jdbc.Driver
			
 
				 
			
 
				       url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
			
 
				-        #    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
			
 
				+#      url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
			
 
				 
			
 
				       username: root
			
 
				 
			
--- a/src/main/resources/static/Ordinary/Electronics.html
+++ b/src/main/resources/static/Ordinary/Electronics.html
@@ -42,7 +42,27 @@
 
				 <body class="layui-anim layui-anim-up">
			
 
				 
			
 
				     <div class="x-body">
			
 
				+        <form class="layui-form">
			
 
				 
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				+            <div class="search">
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -51,6 +71,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "案例名称"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/Flying.html
+++ b/src/main/resources/static/Ordinary/Flying.html
@@ -42,7 +42,27 @@
 
				 <body class="layui-anim layui-anim-up">
			
 
				 
			
 
				     <div class="x-body">
			
 
				+        <form class="layui-form">
			
 
				 
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				+            <div class="search">
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -51,6 +71,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "案例名称"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/Not_indexed.html
+++ b/src/main/resources/static/Ordinary/Not_indexed.html
@@ -42,7 +42,20 @@
 
				 <body class="layui-anim layui-anim-up">
			
 
				 
			
 
				     <div class="x-body">
			
 
				+        <form class="layui-form">
			
 
				 
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="realName" placeholder="请输入故障名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				+                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                      <i class="layui-icon">&#xe615;</i>
			
 
				+                    </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -51,6 +64,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "案例名称"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/ad_hoc.html
+++ b/src/main/resources/static/Ordinary/ad_hoc.html
@@ -42,7 +42,27 @@
 
				 <body class="layui-anim layui-anim-up">
			
 
				 
			
 
				     <div class="x-body">
			
 
				+        <form class="layui-form">
			
 
				 
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				+            <div class="search">
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -51,6 +71,38 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        <!-- 表索引 -->
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "案例名称"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/aircraft.html
+++ b/src/main/resources/static/Ordinary/aircraft.html
@@ -45,7 +45,7 @@
 
				     <div class="x-body">
			
 
				         <form class="layui-form">
			
 
				             <button id="addair" class="layui-btn layui-btn-sm">
			
 
				-        <i class="layui-icon">&#xe61f;</i>增加</button>
			
 
				+        <i class="layui-icon">&#xe61f;</i>添加</button>
			
 
				             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger " style="padding-right: 10px;">
			
 
				             <i class="layui-icon">&#xe640;</i> 批量删除</button>
			
 
				             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
@@ -67,6 +67,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/book-add.html
+++ b/src/main/resources/static/Ordinary/book-add.html
@@ -24,9 +24,11 @@
 
				                 <div class="layui-row">
			
 
				                     <div class="layui-col-sm6">
			
 
				                         <div class="layui-form-item">
			
 
				-                            <label for="aircraft_type" class="layui-form-label">机型</label>
			
 
				-                            <div class="layui-input-inline">
			
 
				-                                <input type="text" id="aircraft_type" name="aircraft_typee" required="" lay-verify="required" autocomplete="off" class="layui-input">
			
 
				+                            <label for="aircraft_type" class="layui-form-label">
			
 
				+                                    机型
			
 
				+                                </label>
			
 
				+                            <div class="layui-input-inline layui-form" lay-filter="airSelect">
			
 
				+                                <select name="aircraft_type" id="aircraft_type" lay-verify="required"> </select>
			
 
				                             </div>
			
 
				                         </div>
			
 
				                     </div>
			
--- a/src/main/resources/static/Ordinary/book-edit.html
+++ b/src/main/resources/static/Ordinary/book-edit.html
@@ -25,9 +25,11 @@
 
				                 <div class="layui-row">
			
 
				                     <div class="layui-col-sm6">
			
 
				                         <div class="layui-form-item">
			
 
				-                            <label for="aircraft_type" class="layui-form-label">机型</label>
			
 
				-                            <div class="layui-input-inline">
			
 
				-                                <input type="text" id="aircraft_type" name="aircraft_typee" required="" lay-verify="required" autocomplete="off" class="layui-input">
			
 
				+                            <label for="aircraft_type" class="layui-form-label">
			
 
				+										<span class="x-red">*</span> 机型
			
 
				+									</label>
			
 
				+                            <div class="layui-input-inline layui-form" lay-filter="airSelect">
			
 
				+                                <select name="aircraft_type" id="aircraft_type" lay-verify="required"> </select>
			
 
				                             </div>
			
 
				                         </div>
			
 
				                     </div>
			
@@ -64,9 +66,9 @@
 
				                 <div class="layui-row">
			
 
				                     <div class="layui-col-sm6">
			
 
				                         <div class="layui-form-item">
			
 
				-                            <label for="img" class="layui-form-label">图片</label>
			
 
				+                            <label for="type_name" class="layui-form-label">  类型名称</label>
			
 
				                             <div class="layui-input-inline">
			
 
				-                                <input type="text" id="img" name="img" autocomplete="off" class="layui-input">
			
 
				+                                <input type="text" id="type_name" name="type_name" autocomplete="off" class="layui-input">
			
 
				                             </div>
			
 
				                         </div>
			
 
				                     </div>
			
@@ -82,7 +84,7 @@
 
				                 <div class="layui-row">
			
 
				                     <div class="layui-col-sm6">
			
 
				                         <div class="layui-form-item">
			
 
				-                            <label for="major_type" class="layui-form-label">专业</label>
			
 
				+                            <label for="major_type" class="layui-form-label"> 专业</label>
			
 
				                             <div class="layui-input-inline">
			
 
				                                 <input type="text" id="major_type" name="major_type" autocomplete="off" class="layui-input">
			
 
				                             </div>
			
@@ -90,26 +92,15 @@
 
				                     </div>
			
 
				                     <div class="layui-col-sm6">
			
 
				                         <div class="layui-form-item">
			
 
				-                            <label for="publish_time" class="layui-form-label">出版时间</label>
			
 
				+                            <label for="publish_time" class="layui-form-label">  出版时间</label>
			
 
				                             <div class="layui-input-inline">
			
 
				                                 <input type="text" id="publish_time" name="publish_time" autocomplete="off" class="layui-input" placeholder="yyyy-MM-dd">
			
 
				                             </div>
			
 
				                         </div>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <div class="layui-row">
			
 
				-
			
 
				-                    <div class="layui-col-sm6">
			
 
				-                        <div class="layui-form-item">
			
 
				-                            <label for="type_name" class="layui-form-label">类型名称</label>
			
 
				-                            <div class="layui-input-inline">
			
 
				-                                <input type="text" id="type_name" name="type_name" autocomplete="off" class="layui-input">
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-
			
 
				             </div>
			
 
				+
			
 
				             <br>
			
 
				             <div class="layui-row" style="text-align: center;">
			
 
				                 <div class="layui-inline">
			
--- a/src/main/resources/static/Ordinary/book.html
+++ b/src/main/resources/static/Ordinary/book.html
@@ -75,6 +75,9 @@
 
				         <script type="text/html" id="imgtemp">
			
 
				             <div><img src="{{d.img}}"></div>
			
 
				         </script>
			
 
				+        <script type="text/html" id="xuhao">
			
 
				+            {{d.LAY_TABLE_INDEX+1}}
			
 
				+        </script>
			
 
				     </div>
			
 
				 </body>
			
 
				 
			
--- a/src/main/resources/static/Ordinary/bookAir.html
+++ b/src/main/resources/static/Ordinary/bookAir.html
@@ -40,16 +40,29 @@
 
				 </head>
			
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				+
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -57,6 +70,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "作者"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/bookAirEle.html
+++ b/src/main/resources/static/Ordinary/bookAirEle.html
@@ -40,16 +40,29 @@
 
				 </head>
			
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				+
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -57,6 +70,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "作者"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/bookAirEqu.html
+++ b/src/main/resources/static/Ordinary/bookAirEqu.html
@@ -41,15 +41,27 @@
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -57,6 +69,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "作者"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/bookFlying.html
+++ b/src/main/resources/static/Ordinary/bookFlying.html
@@ -41,15 +41,27 @@
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -57,6 +69,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "作者"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/bookGeneralIntroduction.html
+++ b/src/main/resources/static/Ordinary/bookGeneralIntroduction.html
@@ -41,15 +41,27 @@
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -57,6 +69,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "作者"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/bookIntegratedAvionics.html
+++ b/src/main/resources/static/Ordinary/bookIntegratedAvionics.html
@@ -41,15 +41,27 @@
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -57,6 +69,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "作者"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/bookOrdnance.html
+++ b/src/main/resources/static/Ordinary/bookOrdnance.html
@@ -41,15 +41,27 @@
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -57,6 +69,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "作者"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/bookStructure.html
+++ b/src/main/resources/static/Ordinary/bookStructure.html
@@ -41,15 +41,27 @@
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -57,6 +69,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "作者"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/card.html
+++ b/src/main/resources/static/Ordinary/card.html
@@ -65,6 +65,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/cardAdHoc.html
+++ b/src/main/resources/static/Ordinary/cardAdHoc.html
@@ -41,15 +41,18 @@
 
				 
			
 
				 <body class="layui-anim layui-anim-up">
			
 
				     <div class="x-body">
			
 
				-        <!-- <form class="layui-form">
			
 
				+        <form class="layui-form">
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
			
 
				+            </a>
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入书名" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				+                <input id="realName" type="text" name="realName" placeholder="请输入卡片名" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                   <i class="layui-icon">&#xe615;</i>
			
 
				                 </button>
			
 
				             </div>
			
 
				 
			
 
				-        </form> -->
			
 
				+        </form>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -58,6 +61,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/cardElectronics.html
+++ b/src/main/resources/static/Ordinary/cardElectronics.html
@@ -41,15 +41,15 @@
 
				 
			
 
				 <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: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				-            </div>
			
 
				-
			
 
				-        </form> -->
			
 
				+        <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+            <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
			
 
				+        </a>
			
 
				+        <div class="search">
			
 
				+            <input id="realName" type="text" name="realName" placeholder="请输入卡片名" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				+            <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+              <i class="layui-icon">&#xe615;</i>
			
 
				+            </button>
			
 
				+        </div>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -58,6 +58,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/cardFireControl.html
+++ b/src/main/resources/static/Ordinary/cardFireControl.html
@@ -41,15 +41,15 @@
 
				 
			
 
				 <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: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				-            </div>
			
 
				-
			
 
				-        </form> -->
			
 
				+        <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+            <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
			
 
				+        </a>
			
 
				+        <div class="search">
			
 
				+            <input id="realName" type="text" name="realName" placeholder="请输入卡片名" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				+            <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+              <i class="layui-icon">&#xe615;</i>
			
 
				+            </button>
			
 
				+        </div>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -58,6 +58,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/cardFlying.html
+++ b/src/main/resources/static/Ordinary/cardFlying.html
@@ -41,15 +41,15 @@
 
				 
			
 
				 <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: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				-            </div>
			
 
				-
			
 
				-        </form> -->
			
 
				+        <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+            <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
			
 
				+        </a>
			
 
				+        <div class="search">
			
 
				+            <input id="realName" type="text" name="realName" placeholder="请输入卡片名" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				+            <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+              <i class="layui-icon">&#xe615;</i>
			
 
				+            </button>
			
 
				+        </div>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -58,6 +58,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/cardOrdnance.html
+++ b/src/main/resources/static/Ordinary/cardOrdnance.html
@@ -41,15 +41,15 @@
 
				 
			
 
				 <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: 200px;height: 30px;'>
			
 
				-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				-                  <i class="layui-icon">&#xe615;</i>
			
 
				-                </button>
			
 
				-            </div>
			
 
				-
			
 
				-        </form> -->
			
 
				+        <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+            <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
			
 
				+        </a>
			
 
				+        <div class="search">
			
 
				+            <input id="realName" type="text" name="realName" placeholder="请输入卡片名" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				+            <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+              <i class="layui-icon">&#xe615;</i>
			
 
				+            </button>
			
 
				+        </div>
			
 
				         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -58,6 +58,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/fault.html
+++ b/src/main/resources/static/Ordinary/fault.html
@@ -64,7 +64,7 @@
 
				                 <select name="aircraft_type" id="aircraft_type" lay-search="aircraft_type" lay-verify="required"></select>
			
 
				             </div> -->
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入内容" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				+                <input id="realName" type="text" name="realName" placeholder="请输入案例名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                     <i class="layui-icon">&#xe615;</i>
			
 
				                 </button>
			
@@ -79,6 +79,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/fire_control.html
+++ b/src/main/resources/static/Ordinary/fire_control.html
@@ -42,7 +42,27 @@
 
				 <body class="layui-anim layui-anim-up">
			
 
				 
			
 
				     <div class="x-body">
			
 
				+        <form class="layui-form">
			
 
				 
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				+            <div class="search">
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -51,6 +71,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "案例名称"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/js/Electronics.js
+++ b/src/main/resources/static/Ordinary/js/Electronics.js
@@ -22,11 +22,26 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        }, {
			
 
				                             field: "fault_name",
			
 
				                             title: "故障名称",
			
 
				                             templet: '#typeTpl',
			
 
				                             align: "center"
			
 
				                         },
			
 
				+                        {
			
 
				+                            field: "book_name",
			
 
				+                            title: "教材",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				+                        {
			
 
				+                            field: "chapter",
			
 
				+                            title: "章节",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "fault_number",
			
 
				                             title: "故障编号",
			
@@ -68,6 +83,8 @@ $(function() {
 
				 
			
 
				             var majorType = "电子";
			
 
				             var name = "";
			
 
				+            var major = "电子";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "/api/fault/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -95,8 +112,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("/api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/fault/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -104,22 +123,27 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
@@ -130,6 +154,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/Flying.js
+++ b/src/main/resources/static/Ordinary/js/Flying.js
@@ -22,11 +22,26 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        }, {
			
 
				                             field: "fault_name",
			
 
				                             title: "故障名称",
			
 
				                             templet: '#typeTpl',
			
 
				                             align: "center"
			
 
				                         },
			
 
				+                        {
			
 
				+                            field: "book_name",
			
 
				+                            title: "教材",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				+                        {
			
 
				+                            field: "chapter",
			
 
				+                            title: "章节",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "fault_number",
			
 
				                             title: "故障编号",
			
@@ -66,6 +81,8 @@ $(function() {
 
				 
			
 
				             var majorType = "飞发";
			
 
				             var name = "";
			
 
				+            var major = "飞发";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "/api/fault/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -93,8 +110,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("/api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/fault/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -102,24 +121,28 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				-            }
			
 
				 
			
 
				+            }
			
 
				 
			
 
				         }
			
 
				         loadAirList();
			
@@ -128,6 +151,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/Not_indexed.js
+++ b/src/main/resources/static/Ordinary/js/Not_indexed.js
@@ -22,10 +22,25 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        }, {
			
 
				                             field: "fault_name",
			
 
				                             title: "故障名称",
			
 
				                             align: "center"
			
 
				                         },
			
 
				+                        {
			
 
				+                            field: "book_name",
			
 
				+                            title: "教材",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				+                        {
			
 
				+                            field: "chapter",
			
 
				+                            title: "章节",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "fault_number",
			
 
				                             title: "故障编号",
			
@@ -62,6 +77,7 @@ $(function() {
 
				                 ]
			
 
				             };
			
 
				 
			
 
				+
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/fault/listNotIndexed?page=" + (page + 1) + "&size=" + size;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -89,8 +105,7 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("/api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/fault/findNotIndexed?name=" + searchTitle + '&page=' + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -107,8 +122,8 @@ $(function() {
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
@@ -116,7 +131,6 @@ $(function() {
 
				                 });
			
 
				             }
			
 
				 
			
 
				-
			
 
				         }
			
 
				         loadAirList();
			
 
				 
			
@@ -124,6 +138,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/ad_hoc.js
+++ b/src/main/resources/static/Ordinary/js/ad_hoc.js
@@ -22,11 +22,26 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        }, {
			
 
				                             field: "fault_name",
			
 
				                             title: "故障名称",
			
 
				                             templet: '#typeTpl',
			
 
				                             align: "center"
			
 
				                         },
			
 
				+                        {
			
 
				+                            field: "book_name",
			
 
				+                            title: "教材",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				+                        {
			
 
				+                            field: "chapter",
			
 
				+                            title: "章节",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "fault_number",
			
 
				                             title: "故障编号",
			
@@ -68,6 +83,8 @@ $(function() {
 
				 
			
 
				             var majorType = "特设";
			
 
				             var name = "";
			
 
				+            var major = "特设";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "/api/fault/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -95,8 +112,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("/api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/fault/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -104,22 +123,27 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
@@ -130,6 +154,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/aircraft-edit.js
+++ b/src/main/resources/static/Ordinary/js/aircraft-edit.js
@@ -50,7 +50,7 @@ $(function() {
 
				             funcEnd = $("#remarks").val();
			
 
				 
			
 
				             func.id = funcId;
			
 
				-
			
 
				+            console.log(func.id)
			
 
				             let url = "";
			
 
				             if (func.id === "0") url = "api/aircraft/add";
			
 
				             else url = "api/aircraft/edit";
			
--- a/src/main/resources/static/Ordinary/js/aircraft.js
+++ b/src/main/resources/static/Ordinary/js/aircraft.js
@@ -23,11 +23,16 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				-
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
 
				-
			
 
				+                            // sort: true,
			
 
				                             align: "center"
			
 
				                         },
			
 
				 
			
@@ -74,25 +79,25 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                fetchJSON("api/aircraft/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/aircraft/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
 
				                             laypage.render({
			
 
				-                                // curr: page + 1,
			
 
				+                                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, searchTitleKey);
			
 
				-                                // }
			
 
				+                                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, searchTitleKey);
			
 
				+                                }
			
 
				                             });
			
 
				                         }
			
 
				 
			
 
				-                        tableOption.data = data.data;
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
--- a/src/main/resources/static/Ordinary/js/book-add.js
+++ b/src/main/resources/static/Ordinary/js/book-add.js
@@ -12,8 +12,8 @@ $(function() {
 
				             var funcinput_time = "";
			
 
				             var funcmajor_type = "";
			
 
				             var funcpublish_time = "";
			
 
				-            var functype = "";
			
 
				-            var functype_name = "";
			
 
				+            // var functype = "";
			
 
				+            // var functype_name = "";
			
 
				             var funcfile_path = "";
			
 
				             if (funcId !== "0") {
			
 
				                 funcaircraft_type = decodeURI(values[1].replace("aircraft_type=", ""));
			
@@ -24,10 +24,10 @@ $(function() {
 
				                 funcinput_time = decodeURI(values[6].replace("input_time=", ""));
			
 
				                 funcmajor_type = decodeURI(values[7].replace("major_type=", ""));
			
 
				                 funcpublish_time = decodeURI(values[8].replace("publish_time=", ""));
			
 
				-                functype = decodeURI(values[9].replace("type_id=", ""));
			
 
				-                functype_name = decodeURI(values[10].replace("type_name=", ""));
			
 
				-                funcfile_path = decodeURI(values[11].replace("file_path=", ""));
			
 
				-                funcremarks = decodeURI(values[12].replace("remarks=", ""));
			
 
				+                // functype = decodeURI(values[9].replace("type_id=", ""));
			
 
				+                // functype_name = decodeURI(values[10].replace("type_name=", ""));
			
 
				+                funcfile_path = decodeURI(values[9].replace("file_path=", ""));
			
 
				+                funcremarks = decodeURI(values[10].replace("remarks=", ""));
			
 
				             }
			
 
				         }
			
 
				     }
			
@@ -41,8 +41,8 @@ $(function() {
 
				     $("#input_time").val(funcinput_time);
			
 
				     $("#major_type").val(funcmajor_type);
			
 
				     $("#publish_time").val(funcpublish_time);
			
 
				-    $("#type_id").val(functype);
			
 
				-    $("#type_name").val(functype_name);
			
 
				+    // $("#type_id").val(functype);
			
 
				+    // $("#type_name").val(functype_name);
			
 
				     $("#file_path").val(funcfile_path);
			
 
				     // 表单刷新
			
 
				     layui.use("form", function() {
			
@@ -143,6 +143,50 @@ $(function() {
 
				             });
			
 
				             return false;
			
 
				         });
			
 
				+        form.on("select", function(data) {
			
 
				+            if (data.elem.id === "aircraft_type")
			
 
				+                aircraft_type = data.elem[data.elem.selectedIndex].text;
			
 
				 
			
 
				+        })
			
 
				+
			
 
				+
			
 
				+
			
 
				+        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
			
 
				+                                    // 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
			
 
				+                                })
			
 
				+                            );
			
 
				+                        }
			
 
				+                    }
			
 
				+                    layui.use("form", function() {
			
 
				+                        layui.form.render('select', 'airSelect');
			
 
				+                    });
			
 
				+                } else {
			
 
				+                    showMsg(ret.msg, 2);
			
 
				+                }
			
 
				+            });
			
 
				+        }
			
 
				+        getTypes();
			
 
				     });
			
 
				 });
			
--- a/src/main/resources/static/Ordinary/js/book-edit.js
+++ b/src/main/resources/static/Ordinary/js/book-edit.js
@@ -2,49 +2,44 @@ $(function() {
 
				     var params = window.location.href.split("?");
			
 
				     if (params.length > 1) {
			
 
				         values = params[1].split("&");
			
 
				-        if (values.length > 10) {
			
 
				+        console.log(values)
			
 
				+        if (values.length > 7) {
			
 
				             var funcId = values[0].replace("id=", "");
			
 
				             var funcaircraft_type = "";
			
 
				-            var funccard_name = "";
			
 
				+            var funcauthor = "";
			
 
				             var funcbook = "";
			
 
				             var funcdescription = "";
			
 
				+            var funcfile_path = "";
			
 
				             var funcimg = "";
			
 
				             var funcinput_time = "";
			
 
				             var funcmajor_type = "";
			
 
				             var funcpublish_time = "";
			
 
				+            var funcis_catalogue = "";
			
 
				+            var funcremarks = "";
			
 
				             var functype = "";
			
 
				             var functype_name = "";
			
 
				-            var funcfile_path = "";
			
 
				             if (funcId !== "0") {
			
 
				                 funcaircraft_type = decodeURI(values[1].replace("aircraft_type=", ""));
			
 
				-                funccard_name = decodeURI(values[2].replace("author=", ""));
			
 
				+                funcauthor = decodeURI(values[2].replace("author=", ""));
			
 
				                 funcbook = decodeURI(values[3].replace("book_name=", ""));
			
 
				                 funcdescription = decodeURI(values[4].replace("description=", ""));
			
 
				-                funcimg = decodeURI(values[5].replace("img=", ""));
			
 
				-                funcinput_time = decodeURI(values[6].replace("input_time=", ""));
			
 
				-                funcmajor_type = decodeURI(values[7].replace("major_type=", ""));
			
 
				-                funcpublish_time = decodeURI(values[8].replace("publish_time=", ""));
			
 
				-                functype = decodeURI(values[9].replace("type_id=", ""));
			
 
				-                functype_name = decodeURI(values[10].replace("type_name=", ""));
			
 
				-                funcfile_path = decodeURI(values[11].replace("file_path=", ""));
			
 
				-                // funcremarks = decodeURI(values[12].replace("remarks=", ""));
			
 
				+                funcinput_time = decodeURI(values[5].replace("input_time=", ""));
			
 
				+                funcmajor_type = decodeURI(values[6].replace("major_type=", ""));
			
 
				+                funcpublish_time = decodeURI(values[7].replace("publish_time=", ""));
			
 
				+
			
 
				             }
			
 
				         }
			
 
				     }
			
 
				 
			
 
				 
			
 
				     $("#aircraft_type").val(funcaircraft_type);
			
 
				-    $("#author").val(funccard_name);
			
 
				+    $("#author").val(funcauthor);
			
 
				     $("#book_name").val(funcbook);
			
 
				     $("#description").val(funcdescription);
			
 
				-    $("#img").val(funcimg);
			
 
				     $("#input_time").val(funcinput_time);
			
 
				     $("#major_type").val(funcmajor_type);
			
 
				     $("#publish_time").val(funcpublish_time);
			
 
				-    $("#type_id").val(functype);
			
 
				-    $("#type_name").val(functype_name);
			
 
				-    $("#file_path").val(funcfile_path);
			
 
				-    $("#box").attr('src', urlBase + funcfile_path);
			
 
				+
			
 
				     layui.use("form", function() {
			
 
				         layui.form.render();
			
 
				     });
			
@@ -53,18 +48,11 @@ $(function() {
 
				         $ = layui.jquery;
			
 
				         var form = layui.form,
			
 
				             layer = layui.layer;
			
 
				-
			
 
				-
			
 
				-
			
 
				-        //监听提交
			
 
				-        form.on("switch(hide)", function(data) {
			
 
				-            isHide = data.elem.checked ? 1 : 0;
			
 
				-        });
			
 
				         form.on("submit(save)", function(data) {
			
 
				             var func = data.field;
			
 
				             func.id = funcId;
			
 
				+            console.log(func)
			
 
				             let url = "";
			
 
				-
			
 
				             url = "api/book/edit";
			
 
				             fetchJSON(url, func, "post", function(data) {
			
 
				                 if (data.status === 0) {
			
@@ -77,6 +65,50 @@ $(function() {
 
				             });
			
 
				             return false;
			
 
				         });
			
 
				+        form.on("select", function(data) {
			
 
				+            if (data.elem.id === "aircraft_type")
			
 
				+                aircraft_type = data.elem[data.elem.selectedIndex].text;
			
 
				+
			
 
				+        })
			
 
				+
			
 
				+        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
			
 
				+                                    // 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
			
 
				+                                })
			
 
				+                            );
			
 
				+                        }
			
 
				+                    }
			
 
				+                    layui.use("form", function() {
			
 
				+                        layui.form.render('select', 'airSelect');
			
 
				+                    });
			
 
				+                } else {
			
 
				+                    showMsg(ret.msg, 2);
			
 
				+                }
			
 
				+            });
			
 
				+        }
			
 
				+        getTypes();
			
 
				+
			
 
				 
			
 
				     });
			
 
				 });
			
--- a/src/main/resources/static/Ordinary/js/book.js
+++ b/src/main/resources/static/Ordinary/js/book.js
@@ -24,7 +24,12 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				-
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -67,7 +72,8 @@ $(function() {
 
				                         {
			
 
				                             field: "input_time",
			
 
				                             title: "开始时间",
			
 
				-                            align: "center"
			
 
				+                            align: "center",
			
 
				+                            order: "desc"
			
 
				                         },
			
 
				                         {
			
 
				                             field: "major_type",
			
@@ -84,11 +90,11 @@ $(function() {
 
				                         //     title: "类型id",
			
 
				                         //     align: "center"
			
 
				                         // },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+                        // {
			
 
				+                        //     field: "type_name",
			
 
				+                        //     title: "类型名称",
			
 
				+                        //     align: "center"
			
 
				+                        // },
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -116,16 +122,18 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        console.log(data.data.list[0].img)
			
 
				                         tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
@@ -134,7 +142,7 @@ $(function() {
 
				                 });
			
 
				             } else {
			
 
				                 // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/book/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -142,17 +150,20 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				                         console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
@@ -186,22 +197,25 @@ $(function() {
 
				         // 监听表内工具条
			
 
				         table.on("tool(outLineList)", function(obj) {
			
 
				             var data = obj.data;
			
 
				-            console.log(data)
			
 
				             if (obj.event === "edit") {
			
 
				                 x_admin_show(
			
 
				                     "编辑",
			
 
				                     encodeURI(
			
 
				-                        "book-edit.html?id=" + data.id + "&aircraft_type=" + data.aircraft_type + "&author=" + data.author + "&book_name=" + data.book_name + "&description=" + data.description + "&img=" + data.img + "&input_time=" + data.input_time + "&major_type=" + data.major_type + "&publish_time=" + data.publish_time + "&type_id=" + data.type_id + "&type_name=" + data.type_name + "&file_path=" + data.file_path
			
 
				+                        "book-edit.html?id=" + data.id + "&aircraft_type=" + data
			
 
				+                        .aircraft_type + "&author=" + data.author + "&book_name=" + data
			
 
				+                        .book_name + "&description=" + data.description + +"&type_name=" +
			
 
				+                        data.type_name + "&input_time=" + data
			
 
				+                        .input_time + "&major_type=" + data.major_type + "&publish_time=" +
			
 
				+                        data.publish_time
			
 
				                     ),
			
 
				                     800,
			
 
				-                    400,
			
 
				+                    370,
			
 
				                     function() {
			
 
				                         loadAirList(currentPage, currentSize);
			
 
				                     }
			
 
				                 );
			
 
				-
			
 
				-
			
 
				-            } else if (obj.event === "delete") {
			
 
				+            } else
			
 
				+            if (obj.event === "delete") {
			
 
				                 // console.log(data)
			
 
				                 // 删除
			
 
				                 var ids = [];
			
@@ -266,7 +280,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             x_admin_show("添加",
			
 
				-                "book-add.html?id=0&author=&aircraft_type=&book_name=&description=&img=&input_time=&major_type&publish_time=&type_id=&type_name=&file_path=",
			
 
				+                "book-add.html?id=0&author=&aircraft_type=&book_name=&description=&img=&input_time=&major_type&publish_time=&file_path=&remark=",
			
 
				                 800,
			
 
				                 450,
			
 
				                 function() {
			
--- a/src/main/resources/static/Ordinary/js/bookAir.js
+++ b/src/main/resources/static/Ordinary/js/bookAir.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -76,16 +78,7 @@ $(function() {
 
				                             title: "出版时间",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "type_id",
			
 
				-                            title: "类型id",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -104,6 +97,8 @@ $(function() {
 
				 
			
 
				             var majorType = "飞机仪表";
			
 
				             var name = "";
			
 
				+            var major = "飞机仪表";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/book/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -131,8 +126,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/book/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -140,22 +137,27 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
@@ -166,6 +168,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/bookAirEle.js
+++ b/src/main/resources/static/Ordinary/js/bookAirEle.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -76,16 +78,7 @@ $(function() {
 
				                             title: "出版时间",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "type_id",
			
 
				-                            title: "类型id",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -104,6 +97,8 @@ $(function() {
 
				 
			
 
				             var majorType = "飞机电气";
			
 
				             var name = "";
			
 
				+            var major = "飞机电气";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/book/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -131,8 +126,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/book/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -140,24 +137,28 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				-            }
			
 
				 
			
 
				+            }
			
 
				 
			
 
				         }
			
 
				         loadAirList();
			
@@ -166,6 +167,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/bookAirEqu.js
+++ b/src/main/resources/static/Ordinary/js/bookAirEqu.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -76,16 +78,7 @@ $(function() {
 
				                             title: "出版时间",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "type_id",
			
 
				-                            title: "类型id",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -104,6 +97,8 @@ $(function() {
 
				 
			
 
				             var majorType = "飞控设备";
			
 
				             var name = "";
			
 
				+            var major = "飞控设备";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/book/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -131,8 +126,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/book/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -140,24 +137,28 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				-            }
			
 
				 
			
 
				+            }
			
 
				 
			
 
				         }
			
 
				         loadAirList();
			
@@ -166,6 +167,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/bookFlying.js
+++ b/src/main/resources/static/Ordinary/js/bookFlying.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -76,16 +78,7 @@ $(function() {
 
				                             title: "出版时间",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "type_id",
			
 
				-                            title: "类型id",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -104,6 +97,8 @@ $(function() {
 
				 
			
 
				             var majorType = "飞发";
			
 
				             var name = "";
			
 
				+            var major = "飞发";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/book/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -131,8 +126,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/book/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -140,25 +137,31 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
 
				+
			
 
				         }
			
 
				         loadAirList();
			
 
				 
			
@@ -166,6 +169,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/bookGeneralIntroduction.js
+++ b/src/main/resources/static/Ordinary/js/bookGeneralIntroduction.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -76,16 +78,7 @@ $(function() {
 
				                             title: "出版时间",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "type_id",
			
 
				-                            title: "类型id",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -104,6 +97,8 @@ $(function() {
 
				 
			
 
				             var majorType = "总体概论";
			
 
				             var name = "";
			
 
				+            var major = "总体概论";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/book/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -131,8 +126,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/book/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -140,24 +137,28 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				-            }
			
 
				 
			
 
				+            }
			
 
				 
			
 
				         }
			
 
				         loadAirList();
			
@@ -166,6 +167,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/bookIntegratedAvionics.js
+++ b/src/main/resources/static/Ordinary/js/bookIntegratedAvionics.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -76,16 +78,7 @@ $(function() {
 
				                             title: "出版时间",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "type_id",
			
 
				-                            title: "类型id",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -104,6 +97,8 @@ $(function() {
 
				 
			
 
				             var majorType = "综合航电";
			
 
				             var name = "";
			
 
				+            var major = "综合航电";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/book/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -131,8 +126,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/book/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -140,22 +137,27 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
@@ -166,6 +168,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/bookOrdnance.js
+++ b/src/main/resources/static/Ordinary/js/bookOrdnance.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -76,16 +78,7 @@ $(function() {
 
				                             title: "出版时间",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "type_id",
			
 
				-                            title: "类型id",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -104,6 +97,8 @@ $(function() {
 
				 
			
 
				             var majorType = "军械";
			
 
				             var name = "";
			
 
				+            var major = "军械";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/book/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -131,8 +126,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/book/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -140,22 +137,27 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
@@ -166,6 +168,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/bookStructure.js
+++ b/src/main/resources/static/Ordinary/js/bookStructure.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "aircraft_type",
			
 
				                             title: "机型",
			
@@ -76,16 +78,7 @@ $(function() {
 
				                             title: "出版时间",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "type_id",
			
 
				-                            title: "类型id",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "type_name",
			
 
				-                            title: "类型名称",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				+
			
 
				                         // {
			
 
				                         //     field: "remarks",
			
 
				                         //     title: "备注",
			
@@ -104,6 +97,8 @@ $(function() {
 
				 
			
 
				             var majorType = "发构";
			
 
				             var name = "";
			
 
				+            var major = "发构";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/book/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -131,8 +126,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/book/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/book/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -140,22 +137,27 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
@@ -166,6 +168,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/card.js
+++ b/src/main/resources/static/Ordinary/js/card.js
@@ -24,7 +24,12 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				-
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "card_name",
			
 
				                             title: "卡片名",
			
@@ -101,8 +106,8 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/card/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+
			
 
				+                fetchJSON("api/card/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -120,7 +125,7 @@ $(function() {
 
				                             });
			
 
				                         }
			
 
				                         // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
--- a/src/main/resources/static/Ordinary/js/cardAdHoc.js
+++ b/src/main/resources/static/Ordinary/js/cardAdHoc.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "card_name",
			
 
				                             title: "卡片名",
			
@@ -74,6 +76,8 @@ $(function() {
 
				             };
			
 
				             var majorType = "特设";
			
 
				             var name = "";
			
 
				+            var major = "特设"
			
 
				+            type = 1;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/card/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -101,8 +105,8 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/card/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+
			
 
				+                fetchJSON("api/card/getByKeyword?keyword=" + searchTitle + "&major=" + major + "&type=" + type + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -120,7 +124,7 @@ $(function() {
 
				                             });
			
 
				                         }
			
 
				                         // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
--- a/src/main/resources/static/Ordinary/js/cardElectronics.js
+++ b/src/main/resources/static/Ordinary/js/cardElectronics.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "card_name",
			
 
				                             title: "卡片名",
			
@@ -74,6 +76,8 @@ $(function() {
 
				             };
			
 
				             var majorType = "电子";
			
 
				             var name = "";
			
 
				+            var major = "电子"
			
 
				+            type = 1;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/card/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -102,7 +106,7 @@ $(function() {
 
				                 });
			
 
				             } else {
			
 
				                 // var url = ;
			
 
				-                fetchJSON("api/card/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/card/getByKeyword?keyword=" + searchTitle + "&major=" + major + "&type=" + type + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
--- a/src/main/resources/static/Ordinary/js/cardFireControl.js
+++ b/src/main/resources/static/Ordinary/js/cardFireControl.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "card_name",
			
 
				                             title: "卡片名",
			
@@ -74,6 +76,8 @@ $(function() {
 
				             };
			
 
				             var majorType = "火控";
			
 
				             var name = "";
			
 
				+            var major = "火控"
			
 
				+            type = 1;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/card/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -102,7 +106,7 @@ $(function() {
 
				                 });
			
 
				             } else {
			
 
				                 // var url = ;
			
 
				-                fetchJSON("api/card/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/card/getByKeyword?keyword=" + searchTitle + "&major=" + major + "&type=" + type + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
--- a/src/main/resources/static/Ordinary/js/cardFlying.js
+++ b/src/main/resources/static/Ordinary/js/cardFlying.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "card_name",
			
 
				                             title: "卡片名",
			
@@ -74,6 +76,8 @@ $(function() {
 
				             };
			
 
				             var majorType = "飞发";
			
 
				             var name = "";
			
 
				+            var major = "飞发"
			
 
				+            type = 1;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/card/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -102,7 +106,7 @@ $(function() {
 
				                 });
			
 
				             } else {
			
 
				                 // var url = ;
			
 
				-                fetchJSON("api/card/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/card/getByKeyword?keyword=" + searchTitle + "&major=" + major + "&type=" + type + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
--- a/src/main/resources/static/Ordinary/js/cardOrdnance.js
+++ b/src/main/resources/static/Ordinary/js/cardOrdnance.js
@@ -22,9 +22,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				-                            type: "checkbox"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				-
			
 
				                         {
			
 
				                             field: "card_name",
			
 
				                             title: "卡片名",
			
@@ -74,6 +76,8 @@ $(function() {
 
				             };
			
 
				             var majorType = "军械";
			
 
				             var name = "";
			
 
				+            var major = "军械"
			
 
				+            type = 1;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "api/card/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -101,8 +105,7 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("api/card/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/card/getByKeyword?keyword=" + searchTitle + "&major=" + major + "&type=" + type + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
--- a/src/main/resources/static/Ordinary/js/fault.js
+++ b/src/main/resources/static/Ordinary/js/fault.js
@@ -23,6 +23,11 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        }, {
			
 
				                             field: "fault_name",
			
 
				                             title: "案例名称",
			
 
				                             align: "center"
			
@@ -106,7 +111,7 @@ $(function() {
 
				                 // } else {
			
 
				                 //     searchTitle = data.major_type
			
 
				                 // }
			
 
				-                fetchJSON("api/fault/getByName?name=" + searchTitle, {}, "get",
			
 
				+                fetchJSON("api/fault/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get",
			
 
				                     function(data) {
			
 
				                         if (data.status === 0) {
			
 
				                             if (tableFirstLoad) {
			
@@ -125,7 +130,7 @@ $(function() {
 
				                                 });
			
 
				                             }
			
 
				                             console.log(data.data.list)
			
 
				-                            tableOption.data = data.data;
			
 
				+                            tableOption.data = data.data.list;
			
 
				                             table.render(tableOption);
			
 
				                         } else {
			
 
				                             showMsg(data.msg, 2, 2000);
			
@@ -169,8 +174,7 @@ $(function() {
 
				                         data.major_type + "&description=" + data.description + "&file_path=" + data.file_path + "&input_time=" + data.input_time +
			
 
				                         "&fault_time=" + data.fault_time + "&remarks=" + data.remarks
			
 
				                     ),
			
 
				-                    1250,
			
 
				-                    650,
			
 
				+                    1300, 850,
			
 
				                     function() {
			
 
				                         loadAirList(currentPage, currentSize);
			
 
				                     }
			
--- a/src/main/resources/static/Ordinary/js/faultSee.js
+++ b/src/main/resources/static/Ordinary/js/faultSee.js
@@ -96,12 +96,7 @@ $(function() {
 
				                 major_name = data.elem[data.elem.selectedIndex].text;
			
 
				         })
			
 
				 
			
 
				-        // form.on('select(aircraft_type)', function(data) {
			
 
				-        //     aircraft_type = data.elem[data.elem.selectedIndex].text;
			
 
				-        // })
			
 
				-        // form.on('select(major_type)', function(data) {
			
 
				-        //     major_name = data.elem[data.elem.selectedIndex].text;
			
 
				-        // })
			
 
				+
			
 
				 
			
 
				         function getTypes() {
			
 
				             fetchJSON("api/aircraft/listAll", {}, "get", function(ret) {
			
@@ -156,7 +151,7 @@ $(function() {
 
				                         if (ret.data[i].major_name === funcmajor_type) {
			
 
				                             $("#major_type").append(
			
 
				                                 $("<option>", {
			
 
				-                                    value: ret.data[i].id,
			
 
				+                                    // value: ret.data[i].id,
			
 
				                                     text: ret.data[i].major_name,
			
 
				                                     selected: true
			
 
				                                 })
			
@@ -164,7 +159,7 @@ $(function() {
 
				                         } else {
			
 
				                             $("#major_type").append(
			
 
				                                 $("<option>", {
			
 
				-                                    value: ret.data[i].id,
			
 
				+                                    // value: ret.data[i].id,
			
 
				                                     text: ret.data[i].major_name
			
 
				                                 })
			
 
				                             );
			
--- a/src/main/resources/static/Ordinary/js/faultrecord.js
+++ b/src/main/resources/static/Ordinary/js/faultrecord.js
@@ -52,10 +52,12 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				+
			
 
				                         {
			
 
				-                            field: "id",
			
 
				-                            title: "编号",
			
 
				-                            align: "center"
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				                         },
			
 
				                         {
			
 
				                             field: "war_zone",
			
--- a/src/main/resources/static/Ordinary/js/fire_control.js
+++ b/src/main/resources/static/Ordinary/js/fire_control.js
@@ -22,11 +22,26 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        }, {
			
 
				                             field: "fault_name",
			
 
				                             title: "故障名称",
			
 
				                             templet: '#typeTpl',
			
 
				                             align: "center"
			
 
				                         },
			
 
				+                        {
			
 
				+                            field: "book_name",
			
 
				+                            title: "教材",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				+                        {
			
 
				+                            field: "chapter",
			
 
				+                            title: "章节",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "fault_number",
			
 
				                             title: "故障编号",
			
@@ -66,6 +81,8 @@ $(function() {
 
				 
			
 
				             var majorType = "火控";
			
 
				             var name = "";
			
 
				+            var major = "火控";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "/api/fault/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -93,8 +110,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("/api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/fault/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -102,22 +121,27 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
@@ -128,6 +152,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/log.js
+++ b/src/main/resources/static/Ordinary/js/log.js
@@ -53,16 +53,10 @@ $(function() {
 
				                             type: "checkbox"
			
 
				                         },
			
 
				                         {
			
 
				-                            field: "id",
			
 
				-                            title: "序号",
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				                             align: "center",
			
 
				-                            width: 100,
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "arguments",
			
 
				-                            title: "论据",
			
 
				-                            align: "center",
			
 
				-                            width: 100,
			
 
				+                            width: 60
			
 
				                         },
			
 
				                         {
			
 
				                             field: "realName",
			
@@ -87,28 +81,13 @@ $(function() {
 
				                             title: "功能",
			
 
				                             align: "center"
			
 
				                         },
			
 
				-                        {
			
 
				-                            field: "requestUrl",
			
 
				-                            title: "请求URL",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				                         {
			
 
				                             field: "execStatus",
			
 
				                             title: "执行状态",
			
 
				                             align: "center",
			
 
				-                            // templet: function(d) {
			
 
				-                            //     return d.execStatus == 0 ? "成功" : "失败"
			
 
				-                            // }
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "userId",
			
 
				-                            title: "用户编号",
			
 
				-                            align: "center"
			
 
				-                        },
			
 
				-                        {
			
 
				-                            field: "userIp",
			
 
				-                            title: "用户IP",
			
 
				-                            align: "center"
			
 
				+                            templet: function(d) {
			
 
				+                                return d.execStatus == 0 ? "成功" : "失败"
			
 
				+                            }
			
 
				                         },
			
 
				                         {
			
 
				                             fixed: "right",
			
@@ -120,33 +99,62 @@ $(function() {
 
				                     ]
			
 
				                 ]
			
 
				             };
			
 
				+            let log = {
			
 
				+                realName: searchTitleKey,
			
 
				 
			
 
				-            var url = "api/log/listByName?realName=" + searchTitle + "&page=" + (page + 1) + "&size=" + size;
			
 
				-            if (searchTitle === null || searchTitle === undefined || searchTitle === "") url = "api/log/listpage?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;
			
 
				-                                loadLogList(currentPage, currentSize, searchTitleKey);
			
 
				-                            }
			
 
				-                        });
			
 
				+            }
			
 
				+            if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				+                fetchJSON("api/log/listpage?page=" + (page + 1) + "&size=" + size, {}, "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;
			
 
				+                                    loadLogList(currentPage, currentSize, searchTitleKey);
			
 
				+                                }
			
 
				+                            });
			
 
				+                        }
			
 
				+                        console.log(data.data.list[0].realName)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				+                        table.render(tableOption);
			
 
				+                    } else {
			
 
				+                        showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				-                    tableOption.data = data.data.list;
			
 
				-                    table.render(tableOption);
			
 
				-                } else {
			
 
				-                    showMsg(data.msg, 2, 2000);
			
 
				-                }
			
 
				-            });
			
 
				+                });
			
 
				+            } else {
			
 
				+                fetchJSON("api/log/findByLog?page=" + (page + 1) + "&size=" + size, log, "post", 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;
			
 
				+                                    loadLogList(currentPage, currentSize, searchTitleKey);
			
 
				+                                }
			
 
				+                            });
			
 
				+                        }
			
 
				+
			
 
				+                        tableOption.data = data.data.list;
			
 
				+                        table.render(tableOption);
			
 
				+                    } else {
			
 
				+                        showMsg(data.msg, 2, 2000);
			
 
				+                    }
			
 
				+                });
			
 
				+            }
			
 
				         }
			
 
				 
			
 
				         loadLogList();
			
--- a/src/main/resources/static/Ordinary/js/major.js
+++ b/src/main/resources/static/Ordinary/js/major.js
@@ -23,7 +23,12 @@ $(function() {
 
				                 cols: [
			
 
				                     [
			
 
				                         { type: "checkbox" },
			
 
				-                        { field: "id", title: "编号", width: 100, align: "center" },
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         { field: "major_name", title: "专业名", align: "center" },
			
 
				                         { field: "remarks", title: "备注", align: "center" },
			
 
				                         { fixed: "right", title: "操作", toolbar: "#operationToolbar", align: "center" }
			
@@ -57,7 +62,7 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                fetchJSON("/api/major/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("/api/major/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -75,7 +80,7 @@ $(function() {
 
				                             });
			
 
				                         }
			
 
				 
			
 
				-                        tableOption.data = data.data;
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
--- a/src/main/resources/static/Ordinary/js/manuel.js
+++ b/src/main/resources/static/Ordinary/js/manuel.js
@@ -23,7 +23,12 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				-
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "manuel_name",
			
 
				                             title: "维修名称",
			
@@ -95,7 +100,7 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                fetchJSON("api/manuel/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/manuel/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -113,7 +118,7 @@ $(function() {
 
				                             });
			
 
				                         }
			
 
				 
			
 
				-                        tableOption.data = data.data;
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
--- a/src/main/resources/static/Ordinary/js/ordnance.js
+++ b/src/main/resources/static/Ordinary/js/ordnance.js
@@ -22,11 +22,26 @@ $(function() {
 
				                 limit: size,
			
 
				                 cols: [
			
 
				                     [{
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        }, {
			
 
				                             field: "fault_name",
			
 
				                             title: "故障名称",
			
 
				                             templet: '#typeTpl',
			
 
				                             align: "center"
			
 
				                         },
			
 
				+                        {
			
 
				+                            field: "book_name",
			
 
				+                            title: "教材",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				+                        {
			
 
				+                            field: "chapter",
			
 
				+                            title: "章节",
			
 
				+                            align: "center"
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "fault_number",
			
 
				                             title: "故障编号",
			
@@ -71,6 +86,8 @@ $(function() {
 
				 
			
 
				             var majorType = "军械";
			
 
				             var name = "";
			
 
				+            var major = "军械";
			
 
				+            var search = 0;
			
 
				             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
			
 
				                 var url = "/api/fault/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
			
 
				                 fetchJSON(url, {}, "get", function(data) {
			
@@ -98,8 +115,10 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                // var url = ;
			
 
				-                fetchJSON("/api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                var url = "api/fault/getByKeyword?major=" + major + "&keyword=" +
			
 
				+                    searchTitle + "&type=" + search +
			
 
				+                    "&size=" + size + "&page=" + (page + 1)
			
 
				+                fetchJSON(url, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -107,22 +126,27 @@ $(function() {
 
				                                 curr: page + 1,
			
 
				                                 elem: "pagination",
			
 
				                                 count: data.data.total,
			
 
				-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
			
 
				+                                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, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize,
			
 
				+                                        searchTitleKey);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				-                        tableOption.data = data.data;
			
 
				+                        console.log(data.data.list)
			
 
				+                        tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
 
				                     }
			
 
				                 });
			
 
				+
			
 
				             }
			
 
				 
			
 
				 
			
@@ -133,6 +157,7 @@ $(function() {
 
				             e.preventDefault();
			
 
				             tableFirstLoad = true;
			
 
				             searchTitleKey = title.val().trim();
			
 
				+            search = $("#find").find("option:selected").val();
			
 
				             if (searchTitleKey === "")
			
 
				                 loadAirList(0, currentSize);
			
 
				             else
			
--- a/src/main/resources/static/Ordinary/js/outline.js
+++ b/src/main/resources/static/Ordinary/js/outline.js
@@ -23,7 +23,12 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				-
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "outline_name",
			
 
				                             title: "大纲名称",
			
@@ -41,7 +46,7 @@ $(function() {
 
				                         },
			
 
				                         {
			
 
				                             field: "major_type",
			
 
				-                            title: "主要机型",
			
 
				+                            title: "专业",
			
 
				                             align: "center"
			
 
				                         },
			
 
				                         {
			
@@ -102,7 +107,7 @@ $(function() {
 
				                     }
			
 
				                 });
			
 
				             } else {
			
 
				-                fetchJSON("api/outline/getByName?name=" + searchTitle, {}, "get", function(data) {
			
 
				+                fetchJSON("api/outline/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
			
 
				                     if (data.status === 0) {
			
 
				                         if (tableFirstLoad) {
			
 
				                             tableFirstLoad = false;
			
@@ -120,7 +125,7 @@ $(function() {
 
				                             });
			
 
				                         }
			
 
				 
			
 
				-                        tableOption.data = data.data;
			
 
				+                        tableOption.data = data.data.list;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
@@ -164,7 +169,7 @@ $(function() {
 
				                         "&input_time=" + data.input_time + "&remarks=" + data.remarks
			
 
				                     ),
			
 
				                     800,
			
 
				-                    350,
			
 
				+                    380,
			
 
				                     function() {
			
 
				                         loadoutLineList(currentPage, currentSize);
			
 
				                     }
			
@@ -223,7 +228,7 @@ $(function() {
 
				             x_admin_show("添加",
			
 
				                 "outline-add.html?id=0&outline_name=&chapter_name=&aircraft_type=&major_type=&description=&input_time=&file_path=&remarks=",
			
 
				                 800,
			
 
				-                400,
			
 
				+                450,
			
 
				                 function() {
			
 
				                     loadoutLineList(currentPage, currentSize);
			
 
				                 });
			
--- a/src/main/resources/static/Ordinary/js/rights.js
+++ b/src/main/resources/static/Ordinary/js/rights.js
@@ -22,6 +22,12 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "rightsName",
			
 
				                             title: "功能名",
			
--- a/src/main/resources/static/Ordinary/js/role.js
+++ b/src/main/resources/static/Ordinary/js/role.js
@@ -22,9 +22,15 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "roleName",
			
 
				-                            title: "角色名",
			
 
				+                            title: "角色名称",
			
 
				                             align: "center"
			
 
				                         },
			
 
				                         // {
			
--- a/src/main/resources/static/Ordinary/js/roleEdit.js
+++ b/src/main/resources/static/Ordinary/js/roleEdit.js
@@ -28,7 +28,7 @@ $(function() {
 
				                     [
			
 
				                         { type: "checkbox" },
			
 
				                         { field: "id", title: "序号", align: "center" },
			
 
				-                        { field: "rightsName", title: "角色名", align: "left" },
			
 
				+                        { field: "rightsName", title: "角色名", align: "center" },
			
 
				                         { field: "isHave", title: "具备权限", templet: "#sw", align: "center" }
			
 
				                     ]
			
 
				                 ]
			
--- a/src/main/resources/static/Ordinary/js/second1.js
+++ b/src/main/resources/static/Ordinary/js/second1.js
@@ -109,109 +109,132 @@ $(function() {
 
				             }
			
 
				         });
			
 
				 
			
 
				-        function getMajorType() {
			
 
				-            fetchJSON("api/aircraft/listAll", {}, "get", function(ret) {
			
 
				-                console.log(ret)
			
 
				-                if (ret.status === 0) {
			
 
				+        function aircraft_type() {
			
 
				+            fetchJSON("api/aircraft/listAll", {}, "get", function(bet) {
			
 
				+                // console.log(bet, "121111111")
			
 
				+                if (bet.status === 0) {
			
 
				                     $("#aircraft_type").empty();
			
 
				                     $("#aircraft_type").append($("<option>", {
			
 
				                         value: -1,
			
 
				-                        text: "请选择"
			
 
				+                        text: "请选择机型"
			
 
				                     }));
			
 
				-                    for (var i = 0; i < ret.data.length; i++) {
			
 
				-
			
 
				-                        $("#aircraft_type").append(
			
 
				-                            $("<option>", {
			
 
				-                                value: ret.data[i].id,
			
 
				-                                text: ret.data[i].aircraft_type
			
 
				-                            })
			
 
				-                        );
			
 
				-
			
 
				+                    for (var i = 0; i < bet.data.length; i++) {
			
 
				+                        if (bet.data[i].id === majorId) {
			
 
				+                            $("#aircraft_type").append(
			
 
				+                                $("<option>", {
			
 
				+                                    // value: bet.data[i].id,
			
 
				+                                    text: bet.data[i].aircraft_type,
			
 
				+                                    selected: true
			
 
				+                                })
			
 
				+                            );
			
 
				+                        } else {
			
 
				+                            $("#aircraft_type").append(
			
 
				+                                $("<option>", {
			
 
				+                                    // value: bet.data[i].id,
			
 
				+                                    text: bet.data[i].aircraft_type
			
 
				+                                })
			
 
				+                            );
			
 
				+                        }
			
 
				                     }
			
 
				                     form.render('select');
			
 
				                 } else {
			
 
				-                    showMsg(ret.msg, 2);
			
 
				+                    showMsg(bet.msg, 2);
			
 
				                 }
			
 
				             });
			
 
				         }
			
 
				-        getMajorType();
			
 
				-
			
 
				-        function getMajor() {
			
 
				-            $("#major_type").empty();
			
 
				-            $("#major_type").append($("<option>", {
			
 
				-                value: -1,
			
 
				-                text: "请选择"
			
 
				-            }));
			
 
				-            for (var i = 0; i < arr.length; i++) {
			
 
				+        aircraft_type()
			
 
				 
			
 
				-                $("#major_type").append(
			
 
				-                    $("<option>", {
			
 
				-                        value: arr[i].id,
			
 
				-                        text: arr[i].name
			
 
				-                    })
			
 
				-                );
			
 
				 
			
 
				-            }
			
 
				-            form.render('select');
			
 
				+        function getMajor() {
			
 
				+            fetchJSON("api/major/listAll", {}, "get", function(ret) {
			
 
				 
			
 
				+                if (ret.status === 0) {
			
 
				+                    $("#major_type").empty();
			
 
				+                    $("#major_type").append($("<option>", {
			
 
				+                        value: -1,
			
 
				+                        text: "请选择"
			
 
				+                    }));
			
 
				+                    for (var i = 0; i < ret.data.length; i++) {
			
 
				+                        if (ret.data[i].major_name === funcmajor_type) {
			
 
				+                            $("#major_type").append(
			
 
				+                                $("<option>", {
			
 
				+                                    // value: ret.data[i].id,
			
 
				+                                    text: ret.data[i].major_name,
			
 
				+                                    selected: true
			
 
				+                                })
			
 
				+                            );
			
 
				+                        } else {
			
 
				+                            $("#major_type").append(
			
 
				+                                $("<option>", {
			
 
				+                                    // value: ret.data[i].id,
			
 
				+                                    text: ret.data[i].major_name
			
 
				+                                })
			
 
				+                            );
			
 
				+                        }
			
 
				+                    }
			
 
				+                    form.render('select');
			
 
				+                } else {
			
 
				+                    showMsg(res.msg, 2);
			
 
				+                }
			
 
				+            });
			
 
				         }
			
 
				         getMajor();
			
 
				         form.on("submit(save)", function(data) {
			
 
				-            if ($("#fault_name").val().trim() === "") {
			
 
				-                showMsg("案例名称不能为空", 2);
			
 
				-                $("#fault_name").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#fault_number").val().trim() === "") {
			
 
				-                showMsg("案例提供单位不能为空", 2);
			
 
				-                $("#fault_number").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#author").val().trim() === "") {
			
 
				-                showMsg("作者不能为空", 2);
			
 
				-                $("#author").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#department").val().trim() === "") {
			
 
				-                showMsg("案例编号不能为空", 2);
			
 
				-                $("#department").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#aircraft_type").val().trim() === "") {
			
 
				-                showMsg("机型不能为空", 2);
			
 
				-                $("#aircraft_type").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#major_type").val().trim() === "") {
			
 
				-                showMsg("专业不能为空", 2);
			
 
				-                $("#major_type").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#description").val().trim() === "") {
			
 
				-                showMsg("故障件名称不能为空", 2);
			
 
				-                $("#description").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#input_time").val().trim() === "") {
			
 
				-                showMsg("日期不能为空", 2);
			
 
				-                $("#input_time").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#fault_time").val().trim() === "") {
			
 
				-                showMsg("故障时间不能为空", 2);
			
 
				-                $("#fault_time").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#book_name").val().trim() === "") {
			
 
				-                showMsg("关键词不能为空", 2);
			
 
				-                $("#book_name").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				-            if ($("#chapter").val().trim() === "") {
			
 
				-                showMsg("教材章节不能为空", 2);
			
 
				-                $("#chapter").focus();
			
 
				-                return false;
			
 
				-            }
			
 
				+            // if ($("#fault_name").val().trim() === "") {
			
 
				+            //     showMsg("案例名称不能为空", 2);
			
 
				+            //     $("#fault_name").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#fault_number").val().trim() === "") {
			
 
				+            //     showMsg("案例提供单位不能为空", 2);
			
 
				+            //     $("#fault_number").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#author").val().trim() === "") {
			
 
				+            //     showMsg("作者不能为空", 2);
			
 
				+            //     $("#author").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#department").val().trim() === "") {
			
 
				+            //     showMsg("案例编号不能为空", 2);
			
 
				+            //     $("#department").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#aircraft_type").val().trim() === "") {
			
 
				+            //     showMsg("机型不能为空", 2);
			
 
				+            //     $("#aircraft_type").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#major_type").val().trim() === "") {
			
 
				+            //     showMsg("专业不能为空", 2);
			
 
				+            //     $("#major_type").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#description").val().trim() === "") {
			
 
				+            //     showMsg("故障件名称不能为空", 2);
			
 
				+            //     $("#description").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#input_time").val().trim() === "") {
			
 
				+            //     showMsg("日期不能为空", 2);
			
 
				+            //     $("#input_time").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#fault_time").val().trim() === "") {
			
 
				+            //     showMsg("故障时间不能为空", 2);
			
 
				+            //     $("#fault_time").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#book_name").val().trim() === "") {
			
 
				+            //     showMsg("关键词不能为空", 2);
			
 
				+            //     $("#book_name").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				+            // if ($("#chapter").val().trim() === "") {
			
 
				+            //     showMsg("教材章节不能为空", 2);
			
 
				+            //     $("#chapter").focus();
			
 
				+            //     return false;
			
 
				+            // }
			
 
				             var func = data.field;
			
 
				             func.id = funcId;
			
 
				             fetchJSON("api/fault/add", func, "post", function(data) {
			
--- a/src/main/resources/static/Ordinary/js/user.js
+++ b/src/main/resources/static/Ordinary/js/user.js
@@ -10,7 +10,7 @@ $(function() {
 
				         var laypage = layui.laypage;
			
 
				         var layer = layui.layer;
			
 
				         var form = layui.form;
			
 
				-        var title = $("#realName");
			
 
				+        var title = $("#userName");
			
 
				         var searchTitleKey = "";
			
 
				 
			
 
				         function loadUserList(page, size, searchTitle) {
			
@@ -25,14 +25,20 @@ $(function() {
 
				                     [{
			
 
				                             type: "checkbox"
			
 
				                         },
			
 
				+                        {
			
 
				+                            title: '序号',
			
 
				+                            templet: '#xuhao',
			
 
				+                            align: "center",
			
 
				+                            width: 60
			
 
				+                        },
			
 
				                         {
			
 
				                             field: "userName",
			
 
				-                            title: "账号",
			
 
				+                            title: "姓名",
			
 
				                             align: "center"
			
 
				                         },
			
 
				                         {
			
 
				                             field: "realName",
			
 
				-                            title: "姓名",
			
 
				+                            title: "用户名",
			
 
				                             align: "center"
			
 
				                         },
			
 
				                         {
			
--- a/src/main/resources/static/Ordinary/log.html
+++ b/src/main/resources/static/Ordinary/log.html
@@ -3,7 +3,7 @@
 
				 
			
 
				 <head>
			
 
				     <meta charset="UTF-8">
			
 
				-    <title>故障信息管理系统-日志管理</title>
			
 
				+    <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">
			
@@ -15,6 +15,7 @@
 
				     <script src="./js/xadmin.js"></script>
			
 
				     <script src="../other/js/functions.js"></script>
			
 
				     <script src="./js/log.js"></script>
			
 
				+
			
 
				     <style>
			
 
				         .layui-border-box {
			
 
				             height: 428px!important;
			
@@ -47,8 +48,7 @@
 
				 
			
 
				             <div class="layui-input-inline x-so " style="padding-top: 20px;padding-left: 10px">
			
 
				 
			
 
				-                <input id="realName" type="text" name="realName" placeholder="请输入用户姓名" autocomplete="off" class="layui-input" style="width: 200px;
			
 
				-                height: 30px;">
			
 
				+                <input id="realName" type="text" name="realName" placeholder="请输入姓名" autocomplete="off" class="layui-input">
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				 						<i class="layui-icon">&#xe615;</i>
			
 
				 					</button>
			
@@ -62,6 +62,9 @@
 
				         <script type="text/html" id="operationToolbar">
			
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				+        <script type="text/html" id="xuhao">
			
 
				+            {{d.LAY_TABLE_INDEX+1}}
			
 
				+        </script>
			
 
				     </div>
			
 
				 </body>
			
 
				 
			
--- a/src/main/resources/static/Ordinary/major.html
+++ b/src/main/resources/static/Ordinary/major.html
@@ -45,14 +45,14 @@
 
				     <div class="x-body">
			
 
				         <form class="layui-form">
			
 
				             <button id="addmajor" class="layui-btn layui-btn-sm">
			
 
				-        <i class="layui-icon">&#xe61f;</i>增加</button>
			
 
				+        <i class="layui-icon">&#xe61f;</i>添加</button>
			
 
				             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger " style="padding-right: 10px;">
			
 
				             <i class="layui-icon">&#xe640;</i> 批量删除</button>
			
 
				             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				                 <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
			
 
				             </a>
			
 
				             <div class="search">
			
 
				-                <input id="major_name" type="text" name="major_name" placeholder="请输入名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				+                <input id="major_name" type="text" name="major_name" placeholder="请输入专业名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                   <i class="layui-icon">&#xe615;</i>
			
 
				                 </button>
			
@@ -66,6 +66,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/manuel.html
+++ b/src/main/resources/static/Ordinary/manuel.html
@@ -66,6 +66,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/ordnance.html
+++ b/src/main/resources/static/Ordinary/ordnance.html
@@ -42,7 +42,27 @@
 
				 <body class="layui-anim layui-anim-up">
			
 
				 
			
 
				     <div class="x-body">
			
 
				+        <form class="layui-form">
			
 
				 
			
 
				+            <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
			
 
				+                <i class="layui-icon">&#xe67c;</i>导入</button> -->
			
 
				+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
			
 
				+
			
 
				+            <!-- 多条件查询 -->
			
 
				+            <div class="search">
			
 
				+                <div class="layui-input-inline">
			
 
				+                    <select name="find" id="find" lay-search="find" lay-verify="required"></select>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+
			
 
				+            <div class="search">
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" style="width: 200px;display: inline-block;">
			
 
				+                <button id="searchArticle" style="height: 36px;" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				+                    <i class="layui-icon">&#xe615;</i>
			
 
				+                </button>
			
 
				+            </div>
			
 
				+        </form>
			
 
				         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
			
 
				         </table>
			
 
				         <div id="pagination"></div>
			
@@ -51,6 +71,37 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				+    <script>
			
 
				+        let arr = [{
			
 
				+                id: 0,
			
 
				+                name: "全部查询"
			
 
				+            }, {
			
 
				+                id: 1,
			
 
				+                name: "教材名称"
			
 
				+            }, {
			
 
				+                id: 2,
			
 
				+                name: "案例名称"
			
 
				+            },
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        function getfind() {
			
 
				+            for (var i = 0; i < arr.length; i++) {
			
 
				+                $("#find").append(
			
 
				+                    $("<option>", {
			
 
				+                        value: arr[i].id,
			
 
				+                        text: arr[i].name
			
 
				+                    })
			
 
				+                );
			
 
				+                console.log(arr[i].name)
			
 
				+            }
			
 
				+
			
 
				+        };
			
 
				+        getfind()
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/outline-edit.html
+++ b/src/main/resources/static/Ordinary/outline-edit.html
@@ -51,7 +51,7 @@
 
				                     </div>
			
 
				                     <div class="layui-col-sm6">
			
 
				                         <div class="layui-form-item">
			
 
				-                            <label for="major_type" class="layui-form-label">主要机型</label>
			
 
				+                            <label for="major_type" class="layui-form-label">专业</label>
			
 
				                             <div class="layui-input-inline">
			
 
				                                 <input type="text" id="major_type" name="major_type" autocomplete="off" class="layui-input">
			
 
				                             </div>
			
--- a/src/main/resources/static/Ordinary/outline.html
+++ b/src/main/resources/static/Ordinary/outline.html
@@ -44,7 +44,7 @@
 
				     <div class="x-body">
			
 
				         <form class="layui-form">
			
 
				             <button id="addoutline" class="layui-btn layui-btn-sm">
			
 
				-        <i class="layui-icon">&#xe61f;</i>增加</button>
			
 
				+        <i class="layui-icon">&#xe61f;</i>添加</button>
			
 
				             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger " style="padding-right: 10px;">
			
 
				             <i class="layui-icon">&#xe640;</i> 批量删除</button>
			
 
				             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
@@ -67,6 +67,9 @@
 
				         </script>
			
 
				 
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/rights-edit.html
+++ b/src/main/resources/static/Ordinary/rights-edit.html
@@ -46,9 +46,11 @@
 
				                 <div class="layui-row">
			
 
				                     <div class="layui-col-sm6">
			
 
				                         <div class="layui-form-item">
			
 
				-                            <label for="isHide" class="layui-form-label">启用状态</label>
			
 
				-                            <div class="layui-input-inline" style="padding-top:8px">
			
 
				-                                <input id="isHide" type="checkbox" name="isHide" lay-filter="isHide" lay-skin="switch" lay-text="启用|禁用">
			
 
				+                            <label for="remark" class="layui-form-label">
			
 
				+                <span class="x-red">*</span> 描述
			
 
				+              </label>
			
 
				+                            <div class="layui-input-inline">
			
 
				+                                <input type="text" id="remark" name="remark" autocomplete="off" class="layui-input">
			
 
				                             </div>
			
 
				                         </div>
			
 
				                     </div>
			
@@ -56,15 +58,14 @@
 
				                 <div class="layui-row">
			
 
				                     <div class="layui-col-sm6">
			
 
				                         <div class="layui-form-item">
			
 
				-                            <label for="remark" class="layui-form-label">
			
 
				-                <span class="x-red">*</span> 描述
			
 
				-              </label>
			
 
				-                            <div class="layui-input-inline">
			
 
				-                                <input type="text" id="remark" name="remark" autocomplete="off" class="layui-input">
			
 
				+                            <label for="isHide" class="layui-form-label">启用状态</label>
			
 
				+                            <div class="layui-input-inline" style="padding-top:8px">
			
 
				+                                <input id="isHide" type="checkbox" name="isHide" lay-filter="isHide" lay-skin="switch" lay-text="启用|禁用">
			
 
				                             </div>
			
 
				                         </div>
			
 
				                     </div>
			
 
				                 </div>
			
 
				+
			
 
				             </div>
			
 
				             <br>
			
 
				             <div class="layui-row" style="text-align: center;">
			
--- a/src/main/resources/static/Ordinary/rights.html
+++ b/src/main/resources/static/Ordinary/rights.html
@@ -35,7 +35,7 @@
 
				     <div class="x-body">
			
 
				         <form class="layui-form">
			
 
				             <button id="addRights" class="layui-btn layui-btn-sm">
			
 
				-        <i class="layui-icon">&#xe61f;</i>新建权限</button>
			
 
				+        <i class="layui-icon">&#xe61f;</i>添加权限</button>
			
 
				             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
 
				                 <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
			
 
				             </a>
			
@@ -48,6 +48,9 @@
 
				             <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
			
 
				         </script>
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/role.html
+++ b/src/main/resources/static/Ordinary/role.html
@@ -35,7 +35,7 @@
 
				     <div class="x-body">
			
 
				         <form class="layui-form">
			
 
				             <button id="addUser" class="layui-btn layui-btn-sm">
			
 
				-					<i class="layui-icon">&#xe61f;</i> 新建角色</button>
			
 
				+					<i class="layui-icon">&#xe61f;</i> 添加角色</button>
			
 
				             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger" style="padding-right: 10px;">
			
 
				 					<i class="layui-icon">&#xe640;</i> 批量删除</button>
			
 
				 
			
@@ -51,7 +51,9 @@
 
				             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
			
 
				         </script>
			
 
				     </div>
			
 
				-
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/Ordinary/user.html
+++ b/src/main/resources/static/Ordinary/user.html
@@ -27,6 +27,18 @@
 
				         #pagination {
			
 
				             margin-top: 45px;
			
 
				         }
			
 
				+        /* 修改原有表格的样子 */
			
 
				+        
			
 
				+        .layui-table thead tr {
			
 
				+            background-color: #009688!important;
			
 
				+        }
			
 
				+        
			
 
				+        .layui-table th {
			
 
				+            padding: 5px 0;
			
 
				+            border-top: none;
			
 
				+            border-left: none;
			
 
				+            color: azure;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -34,7 +46,7 @@
 
				     <div class="x-body">
			
 
				         <form class="layui-form" style="height: 30px;margin-top:-20px">
			
 
				             <button id="addUser" class="layui-btn layui-btn-sm" style="padding-right: 10px;">
			
 
				-					<i class="layui-icon">&#xe61f;</i> 新建用户</button>
			
 
				+					<i class="layui-icon">&#xe61f;</i> 添加用户</button>
			
 
				             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger" style="padding-right: 10px;">
			
 
				 					<i class="layui-icon">&#xe640;</i> 批量删除</button>
			
 
				             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
			
@@ -42,7 +54,7 @@
 
				             </a>
			
 
				             <div class="layui-input-inline x-so " style="padding-top: 20px;padding-left: 10px">
			
 
				 
			
 
				-                <input id="realName" type="text" name="name" placeholder="请输入用户姓名" autocomplete="off" class="layui-input" style="width: 200px;
			
 
				+                <input id="userName" type="text" name="name" placeholder="请输入用户名" autocomplete="off" class="layui-input" style="width: 200px;
			
 
				                 height: 30px;">
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				 						<i class="layui-icon">&#xe615;</i>
			
@@ -57,6 +69,9 @@
 
				         </script>
			
 
				 
			
 
				     </div>
			
 
				+    <script type="text/html" id="xuhao">
			
 
				+        {{d.LAY_TABLE_INDEX+1}}
			
 
				+    </script>
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/admin/Ubook.html
+++ b/src/main/resources/static/admin/Ubook.html
@@ -152,7 +152,7 @@
 
				         <div id="pagination"></div>
			
 
				         <script type="text/html" id="operationToolbar">
			
 
				             <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
			
 
				-
			
 
				+            <!-- <a class="layui-btn layui-btn-xs" lay-event="catalog">目录</a> -->
			
 
				         </script>
			
 
				         <script type="text/html" id="typeTpl">
			
 
				             <a target="_blank " href="javascript:; "> <img src="./images/1.jpg" alt=""> </a>
			
@@ -170,6 +170,7 @@
 
				                         <div id="box" style="">
			
 
				                             <h3>作者：{{d.author}}</h3>
			
 
				                             <h3>开始时间： {{d.input_time}}</h3>
			
 
				+
			
 
				                         </div>
			
 
				                     </a>
			
 
				                 </div>
			
@@ -182,6 +183,7 @@
 
				             <h3>出版时间：{{d.publish_time}}</h3>
			
 
				         </script>
			
 
				     </div>
			
 
				+
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/admin/UbookSee.html
+++ b/src/main/resources/static/admin/UbookSee.html
@@ -91,27 +91,6 @@
 
				             </div>
			
 
				         </form>
			
 
				     </div>
			
 
				-    <script type="text/html" id="typeTpl">
			
 
				-        <a target="_blank " href="UbookBullet.html"> {{d.book_name}}</a>
			
 
				-
			
 
				-    </script>
			
 
				-    <script>
			
 
				-        $(function() {
			
 
				-            let funcfile_path = '';
			
 
				-            var params = window.location.href.split("?");
			
 
				-            if (params.length > 1) {
			
 
				-                values = params[1].split("=");
			
 
				-                if (values[1].length > 13) {
			
 
				-                    funcfile_path = decodeURI(values[1]);
			
 
				-                }
			
 
				-            }
			
 
				-            if (funcfile_path !== '') {
			
 
				-                $("#box").attr('src', "../other/pdfjs/web/viewer.html?file=" + urlBase + funcfile_path + "&page=12&top=150&zoom=1.5");
			
 
				-            }
			
 
				-
			
 
				-        });
			
 
				-    </script>
			
 
				-
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/main/resources/static/admin/Ufault.html
+++ b/src/main/resources/static/admin/Ufault.html
@@ -70,6 +70,7 @@
 
				         
			
 
				         .layui-border-box {
			
 
				             height: 238px!important;
			
 
				+            border-radius: 4%;
			
 
				         }
			
 
				         
			
 
				         .layui-table-body {
			
@@ -82,6 +83,7 @@
 
				             float: left;
			
 
				             border: 1px solid #ccc;
			
 
				             margin-right: 58px;
			
 
				+            border-radius: 3%;
			
 
				         }
			
 
				         
			
 
				         .fault:nth-child(1),
			
@@ -97,6 +99,17 @@
 
				         .layui-table {
			
 
				             margin: 0 0 -10px 0;
			
 
				         }
			
 
				+        
			
 
				+        .layui-table thead tr {
			
 
				+            background-color: #f2f2f2;
			
 
				+            border-radius: 4%;
			
 
				+        }
			
 
				+        
			
 
				+        .layui-table-view {
			
 
				+            border-width: 1px;
			
 
				+            border-style: solid;
			
 
				+            border-color: white;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -111,7 +124,7 @@
 
				             <a href="UfaultEle.html ">电子</a><span>|</span>
			
 
				             <a href="UfaultHoc.html ">特设</a><span>|</span>
			
 
				             <a href="UfaultNo.html ">其他</a>
			
 
				-            <a style=" margin:-8px 10px 0 20px;float:right;display:block;color:red" href="first.html " title="返回">
			
 
				+            <a style=" margin:-10px 10px 0 20px;float:right;display:block;color:red" href="first.html " title="返回">
			
 
				                  返回
			
 
				             </a>
			
 
				         </div>
			
@@ -128,9 +141,9 @@
 
				             <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id: 'airList'} ">
			
 
				             </table>
			
 
				 
			
 
				-            <a href="UfaultFlying.html" style="float:right;color:green;font-size:14px;margin-top:-8px ">查看更多</a>
			
 
				+            <a href="UfaultFlying.html" style="float:right;color:green;font-size:14px;margin-top:-8px;margin-right: 8px; ">查看更多</a>
			
 
				             <script type="text/html" id="operationToolbar">
			
 
				-                <a class="layui-btn layui-btn-xs" lay-event="edit" style="">在线预览</a>
			
 
				+                <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
			
 
				             </script>
			
 
				         </div>
			
 
				         <div class="fault">
			
@@ -138,7 +151,7 @@
 
				             <table id="ordnanceList" class="layui-table" lay-filter="ordnanceList" lay-data="{id:ordnanceList'}">
			
 
				             </table>
			
 
				 
			
 
				-            <a href="UfaultOrdnance.html" style="float:right;color:green;font-size:14px;margin-top:-8px">查看更多</a>
			
 
				+            <a href="UfaultOrdnance.html" style="float:right;color:green;font-size:14px;margin-top:-8px; margin-right: 8px;">查看更多</a>
			
 
				             <script type="text/html" id="operationToolbar">
			
 
				                 <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
			
 
				             </script>
			
@@ -146,7 +159,7 @@
 
				         <div class="fault">
			
 
				             <table id="fireList" class="layui-table" lay-filter="fireList" lay-data="{id:fireList'} ">
			
 
				             </table>
			
 
				-            <a href="UfaultFire.html" style="float:right;color:green;font-size:14px;margin-top:-8px ">查看更多</a>
			
 
				+            <a href="UfaultFire.html" style="float:right;color:green;font-size:14px;margin-top:-8px;margin-right: 8px; ">查看更多</a>
			
 
				             <script type="text/html" id="operationToolbar">
			
 
				                 <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
			
 
				             </script>
			
@@ -154,7 +167,7 @@
 
				         <div class="fault" style="margin-top:85px">
			
 
				             <table id="eleList" class="layui-table" lay-filter="eleList" lay-data="{id:eleList'}">
			
 
				             </table>
			
 
				-            <a href="UfaultEle.html" style="float:right;color:green;font-size:14px;margin-top:-8px ">查看更多</a>
			
 
				+            <a href="UfaultEle.html" style="float:right;color:green;font-size:14px;margin-top:-8px;margin-right: 8px; ">查看更多</a>
			
 
				             <script type="text/html" id="operationToolbar">
			
 
				                 <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
			
 
				 
			
@@ -163,7 +176,7 @@
 
				         <div class="fault" style="margin-top:85px">
			
 
				             <table id="hocList" class="layui-table" lay-filter="hocList" lay-data="{id:hocList'} ">
			
 
				             </table>
			
 
				-            <a href="UfaultHoc.html" style="float:right;color:green;font-size:14px;margin-top:-8px ">查看更多</a>
			
 
				+            <a href="UfaultHoc.html" style="float:right;color:green;font-size:14px;margin-top:-8px;margin-right: 8px; ">查看更多</a>
			
 
				             <script type="text/html" id="operationToolbar">
			
 
				                 <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
			
 
				             </script>
			
@@ -171,7 +184,7 @@
 
				         <div class="fault" style="margin-top:85px ">
			
 
				             <table id="noList" class="layui-table" lay-filter="noList" lay-data="{id:noList'}">
			
 
				             </table>
			
 
				-            <a href="UfaultNo.html" style="float:right;color:green;font-size:14px;margin-top:-8px ">查看更多</a>
			
 
				+            <a href="UfaultNo.html" style="float:right;color:green;font-size:14px;margin-top:-8px;margin-right: 8px; ">查看更多</a>
			
 
				             <script type="text/html" id="operationToolbar">
			
 
				                 <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
			
 
				             </script>
			
--- a/src/main/resources/static/admin/UfaultEle.html
+++ b/src/main/resources/static/admin/UfaultEle.html
@@ -45,6 +45,12 @@
 
				         .layui-table td {
			
 
				             padding: 0px!important;
			
 
				         } */
			
 
				+        /* 修改表格 */
			
 
				+        
			
 
				+        .x-body {
			
 
				+            width: 800px;
			
 
				+            margin: 0 auto;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -53,7 +59,7 @@
 
				     <div class="x-body">
			
 
				         <form class="layui-form">
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="name" placeholder="请输入电子案例名称" autocomplete="off" class="layui-input" style='width: 1235px;height: 36px;'>
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入电子案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                       <i class="layui-icon">&#xe615;</i>
			
 
				                     </button>
			
--- a/src/main/resources/static/admin/UfaultFire.html
+++ b/src/main/resources/static/admin/UfaultFire.html
@@ -45,6 +45,11 @@
 
				         .layui-table td {
			
 
				             padding: 0px!important;
			
 
				         } */
			
 
				+        
			
 
				+        .x-body {
			
 
				+            width: 800px;
			
 
				+            margin: 0 auto;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -53,7 +58,7 @@
 
				     <div class="x-body">
			
 
				         <form class="layui-form">
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="name" placeholder="请输入火控案例名称" autocomplete="off" class="layui-input" style='width: 1235px;height: 36px;'>
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入火控案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                       <i class="layui-icon">&#xe615;</i>
			
 
				                     </button>
			
--- a/src/main/resources/static/admin/UfaultFlying.html
+++ b/src/main/resources/static/admin/UfaultFlying.html
@@ -45,6 +45,11 @@
 
				         .layui-table td {
			
 
				             padding: 0px!important;
			
 
				         } */
			
 
				+        
			
 
				+        .x-body {
			
 
				+            width: 800px;
			
 
				+            margin: 0 auto;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -54,7 +59,7 @@
 
				 
			
 
				         <form class="layui-form">
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="name" placeholder="请输入飞发案例名称" autocomplete="off" class="layui-input" style='width: 1235px;height: 36px;'>
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入飞发案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                       <i class="layui-icon">&#xe615;</i>
			
 
				                     </button>
			
--- a/src/main/resources/static/admin/UfaultHoc.html
+++ b/src/main/resources/static/admin/UfaultHoc.html
@@ -45,6 +45,11 @@
 
				         .layui-table td {
			
 
				             padding: 0px!important;
			
 
				         } */
			
 
				+        
			
 
				+        .x-body {
			
 
				+            width: 800px;
			
 
				+            margin: 0 auto;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -54,7 +59,7 @@
 
				 
			
 
				         <form class="layui-form">
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="name" placeholder="请输入特设案例名称" autocomplete="off" class="layui-input" style='width: 1235px;height: 36px;'>
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入特设案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                       <i class="layui-icon">&#xe615;</i>
			
 
				                     </button>
			
--- a/src/main/resources/static/admin/UfaultNo.html
+++ b/src/main/resources/static/admin/UfaultNo.html
@@ -45,6 +45,11 @@
 
				         .layui-table td {
			
 
				             padding: 0px!important;
			
 
				         } */
			
 
				+        
			
 
				+        .x-body {
			
 
				+            width: 800px;
			
 
				+            margin: 0 auto;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -54,7 +59,7 @@
 
				 
			
 
				         <form class="layui-form">
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="name" placeholder="请输入其他案例名称" autocomplete="off" class="layui-input" style='width: 1235px;height: 36px;'>
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入其他案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                       <i class="layui-icon">&#xe615;</i>
			
 
				                     </button>
			
--- a/src/main/resources/static/admin/UfaultOrdnance.html
+++ b/src/main/resources/static/admin/UfaultOrdnance.html
@@ -45,6 +45,11 @@
 
				         .layui-table td {
			
 
				             padding: 0px!important;
			
 
				         } */
			
 
				+        
			
 
				+        .x-body {
			
 
				+            width: 800px;
			
 
				+            margin: 0 auto;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 
			
@@ -54,7 +59,7 @@
 
				 
			
 
				         <form class="layui-form">
			
 
				             <div class="search">
			
 
				-                <input id="realName" type="text" name="name" placeholder="请输入案例名称" autocomplete="off" class="layui-input" style='width: 1235px;height: 36px;'>
			
 
				+                <input id="realName" type="text" name="name" placeholder="请输入案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
			
 
				                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
			
 
				                       <i class="layui-icon">&#xe615;</i>
			
 
				                     </button>
			
--- a/src/main/resources/static/admin/Uoutline-edit.html
+++ b/src/main/resources/static/admin/Uoutline-edit.html
@@ -37,17 +37,19 @@
 
				 
			
 
				 <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[1].length > 13) {
			
 
				-                funcfile_path = decodeURI(values[1]);
			
 
				+            values = params[1].split("&");
			
 
				+            if (values.length > 1) {
			
 
				+                filePath = values[0].replace("file_path=", "");
			
 
				+                pageNum = values[1].replace("page=", "");
			
 
				             }
			
 
				         }
			
 
				-        if (funcfile_path !== '')
			
 
				+        if (filePath !== '')
			
 
				         {
			
 
				-            $("#box").attr('src',"../other/pdfjs/web/viewer.html?file=" + urlBase+ funcfile_path+"&page=12&top=150&zoom=1.5");
			
 
				+            $("#box").attr('src',"../other/pdfjs/web/viewer.html?file=" + urlBase+ filePath+"&page="+pageNum+"&top=150&zoom=1.5");
			
 
				         }
			
 
				 
			
 
				     });
			
--- a/src/main/resources/static/admin/catalog.html
+++ b/src/main/resources/static/admin/catalog.html
@@ -0,0 +1,89 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="en">
			
 
				+
			
 
				+<head>
			
 
				+    <meta charset="UTF-8">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				+    <title>Document</title>
			
 
				+    <style>
			
 
				+        .book {
			
 
				+            width: 750px;
			
 
				+            height: 650px;
			
 
				+            margin: 0 auto;
			
 
				+            border: 1px solid;
			
 
				+        }
			
 
				+    </style>
			
 
				+</head>
			
 
				+
			
 
				+<body>
			
 
				+    <div class="book">
			
 
				+        <!-- <div class="cata">目录</div>
			
 
				+        <div class="content"></div> -->
			
 
				+    </div>
			
 
				+    <script>
			
 
				+        $(function() {
			
 
				+            // bookId就是id
			
 
				+            let bookId = '';
			
 
				+            let rstr = "";
			
 
				+            $('.cata').click(() => {
			
 
				+                    const data = {
			
 
				+                        bookId: bookId,
			
 
				+                    };
			
 
				+                    $.ajax({
			
 
				+                        type: "get",
			
 
				+                        url: urlBase + "api/book/listAllDoccatalogue",
			
 
				+                        async: true,
			
 
				+                        data: data,
			
 
				+                        headers: {
			
 
				+                            // token:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIxIn0.Oik3R7IxeUi9v9d0C7kvFd2gF_xSu4WjspKKeXy3dGw"
			
 
				+                            token: sessionStorage.getItem('token')
			
 
				+                        },
			
 
				+                        success: res => {
			
 
				+                            if (res.status == 0) {
			
 
				+
			
 
				+                                $('.book').html();
			
 
				+                                let data = res.data;
			
 
				+                                // console.log(data)
			
 
				+                                var page_num, contents, ;
			
 
				+                                let allData = [];
			
 
				+                                for (var index in data) {
			
 
				+                                    // console.log(index)
			
 
				+                                    for (var i = 0; i < data.data.length; i++) {
			
 
				+                                        cData = data.data;
			
 
				+                                        // console.log(cData)
			
 
				+
			
 
				+                                        page_num = cData[i].page_num;
			
 
				+                                        contents = cData[i].contents;
			
 
				+
			
 
				+                                        var file_path = cData[i].file_path;
			
 
				+                                        sessionStorage.setItem("url1", file_path)
			
 
				+                                        rstr +=
			
 
				+                                            '<li class="search-data-item"><a href=javascript:>' +
			
 
				+                                            page_num + '</a><p>' + contents +
			
 
				+                                            '</p>  </li>'
			
 
				+                                        $('.book').html(rstr)
			
 
				+
			
 
				+                                    }
			
 
				+
			
 
				+
			
 
				+                                }
			
 
				+                            } else {
			
 
				+                                alert(res.msg);
			
 
				+                            }
			
 
				+                        },
			
 
				+                        error: xhr => {
			
 
				+                            // console.log(xhr)
			
 
				+                        }
			
 
				+                    });
			
 
				+
			
 
				+                }
			
 
				+            });
			
 
				+
			
 
				+
			
 
				+
			
 
				+        })
			
 
				+    </script>
			
 
				+</body>
			
 
				+
			
 
				+</html>
			
--- a/src/main/resources/static/admin/js/Ubook.js
+++ b/src/main/resources/static/admin/js/Ubook.js
@@ -73,8 +73,10 @@ $(function() {
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				+
			
 
				+                        console.log(data.data.list[1].id)
			
 
				                         tableOption.data = data.data.list;
			
 
				+
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
@@ -99,8 +101,9 @@ $(function() {
 
				                                 }
			
 
				                             });
			
 
				                         }
			
 
				-                        // console.log(data.data)
			
 
				+
			
 
				                         tableOption.data = data.data;
			
 
				+                        // console.log(data.data)
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
@@ -139,7 +142,7 @@ $(function() {
 
				                 x_admin_show(
			
 
				                     "在线预览",
			
 
				                     encodeURI(
			
 
				-                        "../admin/UbookSee.html?bookName=" + data.book_name + "&file_path=" + data.file_path
			
 
				+                        "../admin/UbookSee.html?bookName=" + data.book_name + "&file_path=" + data.file_path + "&id=" + data.id + "&chapter=" + data.chapter
			
 
				                     ),
			
 
				                     1400,
			
 
				                     700,
			
@@ -147,29 +150,15 @@ $(function() {
 
				                         loadAirList(currentPage, currentSize);
			
 
				                     }
			
 
				                 );
			
 
				-                var data = obj.data.file_path
			
 
				-                flie = urlBase + data
			
 
				+                var data = obj.data.file_path;
			
 
				+
			
 
				+                file = urlBase + data
			
 
				                     // console.log(flie)
			
 
				-                sessionStorage.setItem("url", flie)
			
 
				-            } else if (obj.event === "delete") {
			
 
				-                // console.log(data)
			
 
				-                // 删除
			
 
				-                var ids = [];
			
 
				-                ids.push(data.id);
			
 
				-                layer.confirm("确认要删除吗？", function() {
			
 
				-                    fetchJSON("api/book/delete", {
			
 
				-                        ids: ids
			
 
				-                    }, "post", function(data) {
			
 
				-                        if (data.status === 0) {
			
 
				-                            showMsg("已删除!", 1, 2000);
			
 
				-                            tableFirstLoad = true;
			
 
				-                            loadAirList(currentPage, currentSize);
			
 
				-                        } else {
			
 
				-                            showMsg(data.msg, 2, 2000);
			
 
				-                        }
			
 
				-                    });
			
 
				-                });
			
 
				+                sessionStorage.setItem("url", file)
			
 
				+
			
 
				+
			
 
				             }
			
 
				+
			
 
				         });
			
 
				         // 批量删除
			
 
				         $("#batchDelete").on("click", function(e) {
			
--- a/src/main/resources/static/admin/js/UbookSee.js
+++ b/src/main/resources/static/admin/js/UbookSee.js
@@ -2,23 +2,33 @@ $(function() {
 
				     var params = window.location.href.split("?");
			
 
				     if (params.length > 1) {
			
 
				         values = params[1].split("&");
			
 
				-        if (values.length > 13) {
			
 
				+        if (values.length > 1) {
			
 
				             var funcId = values[0].replace("id=", "");
			
 
				 
			
 
				             var funcfile_path = "";
			
 
				 
			
 
				             if (funcId !== "0") {
			
 
				 
			
 
				-                funcfile_path = decodeURI(values[8].replace("file_path=", ""));
			
 
				+                funcfile_path = decodeURI(values[1].replace("file_path=", ""));
			
 
				 
			
 
				             }
			
 
				         }
			
 
				     }
			
 
				 
			
 
				-
			
 
				+    // 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
			
 
				+    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)
			
 
				+    window.location.href = newurl
			
 
				 
			
 
				 
			
 
				     layui.use("form", function() {
			
@@ -32,8 +42,47 @@ $(function() {
 
				 
			
 
				 
			
 
				     });
			
 
				+    // 拿到每条数据的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)
			
@@ -47,7 +96,7 @@ $(function() {
 
				             var laypage = layui.laypage;
			
 
				             var layer = layui.layer;
			
 
				 
			
 
				-            function loadAirList(page, size, searchTitle) {
			
 
				+            function loadAirList(page, size) {
			
 
				                 if (page === null || page === undefined) page = defaultPage;
			
 
				                 if (size === null || size === undefined) size = defaultSize;
			
 
				 
			
@@ -81,7 +130,7 @@ $(function() {
 
				                                     if (first) return;
			
 
				                                     currentPage = obj.curr - 1;
			
 
				                                     currentSize = obj.limit;
			
 
				-                                    loadAirList(currentPage, currentSize, searchTitleKey);
			
 
				+                                    loadAirList(currentPage, currentSize);
			
 
				                                 }
			
 
				                             });
			
 
				                         }
			
@@ -104,7 +153,9 @@ $(function() {
 
				     var params = window.location.href.split("?")[1];
			
 
				     console.log(params);
			
 
				     var bookName = params.trim().slice(9)
			
 
				-    console.log(bookName)
			
 
				+    console.log(bookName);
			
 
				+    var chapter = window.location.href.split("=")[4];
			
 
				+    console.log(chapter);
			
 
				     var defaultPage = 0;
			
 
				     var defaultSize = 10;
			
 
				     var currentPage = defaultPage;
			
@@ -135,7 +186,8 @@ $(function() {
 
				                 ]
			
 
				             };
			
 
				             var searchTitle = bookName;
			
 
				-            var url = "api/book/relevantFault?bookName=" + searchTitle + "&page=" + (page + 1) + "&size=" + size;
			
 
				+            var chapter = chapter;
			
 
				+            var url = "api/book/relevantFault?bookName=" + searchTitle + "&chapter=" + chapter + "&page=" + (page + 1) + "&size=" + size;
			
 
				             fetchJSON(url, {}, "get", function(data) {
			
 
				                 if (data.status === 0) {
			
 
				                     if (tableFirstLoad) {
			
--- a/src/main/resources/static/admin/js/UfaultEle.js
+++ b/src/main/resources/static/admin/js/UfaultEle.js
@@ -30,7 +30,7 @@ $(function() {
 
				                         {
			
 
				                             fixed: "right",
			
 
				                             title: "操作",
			
 
				-                            width: 90,
			
 
				+                            // width: 90,
			
 
				                             toolbar: "#operationToolbar",
			
 
				                             align: "center"
			
 
				                         }
			
--- a/src/main/resources/static/admin/js/Uoutline.js
+++ b/src/main/resources/static/admin/js/Uoutline.js
@@ -20,15 +20,19 @@ $(function() {
 
				                 height: "full-81",
			
 
				                 limit: size,
			
 
				                 cols: [
			
 
				-                    [
			
 
				-
			
 
				-                        {
			
 
				-                            field: "outline_name",
			
 
				+                    [{
			
 
				+                            //field: "outline_name",
			
 
				+                            field: "contents",
			
 
				                             title: "大纲名称",
			
 
				                             align: "center"
			
 
				                         },
			
 
				+                        {
			
 
				 
			
 
				-
			
 
				+                            field: "page_num",
			
 
				+                            title: "大纲名称",
			
 
				+                            align: "center",
			
 
				+                            hide: true
			
 
				+                        },
			
 
				                         {
			
 
				                             fixed: "right",
			
 
				                             title: "操作",
			
@@ -41,24 +45,25 @@ $(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.list;
			
 
				+                        tableOption.data = data.data;
			
 
				                         table.render(tableOption);
			
 
				                     } else {
			
 
				                         showMsg(data.msg, 2, 2000);
			
@@ -121,7 +126,7 @@ $(function() {
 
				                 x_admin_show(
			
 
				                     "在线查看",
			
 
				                     encodeURI(
			
 
				-                        "../admin/Uoutline-edit.html?file_path=" + data.file_path
			
 
				+                        "../admin/Uoutline-edit.html?file_path=" + "sourcefm\\1617893572816.pdf" + "&page=" + data.page_num
			
 
				                     ),
			
 
				                     1300,
			
 
				                     600,
			
@@ -130,9 +135,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/second.html
+++ b/src/main/resources/static/admin/second.html
@@ -223,13 +223,8 @@
 
				         <a target="_blank " href="UfaultSee.html"> {{d.fault_name}}</a>
			
 
				 
			
 
				     </script>
			
 
				-    <!-- <script>
			
 
				-        function geturl() {
			
 
				-            var url = sessionStorage.getItem("url")
			
 
				-            window.location.href = url
			
 
				-        }
			
 
				-        geturl() -->
			
 
				-    </script>
			
 
				+
			
 
				+
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- 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://180.76.52.24:11083/"; //网络版
			
 
				+ // var urlBase = "http://127.0.0.1:11083/"; //本地版
			
 
				 
			
 
				 function loginout() {
			
 
				     /*if ($("#loginMenu").text() == "登录") {