local book file view

src/main/resources/static/Ordinary/Electronics.html

@@ -67,7 +67,7 @@
         </table>
         <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="edit">编辑</a>
             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
         </script>
     </div>

src/main/resources/static/Ordinary/Flying.html

@@ -67,7 +67,7 @@
         </table>
         <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-danger layui-btn-xs" lay-event="delete">删除</a>
         </script>
     </div>

src/main/resources/static/Ordinary/Not_indexed.html

@@ -60,7 +60,7 @@
         </table>
         <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="edit">编辑</a>
             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
         </script>
     </div>

src/main/resources/static/Ordinary/ad_hoc.html

@@ -67,7 +67,7 @@
         </table>
         <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="edit">编辑</a>
             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
         </script>
     </div>

src/main/resources/static/Ordinary/book-edit.html

@@ -26,7 +26,7 @@
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <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>
@@ -64,14 +64,6 @@
                 </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 class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="input_time" class="layui-form-label">开始时间</label>
@@ -80,8 +72,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="major_type" class="layui-form-label"> 专业</label>
@@ -90,6 +80,9 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
+
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="publish_time" class="layui-form-label">  出版时间</label>

src/main/resources/static/Ordinary/book.html

@@ -41,6 +41,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 
@@ -48,7 +54,7 @@
     <div class="x-body">
         <form class="layui-form">
             <button id="add" class="layui-btn layui-btn-sm">
-        <i class="layui-icon">&#xe61f;</i>增加</button>
+        <i class="layui-icon">&#xe61f;</i>添加</button>
             <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
             <i class="layui-icon">&#xe67c;</i>导入</button> -->
             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger " style="padding-right: 10px;">

src/main/resources/static/Ordinary/bookAir.html

@@ -36,6 +36,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 

src/main/resources/static/Ordinary/bookAirEle.html

@@ -36,6 +36,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 

src/main/resources/static/Ordinary/bookAirEqu.html

@@ -36,6 +36,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 

src/main/resources/static/Ordinary/bookFlying.html

@@ -36,6 +36,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 

src/main/resources/static/Ordinary/bookGeneralIntroduction.html

@@ -36,6 +36,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 

src/main/resources/static/Ordinary/bookIntegratedAvionics.html

@@ -36,6 +36,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 

src/main/resources/static/Ordinary/bookOrdnance.html

@@ -36,6 +36,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 

src/main/resources/static/Ordinary/bookStructure.html

@@ -36,6 +36,12 @@
         #pagination {
             margin-top: 45px;
         }
+        
+        .layui-table img {
+            min-width: 54px;
+            height: 38px;
+            line-height: 38px;
+        }
     </style>
 </head>
 

src/main/resources/static/Ordinary/card-add.html

@@ -24,7 +24,7 @@
                 <div class="layui-row">
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="card_name" class="layui-form-label">工艺卡片名称</label>
+                            <label for="card_name" class="layui-form-label"> 卡片名 </label>
                             <div class="layui-input-inline">
                                 <input type="text" id="card_name" name="card_name" required="" lay-verify="required" autocomplete="off" class="layui-input">
                             </div>
@@ -33,9 +33,11 @@
 
                     <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_type" 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>

src/main/resources/static/Ordinary/card-edit.html

@@ -24,7 +24,7 @@
                 <div class="layui-row">
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="card_name" class="layui-form-label" style="width:84px">工艺卡片名称</label>
+                            <label for="card_name" class="layui-form-label" style="width:84px"> 卡片名 </label>
                             <div class="layui-input-inline">
                                 <input type="text" id="card_name" name="card_name" required="" lay-verify="required" autocomplete="off" class="layui-input">
                             </div>
@@ -33,9 +33,11 @@
 
                     <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_type" 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>

src/main/resources/static/Ordinary/card.html

@@ -43,7 +43,7 @@
     <div class="x-body">
         <form class="layui-form">
             <button id="add" 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="刷新">

src/main/resources/static/Ordinary/fire_control.html

@@ -67,7 +67,7 @@
         </table>
         <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="edit">编辑</a>
             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
         </script>
     </div>

src/main/resources/static/Ordinary/js/Electronics.js

@@ -55,12 +55,12 @@ $(function() {
                         },
                         {
                             field: "aircraft_type",
-                            title: "飞机类型",
+                            title: "机型",
                             align: "center"
                         },
                         {
                             field: "major_type",
-                            title: "专业类型",
+                            title: "专业",
                             align: "center"
                         },
 
@@ -178,16 +178,21 @@ $(function() {
                 x_admin_show(
                     "案例标引",
                     encodeURI(
-                        "second.html"
+                        "faultSee.html?id=" + data.id + "&fault_name=" + data.fault_name + "&fault_number=" + data.fault_number + "&book_name=" + data.book_name + "&chapter=" + data.chapter +
+                        "&author=" + data.author + "&department=" + data.department + "&aircraft_type=" + data.aircraft_type + "&major_type=" +
+                        data.major_type + "&description=" + data.description + "&file_path=" + data.file_path + "&input_time=" + data.input_time +
+                        "&fault_time=" + data.fault_time + "&remarks=" + data.remarks
                     ),
-                    1300,
-                    450,
+                    1300, 850,
                     function() {
                         loadAirList(currentPage, currentSize);
                     }
                 );
 
-
+                var data = obj.data.file_path
+                flie = urlBase + data
+                    // console.log(flie)
+                sessionStorage.setItem("url", flie)
 
             } else if (obj.event === "delete") {
                 // console.log(data)

src/main/resources/static/Ordinary/js/Flying.js

@@ -55,12 +55,12 @@ $(function() {
                         },
                         {
                             field: "aircraft_type",
-                            title: "飞机类型",
+                            title: "机型",
                             align: "center"
                         },
                         {
                             field: "major_type",
-                            title: "专业类型",
+                            title: "专业",
                             align: "center"
                         },
                         {
@@ -175,16 +175,21 @@ $(function() {
                 x_admin_show(
                     "案例标引",
                     encodeURI(
-                        "second.html"
+                        "faultSee.html?id=" + data.id + "&fault_name=" + data.fault_name + "&fault_number=" + data.fault_number + "&book_name=" + data.book_name + "&chapter=" + data.chapter +
+                        "&author=" + data.author + "&department=" + data.department + "&aircraft_type=" + data.aircraft_type + "&major_type=" +
+                        data.major_type + "&description=" + data.description + "&file_path=" + data.file_path + "&input_time=" + data.input_time +
+                        "&fault_time=" + data.fault_time + "&remarks=" + data.remarks
                     ),
-                    1300,
-                    450,
+                    1300, 850,
                     function() {
                         loadAirList(currentPage, currentSize);
                     }
                 );
 
-
+                var data = obj.data.file_path
+                flie = urlBase + data
+                    // console.log(flie)
+                sessionStorage.setItem("url", flie)
 
             } else if (obj.event === "delete") {
                 // console.log(data)

src/main/resources/static/Ordinary/js/Not_indexed.js

@@ -53,12 +53,12 @@ $(function() {
                         },
                         {
                             field: "aircraft_type",
-                            title: "飞机类型",
+                            title: "机型",
                             align: "center"
                         },
                         {
                             field: "major_type",
-                            title: "专业类型",
+                            title: "专业",
                             align: "center"
                         },
                         {
@@ -162,16 +162,21 @@ $(function() {
                 x_admin_show(
                     "案例标引",
                     encodeURI(
-                        "second.html"
+                        "faultSee.html?id=" + data.id + "&fault_name=" + data.fault_name + "&fault_number=" + data.fault_number + "&book_name=" + data.book_name + "&chapter=" + data.chapter +
+                        "&author=" + data.author + "&department=" + data.department + "&aircraft_type=" + data.aircraft_type + "&major_type=" +
+                        data.major_type + "&description=" + data.description + "&file_path=" + data.file_path + "&input_time=" + data.input_time +
+                        "&fault_time=" + data.fault_time + "&remarks=" + data.remarks
                     ),
-                    1300,
-                    450,
+                    1300, 850,
                     function() {
                         loadAirList(currentPage, currentSize);
                     }
                 );
 
-
+                var data = obj.data.file_path
+                flie = urlBase + data
+                    // console.log(flie)
+                sessionStorage.setItem("url", flie)
 
             } else if (obj.event === "delete") {
                 // console.log(data)

src/main/resources/static/Ordinary/js/ad_hoc.js

@@ -55,12 +55,12 @@ $(function() {
                         },
                         {
                             field: "aircraft_type",
-                            title: "飞机类型",
+                            title: "机型",
                             align: "center"
                         },
                         {
                             field: "major_type",
-                            title: "专业类型",
+                            title: "专业",
                             align: "center"
                         },
 
@@ -178,16 +178,21 @@ $(function() {
                 x_admin_show(
                     "案例标引",
                     encodeURI(
-                        "second.html"
+                        "faultSee.html?id=" + data.id + "&fault_name=" + data.fault_name + "&fault_number=" + data.fault_number + "&book_name=" + data.book_name + "&chapter=" + data.chapter +
+                        "&author=" + data.author + "&department=" + data.department + "&aircraft_type=" + data.aircraft_type + "&major_type=" +
+                        data.major_type + "&description=" + data.description + "&file_path=" + data.file_path + "&input_time=" + data.input_time +
+                        "&fault_time=" + data.fault_time + "&remarks=" + data.remarks
                     ),
-                    1300,
-                    450,
+                    1300, 850,
                     function() {
                         loadAirList(currentPage, currentSize);
                     }
                 );
 
-
+                var data = obj.data.file_path
+                flie = urlBase + data
+                    // console.log(flie)
+                sessionStorage.setItem("url", flie)
 
             } else if (obj.event === "delete") {
                 // console.log(data)

src/main/resources/static/Ordinary/js/book-edit.js

@@ -9,15 +9,11 @@ $(function() {
             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 = "";
+
             if (funcId !== "0") {
                 funcaircraft_type = decodeURI(values[1].replace("aircraft_type=", ""));
                 funcauthor = decodeURI(values[2].replace("author=", ""));

src/main/resources/static/Ordinary/js/book.js

@@ -59,7 +59,7 @@ $(function() {
                             title: "图片",
                             align: "center",
                             templet: '<div><img src={{urlBase+d.img}}></div>',
-                            style: 'height:48px;width:48px;line-height:48px!important;'
+                            // style: 'height:20px;width:25px;line-height:20px!important;'
 
                         },
 
@@ -78,7 +78,7 @@ $(function() {
                         {
                             field: "major_type",
                             title: "专业",
-                            align: "center"
+                            align: "center",
                         },
                         {
                             field: "publish_time",
@@ -145,7 +145,7 @@ $(function() {
                 fetchJSON("api/book/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get", function(data) {
                     if (data.status === 0) {
                         if (tableFirstLoad) {
-                            tableFirstLoad = false;
+                            tableFirstLoad = true;
                             laypage.render({
                                 curr: page + 1,
                                 elem: "pagination",

src/main/resources/static/Ordinary/js/bookAir.js

@@ -54,7 +54,8 @@ $(function() {
                         {
                             field: "img",
                             title: "图片",
-                            align: "center"
+                            align: "center",
+                            templet: '<div><img src={{urlBase+d.img}}></div>',
                         },
 
                         {

src/main/resources/static/Ordinary/js/bookAirEle.js

@@ -54,7 +54,8 @@ $(function() {
                         {
                             field: "img",
                             title: "图片",
-                            align: "center"
+                            align: "center",
+                            templet: '<div><img src={{urlBase+d.img}}></div>',
                         },
 
                         {

src/main/resources/static/Ordinary/js/bookAirEqu.js

@@ -54,7 +54,8 @@ $(function() {
                         {
                             field: "img",
                             title: "图片",
-                            align: "center"
+                            align: "center",
+                            templet: '<div><img src={{urlBase+d.img}}></div>',
                         },
 
                         {

src/main/resources/static/Ordinary/js/bookFlying.js

@@ -54,7 +54,8 @@ $(function() {
                         {
                             field: "img",
                             title: "图片",
-                            align: "center"
+                            align: "center",
+                            templet: '<div><img src={{urlBase+d.img}}></div>',
                         },
 
                         {

src/main/resources/static/Ordinary/js/bookGeneralIntroduction.js

@@ -54,7 +54,8 @@ $(function() {
                         {
                             field: "img",
                             title: "图片",
-                            align: "center"
+                            align: "center",
+                            templet: '<div><img src={{urlBase+d.img}}></div>',
                         },
 
                         {

src/main/resources/static/Ordinary/js/bookIntegratedAvionics.js

@@ -54,7 +54,8 @@ $(function() {
                         {
                             field: "img",
                             title: "图片",
-                            align: "center"
+                            align: "center",
+                            templet: '<div><img src={{urlBase+d.img}}></div>',
                         },
 
                         {

src/main/resources/static/Ordinary/js/bookOrdnance.js

@@ -54,7 +54,8 @@ $(function() {
                         {
                             field: "img",
                             title: "图片",
-                            align: "center"
+                            align: "center",
+                            templet: '<div><img src={{urlBase+d.img}}></div>',
                         },
 
                         {

src/main/resources/static/Ordinary/js/bookStructure.js

@@ -54,7 +54,8 @@ $(function() {
                         {
                             field: "img",
                             title: "图片",
-                            align: "center"
+                            align: "center",
+                            templet: '<div><img src={{urlBase+d.img}}></div>',
                         },
 
                         {

src/main/resources/static/Ordinary/js/card-add.js

@@ -78,6 +78,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();
     });
 });

src/main/resources/static/Ordinary/js/card-edit.js

@@ -63,6 +63,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();
     });
 });

src/main/resources/static/Ordinary/js/card.js

@@ -166,8 +166,8 @@ $(function() {
                     encodeURI(
                         "card-edit.html?id=" + data.id + "&card_name=" + data.card_name + "&aircraft_type=" + data.aircraft_type + "&major_type=" + data.major_type + "&description=" + data.description + "&file_path=" + data.file_path + "&input_time=" + data.input_time + "&remarks=" + data.remarks
                     ),
-                    800,
-                    300,
+                    770,
+                    308,
                     function() {
                         loadAirList(currentPage, currentSize);
                     }
@@ -241,8 +241,7 @@ $(function() {
             tableFirstLoad = true;
             x_admin_show("添加",
                 "card-add.html?id=0&card_name=&aircraft_type=&major_type=&description=&file_path=&input_time=&remarks=",
-                800,
-                450,
+                782, 358,
                 function() {
                     loadAirList(currentPage, currentSize);
                 });

src/main/resources/static/Ordinary/js/cardFlying.js

@@ -124,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);

src/main/resources/static/Ordinary/js/fault.js

@@ -104,13 +104,6 @@ $(function() {
             } else {
                 // var url = ;
                 var name = "";
-
-                // if (searchTitle = aircraft_type) {
-                //     searchTitle = data.aircraft_type
-
-                // } else {
-                //     searchTitle = data.major_type
-                // }
                 fetchJSON("api/fault/getByName?name=" + searchTitle + "&page=" + (page + 1) + "&size=" + size, {}, "get",
                     function(data) {
                         if (data.status === 0) {

src/main/resources/static/Ordinary/js/fire_control.js

@@ -55,12 +55,12 @@ $(function() {
                         },
                         {
                             field: "aircraft_type",
-                            title: "飞机类型",
+                            title: "机型",
                             align: "center"
                         },
                         {
                             field: "major_type",
-                            title: "专业类型",
+                            title: "专业",
                             align: "center"
                         },
                         {
@@ -176,16 +176,21 @@ $(function() {
                 x_admin_show(
                     "案例标引",
                     encodeURI(
-                        "second.html"
+                        "faultSee.html?id=" + data.id + "&fault_name=" + data.fault_name + "&fault_number=" + data.fault_number + "&book_name=" + data.book_name + "&chapter=" + data.chapter +
+                        "&author=" + data.author + "&department=" + data.department + "&aircraft_type=" + data.aircraft_type + "&major_type=" +
+                        data.major_type + "&description=" + data.description + "&file_path=" + data.file_path + "&input_time=" + data.input_time +
+                        "&fault_time=" + data.fault_time + "&remarks=" + data.remarks
                     ),
-                    1300,
-                    450,
+                    1300, 850,
                     function() {
                         loadAirList(currentPage, currentSize);
                     }
                 );
 
-
+                var data = obj.data.file_path
+                flie = urlBase + data
+                    // console.log(flie)
+                sessionStorage.setItem("url", flie)
 
             } else if (obj.event === "delete") {
                 // console.log(data)

src/main/resources/static/Ordinary/js/manuel-add.js

@@ -61,6 +61,51 @@ $(function() {
         form.on("switch(hide)", function(data) {
             isHide = data.elem.checked ? 1 : 0;
         });
+        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();
         form.on("submit(save)", function(data) {
             var func = data.field;
             func.id = funcId;

src/main/resources/static/Ordinary/js/manuel-edit.js

@@ -62,6 +62,48 @@ $(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();
     });
 });

src/main/resources/static/Ordinary/js/manuel.js

@@ -41,7 +41,7 @@ $(function() {
                         },
                         {
                             field: "major_type",
-                            title: "主要机型",
+                            title: "专业",
                             align: "center"
                         },
                         {
@@ -160,9 +160,8 @@ $(function() {
                         "manuel-edit.html?id=" + data.id + "&manuel_name=" + data.manuel_name + "&aircraft_type=" +
                         data.aircraft_type + "&major_type=" + data.major_type + "&description=" + data.description + "&file_path=" + data.file_path +
                         "&input_time=" + data.input_time + "&remarks=" + data.remarks
-                    ),
-                    800,
-                    300,
+                    ), 782,
+                    308,
                     function() {
                         loadmanuelList(currentPage, currentSize);
                     }
@@ -221,7 +220,7 @@ $(function() {
             x_admin_show("添加",
                 "manuel-add.html?id=0&manuel_name=&aircraft_type=&major_type=&description=&file_path=&input_time=&remarks=",
                 800,
-                400,
+                360,
                 function() {
                     loadmanuelList(currentPage, currentSize);
                 });

src/main/resources/static/Ordinary/js/ordnance.js

@@ -55,12 +55,12 @@ $(function() {
                         },
                         {
                             field: "aircraft_type",
-                            title: "飞机类型",
+                            title: "机型",
                             align: "center"
                         },
                         {
                             field: "major_type",
-                            title: "专业类型",
+                            title: "专业",
                             align: "center"
                         },
 
@@ -176,21 +176,26 @@ $(function() {
         // 监听表内工具条
         table.on("tool(airList)", function(obj) {
             var data = obj.data;
-            console.log(data)
+
             if (obj.event === "edit") {
                 x_admin_show(
                     "案例标引",
                     encodeURI(
-                        "second.html"
+                        "faultSee.html?id=" + data.id + "&fault_name=" + data.fault_name + "&fault_number=" + data.fault_number + "&book_name=" + data.book_name + "&chapter=" + data.chapter +
+                        "&author=" + data.author + "&department=" + data.department + "&aircraft_type=" + data.aircraft_type + "&major_type=" +
+                        data.major_type + "&description=" + data.description + "&file_path=" + data.file_path + "&input_time=" + data.input_time +
+                        "&fault_time=" + data.fault_time + "&remarks=" + data.remarks
                     ),
-                    1300,
-                    450,
+                    1300, 850,
                     function() {
                         loadAirList(currentPage, currentSize);
                     }
                 );
 
-
+                var data = obj.data.file_path
+                flie = urlBase + data
+                    // console.log(flie)
+                sessionStorage.setItem("url", flie)
 
             } else if (obj.event === "delete") {
                 // console.log(data)

src/main/resources/static/Ordinary/manuel-add.html

@@ -33,9 +33,11 @@
 
                     <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_type" 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>
@@ -43,7 +45,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>

src/main/resources/static/Ordinary/manuel-edit.html

@@ -33,9 +33,11 @@
 
                     <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_type" 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>
@@ -43,7 +45,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>

src/main/resources/static/Ordinary/manuel.html

@@ -44,7 +44,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="刷新">

src/main/resources/static/Ordinary/ordnance.html

@@ -67,7 +67,7 @@
         </table>
         <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="edit">编辑</a>
             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
         </script>
     </div>

src/main/resources/static/Ordinary/user.html

@@ -28,17 +28,15 @@
             margin-top: 45px;
         }
         /* 修改原有表格的样子 */
-        
-        .layui-table thead tr {
+        /* .layui-table thead tr {
             background-color: #009688!important;
-        }
-        
-        .layui-table th {
+        } */
+        /* .layui-table th {
             padding: 5px 0;
             border-top: none;
             border-left: none;
             color: azure;
-        }
+        } */
     </style>
 </head>
 

src/main/resources/static/admin/Ubook.html

@@ -155,7 +155,7 @@
             <!-- <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>
+            <a target="_blank " href="javascript:; "> <img src="{{urlBase+d.img}}" alt=""> </a>
 
         </script>
         <script type="text/html" id="type">
@@ -167,7 +167,7 @@
                             <h3>书名：{{d.book_name}}</h3>
 
                         </div>
-                        <div id="box" style="">
+                        <div id="box">
                             <h3>作者：{{d.author}}</h3>
                             <h3>开始时间： {{d.input_time}}</h3>
 

src/main/resources/static/admin/UbookSee.html

@@ -85,24 +85,23 @@
 
         </form>
     </div>
+
     <script type="text/html" id="typeTpl">
-        <a target="_blank " href="Ubookfault.html"> {{d.fault_name}}</a>
+        <a target="_blank " href="UfaultSee.html"> {{d.fault_name}}</a>
 
     </script>
     <script>
         $(function() {
             var params = window.location.href.split("?");
-            var filePath;
-            var pageNum;
-            if (params.length > 1) {
-                values = params[1].split("&");
-                if (values.length > 1) {
-                    filePath = values[0].replace("file_path=", "");
-                    pageNum = values[1].replace("page=", "");
-                }
-            }
-            if (filePath !== '') {
-                $("#box").attr('src', "../other/pdfjs/web/viewer.html?file=" + urlBase + filePath + "&page=" + pageNum + "&top=150&zoom=1.5");
+            var values = params[1].split("&");
+			var pageNum = values[0].replace("page_num=", "");
+			var url = sessionStorage.getItem('url');
+			var newurl = url.substr(url.indexOf('m') + 2, url.length);
+			var path = newurl.substr(0, newurl.indexOf('.'))
+			var data_path = urlBase + 'sourcefm/' + path + '.pdf';
+			console.log(data_path)
+            if (data_path !== '') {
+                $("#box").attr('src', "../other/pdfjs/web/viewer.html?file=" + data_path + "&page=" + pageNum + "&top=150&zoom=1.5");
             }
 
         });

src/main/resources/static/admin/Ubookshow.html

@@ -53,18 +53,7 @@
 <body class="layui-anim layui-anim-up">
 
     <div class="x-body">
-        <!-- <form class="layui-form">
 
-            <div class="search">
-                <input id="realName" type="text" name="realName" placeholder="请输入大纲名称" autocomplete="off" class="layui-input" style='width: 1246px;height: 36px;'>
-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
-                  <i class="layui-icon">&#xe615;</i>
-                </button>
-            </div>
-            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="first.html" title="退出">
-                <i class="layui-icon" style="line-height:30px">&#xe65c;</i>返回
-            </a>
-        </form> -->
         <table id="outLineList" class="layui-table" lay-filter="outLineList" lay-data="{id:'outLineList'}">
         </table>
         <!-- <div id="pagination"></div> -->

src/main/resources/static/admin/Ubooktext.html

@@ -36,36 +36,11 @@
 
 <script>
     $(function() {
-        var params = window.location.href.split("?");
-        if (params.length > 1) {
-            values = params[1].split("&");
-            if (values.length > 13) {
-                var funcId = values[0].replace("id=", "");
-
-                var funcfile_path = "";
-
-                if (funcId !== "0") {
-
-                    funcfile_path = decodeURI(values[8].replace("file_path=", ""));
-
-                }
-            }
-        }
-
-
-        var url = sessionStorage.getItem('url');
-        var newurl = url.substr(1, url.length);
-        //截取到source/16081801024792. pdf
-        url = newurl.substr(newurl.indexOf('\\') + 1, url.length);
-        // 截取到文件16081801024792
-        newurl = url.substr(0, url.indexOf('.'))
-            // urlBase:http://127.0.0.1:11083/+16081801024792+.pdf
-        newurl = urlBase + "source\\" + newurl + ".pdf";
-        console.log(newurl)
-        $("#newurl").val(funcfile_path);
-        $("#box").attr('src', urlBase + funcfile_path);
-
-
+        var url = sessionStorage.getItem("url") 
+        var newurl = url.substr(url.indexOf('1'), url.length);              
+        file_path  =  newurl.substr(newurl.indexOf('\\')  +  1, newurl.length);               
+        newurl  =  file_path.substr(0, file_path.indexOf('.'));                
+        path  =  urlBase  +  "sourcefm\\"  +  newurl  +  ".pdf"
 
         layui.use("form", function() {
             layui.form.render();
@@ -75,7 +50,7 @@
             $ = layui.jquery;
             var form = layui.form;
             var layer = layui.layer;
-
+            $("#box").attr('src', "../other/pdfjs/web/viewer.html?file=" + path);
 
         });
 

src/main/resources/static/admin/Ucard-edit.html

@@ -18,11 +18,10 @@
     <style>
         #box {
             position: absolute;
-            top: 0%;
+            top: 0;
+            left: 0;
             width: 70%;
-            height: 97%;
-            border: 1px solid #000000;
-            left: 0%;
+            height: 630px!important;
         }
         
         .layui-table td {

src/main/resources/static/admin/UcardSee.html

@@ -17,10 +17,11 @@
     <style>
         #box {
             position: absolute;
-            top: 0;
-            left: 0;
-            width: 97%;
-            height: 700px!important;
+            top: 5%;
+            left: 9%;
+            width: 80%;
+            height: 600px!important;
+            border: 1px solid #000000;
         }
     </style>
 </head>
@@ -29,49 +30,18 @@
 
     <div class="x-body layui-anim layui-anim-up">
         <form class="layui-form">
-            .<iframe id="box" src=""></iframe>
+
         </form>
     </div>
 </body>
 
 <script>
-    $(function() {
-        var params = window.location.href.split("?");
-        if (params.length > 1) {
-            values = params[1].split("&");
-            if (values.length > 13) {
-                var funcId = values[0].replace("id=", "");
-
-                var funcfile_path = "";
-
-                if (funcId !== "0") {
-
-                    funcfile_path = decodeURI(values[8].replace("file_path=", ""));
-
-                }
-            }
-        }
-
-
-        $("#file_path").val(funcfile_path);
-        $("#box").attr('src', urlBase + funcfile_path);
-
-
-
-        layui.use("form", function() {
-            layui.form.render();
-        });
-
-        layui.use(["form", "layer", ], function() {
-            $ = layui.jquery;
-            var form = layui.form;
-            var layer = layui.layer;
-
-
-        });
-
-    });
-</script>
+    function geturl() {
+        var url = sessionStorage.getItem("url")
+        window.location.href = url
+    }
+    geturl()
 </script>
 
+
 </html>

src/main/resources/static/admin/UfaultEle.html

@@ -51,6 +51,10 @@
             width: 800px;
             margin: 0 auto;
         }
+        
+        #find {
+            visibility: hidden
+        }
     </style>
 </head>
 
@@ -58,12 +62,19 @@
 
     <div class="x-body">
         <form class="layui-form">
+            <div class="search" id="hidden">
+                <div class="layui-input-inline  ">
+                    <select name="find" id="find" lay-search="find" lay-verify="required" id="hide"></select>
+                </div>
+            </div>
             <div class="search">
-                <input id="realName" type="text" name="name" placeholder="请输入电子案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
+                <input id="realName" type="text" name="name" placeholder="请输入电子案例名称" autocomplete="off" class="layui-input" style='width: 564px;height: 36px;'>
                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
                       <i class="layui-icon">&#xe615;</i>
                     </button>
             </div>
+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="Ufault.html" title="退出">
                 <i class="layui-icon" style="line-height:30px">&#xe65c;</i>返回
             </a>
@@ -76,8 +87,36 @@
             <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
 
         </script>
+        <script>
+            document.getElementById("hidden").style.display = "none";
+            document.getElementById("hide").style.display = "none";
+            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>
     </div>
 </body>
 

src/main/resources/static/admin/UfaultFire.html

@@ -57,12 +57,19 @@
 
     <div class="x-body">
         <form class="layui-form">
+            <div class="search" id="hidden">
+                <div class="layui-input-inline  ">
+                    <select name="find" id="find" lay-search="find" lay-verify="required" id="hide"></select>
+                </div>
+            </div>
             <div class="search">
-                <input id="realName" type="text" name="name" placeholder="请输入火控案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
+                <input id="realName" type="text" name="name" placeholder="请输入火控案例名称" autocomplete="off" class="layui-input" style='width: 564px;height: 36px;'>
                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
                       <i class="layui-icon">&#xe615;</i>
                     </button>
             </div>
+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="Ufault.html" title="退出">
                 <i class="layui-icon" style="line-height:30px">&#xe65c;</i>返回
             </a>
@@ -75,7 +82,36 @@
             <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
 
         </script>
+        <script>
+            document.getElementById("hidden").style.display = "none";
+            document.getElementById("hide").style.display = "none";
+            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>
 
     </div>
 </body>

src/main/resources/static/admin/UfaultFlying.html

@@ -56,14 +56,20 @@
 <body class="layui-anim layui-anim-up">
 
     <div class="x-body">
-
         <form class="layui-form">
+            <div class="search" id="hidden">
+                <div class="layui-input-inline  ">
+                    <select name="find" id="find" lay-search="find" lay-verify="required" id="hide"></select>
+                </div>
+            </div>
             <div class="search">
-                <input id="realName" type="text" name="name" placeholder="请输入飞发案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
+                <input id="realName" type="text" name="name" placeholder="请输入飞发案例名称" autocomplete="off" class="layui-input" style='width: 564px;height: 36px;'>
                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
                       <i class="layui-icon">&#xe615;</i>
                     </button>
             </div>
+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="Ufault.html" title="退出">
                 <i class="layui-icon" style="line-height:30px">&#xe65c;</i>返回
             </a>
@@ -76,7 +82,36 @@
             <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
 
         </script>
+        <script>
+            document.getElementById("hidden").style.display = "none";
+            document.getElementById("hide").style.display = "none";
+            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>
 
     </div>
 </body>

src/main/resources/static/admin/UfaultHoc.html

@@ -56,14 +56,20 @@
 <body class="layui-anim layui-anim-up">
 
     <div class="x-body">
-
         <form class="layui-form">
+            <div class="search" id="hidden">
+                <div class="layui-input-inline  ">
+                    <select name="find" id="find" lay-search="find" lay-verify="required" id="hide"></select>
+                </div>
+            </div>
             <div class="search">
-                <input id="realName" type="text" name="name" placeholder="请输入特设案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
+                <input id="realName" type="text" name="name" placeholder="请输入特设案例名称" autocomplete="off" class="layui-input" style='width: 564px;height: 36px;'>
                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
                       <i class="layui-icon">&#xe615;</i>
                     </button>
             </div>
+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="Ufault.html" title="退出">
                 <i class="layui-icon" style="line-height:30px">&#xe65c;</i>返回
             </a>
@@ -76,7 +82,36 @@
             <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
 
         </script>
+        <script>
+            document.getElementById("hidden").style.display = "none";
+            document.getElementById("hide").style.display = "none";
+            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>
 
     </div>
 </body>

src/main/resources/static/admin/UfaultNo.html

@@ -59,11 +59,13 @@
 
         <form class="layui-form">
             <div class="search">
-                <input id="realName" type="text" name="name" placeholder="请输入其他案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
+                <input id="realName" type="text" name="name" placeholder="请输入其他案例名称" autocomplete="off" class="layui-input" style='width: 564px;height: 36px;'>
                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
                       <i class="layui-icon">&#xe615;</i>
                     </button>
             </div>
+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="Ufault.html" title="退出">
                 <i class="layui-icon" style="line-height:30px">&#xe65c;</i>返回
             </a>

src/main/resources/static/admin/UfaultOrdnance.html

@@ -58,12 +58,19 @@
     <div class="x-body">
 
         <form class="layui-form">
+            <div class="search" id="hidden">
+                <div class="layui-input-inline  ">
+                    <select name="find" id="find" lay-search="find" lay-verify="required" id="hide"></select>
+                </div>
+            </div>
             <div class="search">
-                <input id="realName" type="text" name="name" placeholder="请输入案例名称" autocomplete="off" class="layui-input" style='width: 646px;height: 36px;'>
+                <input id="realName" type="text" name="name" placeholder="请输入军械案例名称" autocomplete="off" class="layui-input" style='width: 564px;height: 36px;'>
                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
                       <i class="layui-icon">&#xe615;</i>
                     </button>
             </div>
+            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
+                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="Ufault.html" title="退出">
                 <i class="layui-icon" style="line-height:30px">&#xe65c;</i>返回
             </a>
@@ -76,7 +83,36 @@
             <a class="layui-btn layui-btn-xs" lay-event="edit">在线预览</a>
 
         </script>
+        <script>
+            document.getElementById("hidden").style.display = "none";
+            document.getElementById("hide").style.display = "none";
+            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>
 
     </div>
 </body>

src/main/resources/static/admin/Uoutline-edit.html

@@ -14,14 +14,14 @@
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
     <script src="../other/js/functions.js"></script>
-
     <style>
         #box {
             position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 550px!important;
+            top: 5%;
+            left: 9%;
+            width: 80%;
+            height: 600px!important;
+            border: 1px solid #000000;
         }
     </style>
 </head>
@@ -30,27 +30,18 @@
 
     <div class="x-body layui-anim layui-anim-up">
         <form class="layui-form">
-            <iframe id="box" src=""></iframe>
+
         </form>
     </div>
 </body>
 
 <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");
-        }
-
-    });
+    function geturl() {
+        var url = sessionStorage.getItem("url")
+        window.location.href = url
+    }
+    geturl()
 </script>
 
+
 </html>

src/main/resources/static/admin/js/Ubook.js

@@ -25,8 +25,8 @@ $(function() {
                             field: "img",
                             title: "预览图",
                             templet: '#typeTpl',
-                            align: "center",
-                            width: 150,
+                            align: "left",
+                            width: 100,
 
                         },
                         {
@@ -34,6 +34,7 @@ $(function() {
                             title: "书相关信息",
                             templet: '#type',
                             align: "left",
+                            width: 430,
                         },
                         {
                             field: "author",
@@ -147,13 +148,11 @@ $(function() {
                         loadAirList(currentPage, currentSize);
                     }
                 );
-                var data = obj.data.file_path;
-
-                file = urlBase + data
-                sessionStorage.setItem("url", file)
-				
-				var book_name = obj.data.book_name
-				sessionStorage.setItem("book_name", book_name)
+                var file_path = data.file_path;
+                // console.log(file_path)
+                sessionStorage.setItem("url", file_path)
+                var book_name = obj.data.book_name
+                sessionStorage.setItem("book_name", book_name)
             }
 
         });

src/main/resources/static/admin/js/UbookSee.js

@@ -1,67 +1,32 @@
+//案例
 $(function() {
     var params = window.location.href.split("?");
-    if (params.length > 1) {
-        values = params[1].split("&");
-        if (values.length > 1) {
-            var funcId = values[0].replace("id=", "");
+    // console.log(params)
+    var values = params[1].split("&");
+    // console.log(values)
+    var pageNum = values[0].replace("page_num=", "");
+    var url = values[1].replace("file_path=", "");
 
-            var funcfile_path = "";
-
-            if (funcId !== "0") {
-
-                funcfile_path = decodeURI(values[1].replace("file_path=", ""));
-
-            }
-        }
-    }
-
-    // word转换成pdf
-    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";
+    var newurl = url.substr(url.indexOf('1'), url.length);
     console.log(newurl)
-    $("#newurl").val(funcfile_path);
-    $("#box").attr('src', urlBase + funcfile_path);
-    // window.location.href = newurl
-    layui.use("form", function() {
-        layui.form.render();
-    });
-
-    layui.use(["form", "layer", ], function() {
-        $ = layui.jquery;
-        var form = layui.form;
-        var layer = layui.layer;
-    });
-
-
-
-});
+    var path = newurl.substr(0, newurl.indexOf('.'))
+    console.log(path)
+    var data_path = urlBase + 'sourcefm/' + path + '.pdf';
+    console.log(data_path)
 
-
-var params = window.location.href.split("?");
-console.log(params)
-var values = params[1].split("&");
-console.log(values)
-var contents = values[3].replace("contents=", "");
-console.log(contents)
-var book_name = sessionStorage.getItem('book_name')
-console.log(book_name)
-    //案例
-$(function() {
+    var book_name = sessionStorage.getItem('book_name')
+    var contents = sessionStorage.getItem('contents')
     var defaultPage = 0;
     var defaultSize = 10;
     var currentPage = defaultPage;
     var currentSize = defaultSize;
     var tableFirstLoad = true;
+    // word转换成pdf
     layui.use(["form", "table", "laypage", "layer"], function() {
         var table = layui.table;
         var laypage = layui.laypage;
         var layer = layui.layer;
+        $("#box").attr('src', "../other/pdfjs/web/viewer.html?file=" + data_path + "&page=" + pageNum + "&top=150&zoom=1.5");
 
         function loadAirList(page, size, searchTitle) {
             if (page === null || page === undefined) page = defaultPage;

src/main/resources/static/admin/js/Ubookshow.js

@@ -1,4 +1,7 @@
  $(function() {
+     var params = window.location.href.split("?");
+     var values = params[1].split("&");
+     var file_path = values[1].replace("file_path=", "");
      var defaultPage = 0;
      var defaultSize = 10;
      var currentPage = defaultPage;
@@ -51,8 +54,6 @@
                  fetchJSON("api/book/listAllDoccatalogue?bookId=" + catalogue, {}, "get", function(
                      data) {
                      if (data.status === 0) {
-
-
                          tableOption.data = data.data;
                          table.render(tableOption);
                      } else {
@@ -68,14 +69,11 @@
          // 监听表内工具条
          table.on("tool(outLineList)", function(obj) {
              var data = obj.data;
-
              if (obj.event === "edit") {
                  x_admin_show(
                      "在线查看",
                      encodeURI(
-                         "../admin/UbooKSee.html?file_path=" +
-                         data.file_path + "&page=" + data.page_num +
-                         "&book_id=" + data.book_id + "&contents=" + data.contents
+                         "../admin/UbooKSee.html?page_num=" + data.page_num + "&file_path=" + file_path
                      ),
                      1300,
                      600,
@@ -83,10 +81,9 @@
                          loadoutLineList(currentPage, currentSize);
                      }
                  );
-                 var data = obj.data.file_path;
 
-                 file = urlBase + data
-                 sessionStorage.setItem("url", file)
+                 var contents = data.contents;
+                 sessionStorage.setItem("contents", contents)
              }
          });
 
@@ -157,9 +154,6 @@
                      showMsg(data.msg, 2, 2000);
                  }
              });
-
-
-
          }
          loadAirList();
      })

src/main/resources/static/admin/js/Ucard-edit.js

@@ -1,79 +1,17 @@
-$(function() {
-    var params = window.location.href.split("?");
-    if (params.length > 1) {
-        values = params[1].split("&");
-        if (values.length > 13) {
-            var funcId = values[0].replace("id=", "");
-            var funcfault_name = "";
-            var funcfault_number = "";
-            var funcauthor = "";
-            var funcdepartment = "";
-            var funcaircraft_type = "";
-            var funcmajor_type = "";
-            var funcdescription = "";
-            var funcfile_path = "";
-            var funcinput_time = "";
-            var funcfault_time = "";
-            var funcbook_name = "";
-            var funcchapter = "";
-            var funcremarks = "";
-            if (funcId !== "0") {
-                funcfault_name = decodeURI(values[1].replace("fault_name=", ""));
-                funcfault_number = decodeURI(values[2].replace("fault_number=", ""));
-                funcauthor = decodeURI(values[3].replace("author=", ""));
-                funcdepartment = decodeURI(values[4].replace("department=", ""));
-                funcaircraft_type = decodeURI(values[5].replace("aircraft_type=", ""));
-                funcmajor_type = decodeURI(values[6].replace("major_type=", ""));
-                funcdescription = decodeURI(values[7].replace("description=", ""));
-                funcfile_path = decodeURI(values[8].replace("file_path=", ""));
-                funcinput_time = decodeURI(values[9].replace("input_time=", ""))
-                funcfault_time = decodeURI(values[10].replace("fault_time=", ""));
-                funcbook_name = decodeURI(values[11].replace("book_name=", ""));
-                funcchapter = decodeURI(values[12].replace("chapter=", ""))
-                funcremarks = decodeURI(values[13].replace("remarks=", ""))
-            }
-        }
-    }
-
-    $("#fault_name").val(funcfault_name);
-    $("#fault_number").val(funcfault_number);
-    $("#author").val(funcauthor);
-    $("#department").val(funcdepartment);
-    $("#aircraft_type").val(funcaircraft_type);
-    $("#major_type").val(funcmajor_type);
-    $("#description").val(funcdescription);
-    $("#file_path").val(funcfile_path);
-    $("#input_time").val(funcinput_time);
-    $("#fault_time").val(funcfault_time);
-    $("#book_name").val(funcbook_name);
-    $("#chapter").val(funcchapter);
-    $("#remarks").val(funcremarks);
-    $("#box").attr('src', urlBase + funcfile_path);
-
-
-
-    layui.use("form", function() {
-        layui.form.render();
-    });
-
-    layui.use(["form", "layer", ], function() {
-        $ = layui.jquery;
-        var form = layui.form;
-        var layer = layui.layer;
-
-
-    });
+var params = window.location.href.split("?");
+console.log(params);
+var values = params[1].split("&");
+console.log(values);
+var card_name = values[0].replace("card_name=", "");
+var file_path = sessionStorage.getItem("url");
 
-});
 $(function() {
-    var params = window.location.href.split("?")[1];
-    console.log(params);
-    var card_name = params.trim().slice(10);
     var defaultPage = 0;
     var defaultSize = 10;
     var currentPage = defaultPage;
     var currentSize = defaultSize;
     var tableFirstLoad = true;
+    $("#box").attr("src", file_path);
     layui.use(["form", "table", "laypage", "layer"], function() {
         var table = layui.table;
         var laypage = layui.laypage;

src/main/resources/static/admin/js/Ucard.js

@@ -68,7 +68,7 @@ $(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;
@@ -86,7 +86,7 @@ $(function() {
                             });
                         }
                         // console.log(data.data)
-                        tableOption.data = data.data;
+                        tableOption.data = data.data.list;
                         table.render(tableOption);
                     } else {
                         showMsg(data.msg, 2, 2000);
@@ -126,7 +126,7 @@ $(function() {
                         "../admin/Ucard-edit.html?card_name=" + data.card_name + "&file_path=" + data.file_path
                     ),
                     1350,
-                    600,
+                    700,
                     function() {
                         loadAirList(currentPage, currentSize);
                     }

src/main/resources/static/admin/js/Ufault.js

@@ -41,6 +41,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) {
@@ -68,8 +70,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;
@@ -77,22 +81,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);
                     }
                 });
+
             }
 
 
@@ -103,6 +112,7 @@ $(function() {
             e.preventDefault();
             tableFirstLoad = true;
             searchTitleKey = title.val().trim();
+            search = $("#find").find("option:selected").val();
             if (searchTitleKey === "")
                 loadAirList(0, currentSize);
             else

src/main/resources/static/admin/js/UfaultEle.js

@@ -39,6 +39,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) {
@@ -66,8 +68,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;
@@ -75,22 +79,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);
                     }
                 });
+
             }
 
 
@@ -101,6 +110,7 @@ $(function() {
             e.preventDefault();
             tableFirstLoad = true;
             searchTitleKey = title.val().trim();
+            search = $("#find").find("option:selected").val();
             if (searchTitleKey === "")
                 loadAirList(0, currentSize);
             else

src/main/resources/static/admin/js/UfaultFireControl.js

@@ -41,6 +41,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) {
@@ -68,8 +70,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;
@@ -77,22 +81,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);
                     }
                 });
+
             }
 
 
@@ -103,6 +112,7 @@ $(function() {
             e.preventDefault();
             tableFirstLoad = true;
             searchTitleKey = title.val().trim();
+            search = $("#find").find("option:selected").val();
             if (searchTitleKey === "")
                 loadAirList(0, currentSize);
             else

src/main/resources/static/admin/js/UfaultHoc.js

@@ -60,6 +60,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) {
@@ -87,8 +89,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;
@@ -96,22 +100,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);
                     }
                 });
+
             }
 
 
@@ -122,6 +131,7 @@ $(function() {
             e.preventDefault();
             tableFirstLoad = true;
             searchTitleKey = title.val().trim();
+            search = $("#find").find("option:selected").val();
             if (searchTitleKey === "")
                 loadAirList(0, currentSize);
             else

src/main/resources/static/admin/js/UfaultNo.js

@@ -85,8 +85,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;
@@ -103,8 +102,8 @@ $(function() {
                                 }
                             });
                         }
-                        // console.log(data.data)
-                        tableOption.data = data.data;
+
+                        tableOption.data = data.data.list;
                         table.render(tableOption);
                     } else {
                         showMsg(data.msg, 2, 2000);
@@ -112,7 +111,6 @@ $(function() {
                 });
             }
 
-
         }
         loadAirList();
 

src/main/resources/static/admin/js/UfaultOrdnance.js

@@ -60,6 +60,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) {
@@ -87,8 +89,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;
@@ -96,24 +100,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();
@@ -122,6 +130,7 @@ $(function() {
             e.preventDefault();
             tableFirstLoad = true;
             searchTitleKey = title.val().trim();
+            search = $("#find").find("option:selected").val();
             if (searchTitleKey === "")
                 loadAirList(0, currentSize);
             else

src/main/resources/static/admin/js/Umanuel-edit.js

@@ -29,11 +29,5 @@ $(function() {
         var form = layui.form,
             layer = layui.layer;
 
-
-        //监听提交
-        form.on("switch(hide)", function(data) {
-            isHide = data.elem.checked ? 1 : 0;
-        });
-
     });
 });

src/main/resources/static/admin/js/Umanuel.js

@@ -62,7 +62,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;
@@ -80,7 +80,7 @@ $(function() {
                             });
                         }
 
-                        tableOption.data = data.data;
+                        tableOption.data = data.data.list;
                         table.render(tableOption);
                     } else {
                         showMsg(data.msg, 2, 2000);
@@ -123,8 +123,7 @@ $(function() {
                         data.aircraft_type + "&major_type=" + data.major_type + "&description=" + data.description + "&file_path=" + data.file_path +
                         "&input_time=" + data.input_time + "&remarks=" + data.remarks
                     ),
-                    1300,
-                    600,
+                    1444, 600,
                     function() {
                         loadmanuelList(currentPage, currentSize);
                     }

src/main/resources/static/admin/js/Uoutline-edit.js

@@ -4,64 +4,29 @@ $(function() {
         values = params[1].split("&");
         if (values.length > 7) {
             var funcId = values[0].replace("id=", "");
-            var funcoutline_name = "";
-            var funcaircraft_type = "";
-            var funcmajor_type = "";
-            var funcdescription = "";
+
             var funcfile_path = "";
-            var funcinput_time = "";
-            var funcremarks = "";
+
             if (funcId !== "0") {
-                funcoutline_name = decodeURI(values[1].replace("outline_name=", ""));
-                funcaircraft_type = decodeURI(values[2].replace("aircraft_type=", ""));
-                funcmajor_type = decodeURI(values[3].replace("major_type=", ""));
-                funcdescription = decodeURI(values[4].replace("description=", ""));
+
                 funcfile_path = decodeURI(values[5].replace("file_path=", ""));
-                funcinput_time = decodeURI(values[6].replace("input_time=", ""));
-                funcremarks = decodeURI(values[7].replace("remarks=", ""));
+
             }
         }
     }
 
-    $("#outline_name").val(funcoutline_name);
-    $("#aircraft_type").val(funcaircraft_type);
-    $("#major_type").val(funcmajor_type);
-    $("#description").val(funcdescription);
+
     $("#file_path").val(funcfile_path);
-    $("#input_time").val(funcinput_time);
-    $("#remarks").val(funcremarks);
+
+    $("#box").attr('src', urlBase + funcfile_path);
 
     layui.use("form", function() {
         layui.form.render();
     });
 
-    layui.use(["form", "layer", ], function() {
+    layui.use(["form", "layer", "upload"], 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;
-            let url = "";
-
-            url = "api/outline/edit";
-            fetchJSON(url, func, "post", function(data) {
-                if (data.status === 0) {
-                    var index = parent.layer.getFrameIndex(window.name);
-                    showMsg("修改成功", 1, 2000);
-                    parent.layer.close(index);
-                } else {
-                    showMsg(data.msg, 2);
-                }
-            });
-            return false;
-        });
-
     });
 });

src/main/resources/static/admin/js/Uoutline.js

@@ -65,7 +65,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;
@@ -83,7 +83,7 @@ $(function() {
                             });
                         }
 
-                        tableOption.data = data.data;
+                        tableOption.data = data.data.list;
                         table.render(tableOption);
                     } else {
                         showMsg(data.msg, 2, 2000);
@@ -119,12 +119,12 @@ $(function() {
             var data = obj.data;
             if (obj.event === "edit") {
                 x_admin_show(
-                    "在线查看",
+                    "在线预览",
                     encodeURI(
                         "../admin/Uoutline-edit.html?file_path=" + data.file_path
                     ),
-                    1300,
-                    600,
+                    1444,
+                    685,
                     function() {
                         loadoutLineList(currentPage, currentSize);
                     }
@@ -132,6 +132,7 @@ $(function() {
                 // console.log(data.file_path)
                 var data = obj.data.file_path
                 flie = urlBase + data
+                console.log(flie)
                 sessionStorage.setItem("url", flie)
             } else if (obj.event === "delete") {
                 // console.log(data)

src/main/resources/static/admin/second.html

@@ -26,29 +26,14 @@
             border: 1px solid #000000;
             left: 22%;
         }
-        /*         
-        #book {
-            position: absolute;
-            top: 8%;
-            left: 78%;
-            width: 21%;
-            height: 32%;
-        }
-        
-        #outFaultList {
-            position: absolute;
-            top: 7%;
-            left: 0%;
-            width: 100%;
-            height: 90%;
-        } */
         
         .search {
             position: absolute;
             top: 7%;
             left: 78%;
             width: 21%;
-            height: 20%;
+            height: 88%;
+            margin-top: -8px;
         }
         
         #FaultList {
@@ -56,11 +41,12 @@
             top: 6%;
             left: 0%;
             width: 100%;
+            height: 93%;
         }
         
         .layui-table-view {
             height: 248px!important;
-            border-color: #e6e6e6;
+            /* border-color: #e6e6e6; */
         }
         
         .layui-table-main {

src/main/resources/static/other/js/functions.js

@@ -1,7 +1,7 @@
-//var urlBase = window.location.origin + "/";
+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() == "登录") {