addbatch

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

@@ -89,7 +89,7 @@
                         text: arr[i].name
                     })
                 );
-                console.log(arr[i].name)
+                // console.log(arr[i].name)
             }
 
         };

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

@@ -74,7 +74,7 @@
                         <div class="layui-form-item">
                             <label for="book_name" class="layui-form-label"> <span class="x-red">*</span> 教材</label>
                             <div class="layui-input-inline layui-form" lay-filter="book_name">
-                                <select name="book_name" id="book_name" lay-search="book_name" lay-verify="required"> </select>
+                                <select name="book_name" id="book_name" lay-verify="required"> </select>
                             </div>
                         </div>
                     </div>

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

@@ -267,8 +267,7 @@ $(function() {
                 );
 
                 var data = obj.data.file_path
-                flie = urlBase + data
-                sessionStorage.setItem("url", flie)
+                sessionStorage.setItem("urls", data)
 
             } else if (obj.event === "delete") {
                 // 删除

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

@@ -264,8 +264,7 @@ $(function() {
                 );
 
                 var data = obj.data.file_path
-                flie = urlBase + data
-                sessionStorage.setItem("url", flie)
+                sessionStorage.setItem("urls", data)
 
             } else if (obj.event === "delete") {
                 // 删除

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

@@ -173,8 +173,7 @@ $(function() {
                 );
 
                 var data = obj.data.file_path
-                flie = urlBase + data
-                sessionStorage.setItem("url", flie)
+                sessionStorage.setItem("urls", data)
 
             } else if (obj.event === "delete") {
                 // 删除

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

@@ -264,8 +264,8 @@ $(function() {
                 );
 
                 var data = obj.data.file_path
-                flie = urlBase + data
-                sessionStorage.setItem("url", flie)
+
+                sessionStorage.setItem("urls", data)
 
             } else if (obj.event === "delete") {
                 // 删除

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

@@ -51,15 +51,15 @@ $(function() {
                 funcfault_number = decodeURI(values[2].replace("fault_number=", ""));
                 funcaircraft_type = decodeURI(values[3].replace("aircraft_type=", ""));
                 funcbook_name = decodeURI(values[4].replace("book_name=", ""));
-                funcchapter = decodeURI(values[5].replace("chapter=", ""))
+                funcchapter = decodeURI(values[5].replace("chapter=", ""));
                 funcauthor = decodeURI(values[6].replace("author=", ""));
                 funcdepartment = decodeURI(values[7].replace("department=", ""));
                 major_type = decodeURI(values[8].replace("major_type=", ""));
                 funcdescription = decodeURI(values[9].replace("description=", ""));
                 funcfile_path = decodeURI(values[10].replace("file_path=", ""));
-                funcinput_time = decodeURI(values[11].replace("input_time=", ""))
+                funcinput_time = decodeURI(values[11].replace("input_time=", ""));
                 funcfault_time = decodeURI(values[12].replace("fault_time=", ""));
-                funcremarks = decodeURI(values[13].replace("remarks=", ""))
+                funcremarks = decodeURI(values[13].replace("remarks=", ""));
             }
         }
     }
@@ -93,7 +93,7 @@ $(function() {
         laydate.render({
             elem: '#input_time',
             isInitValue: false,
-            type: 'month',
+            type: 'year',
             trigger: "click"
         });
         laydate.render({
@@ -126,57 +126,52 @@ $(function() {
         form.on("select", function(data) {
             if (data.elem.id === "aircraft_type") {
                 aircraft_type = data.elem[data.elem.selectedIndex].text;
-                // getbook(aircraft_type);
 
             } else if (data.elem.id === "major_type")
                 major_type = data.elem[data.elem.selectedIndex].text;
             else if (data.elem.id === "book_name") {
                 book_name = data.elem[data.elem.selectedIndex].text;
-                // var id = data.elem[data.elem.selectedIndex].value;
-                // console.log(id)
-                // get(id)
-            } else if (data.elem.id === "department")
-                departmentName = data.elem[data.elem.selectedIndex].text;
+
+            }
         })
 
-        // function get(id) {
-        //     console.log(id)
-        //     fetchJSON("api/book/listAllDoccatalogue?bookId=" + id, {}, "get", function(ret) {
-        //         console.log(funcchapter)
-        //         if (ret.status === 0) {
-        //             $("#chapter").empty();
-        //             $("#chapter").append($("<option>", {
-        //                 value: -1,
-        //                 text: "请选择"
-        //             }));
-        //             for (var i = 0; i < ret.data.length; i++) {
-        //                 console.log(ret.data[i].contents)
-        //                 if (ret.data[i].chapter === 0) {
-        //                     $("#chapter").append(
-        //                         $("<option>", {
-        //                             // value: ret.data[i].id,
-        //                             text: ret.data[i].contents,
-        //                             selected: true
-        //                         })
-        //                     );
-        //                 } else {
-        //                     $("#chapter").append(
-        //                         $("<option>", {
-        //                             // value: ret.data[i].id,
-        //                             text: ret.data[i].contents
-        //                         })
-        //                     );
-        //                 }
-        //             }
-        //             layui.use("form", function() {
-        //                 layui.form.render('select', 'chapter');
-        //             });
-        //         } else {
-        //             showMsg(res.msg, 2);
-        //         }
-        //     });
 
-        // }
+        // 书籍
+        function getbook() {
+            fetchJSON("api/book/listAll", {}, "get", function(ret) {
+                if (ret.status === 0) {
+                    $("#book_name").empty();
+                    $("#book_name").append($("<option>", {
+                        value: -1,
+                        text: "请选择"
+                    }));
+                    for (var i = 0; i < ret.data.length; i++) {
+                        if (ret.data[i].book_name === funcbook_name) {
+                            $("#book_name").append(
+                                $("<option>", {
+                                    // value: ret.data[i].id,
+                                    text: ret.data[i].book_name,
+                                    selected: true
+                                })
+                            );
+                        } else {
+                            $("#book_name").append(
+                                $("<option>", {
+                                    // value: ret.data[i].id,
+                                    text: ret.data[i].book_name
+                                })
+                            );
+                        }
+                    }
+                    layui.use("form", function() {
+                        layui.form.render('select', 'book_name');
+                    });
+                } else {
+                    showMsg(res.msg, 2);
+                }
+            });
+        }
+        getbook();
         // 机型
         function getTypes() {
             fetchJSON("api/aircraft/listAll", {}, "get", function(ret) {
@@ -245,118 +240,6 @@ $(function() {
             });
         };
         getArticleType()
-            // 教材
-            // function getbook(aircraft_type) {
-            //     fetchJSON("api/book/listByAircraft?aircraftType=" + aircraft_type + "&page=" + 1 + "&size=" + 100, {},
-            //         "get",
-            //         function(ret) {
-            //             if (ret.status === 0) {
-            //                 $("#book_name").empty();
-            //                 $("#book_name").append($("<option>", {
-            //                     value: -1,
-            //                     text: "请选择"
-            //                 }));
-            //                 for (var i = 0; i < ret.data.list.length; i++) {
-            //                     if (ret.data.list[i].book_name === funcbook_name) {
-            //                         $("#book_name").append(
-            //                             $("<option>", {
-            //                                 // value: ret.data.list[i].id,
-            //                                 text: ret.data.list[i].book_name,
-            //                                 selected: true
-            //                             })
-            //                         );
-            //                     } else {
-            //                         $("#book_name").append(
-            //                             $("<option>", {
-            //                                 // value: ret.data.list[i].id,
-            //                                 text: ret.data.list[i].book_name
-            //                             })
-            //                         );
-            //                     }
-            //                 }
-            //                 layui.use("form", function() {
-            //                     layui.form.render('select', 'book_name');
-            //                 });
-            //             } else {
-            //                 showMsg(res.msg, 2);
-            //             }
-            //         });
-            // }
-
-        // 部门
-        function getbook() {
-            fetchJSON("api/book/listAll", {}, "get", function(ret) {
-
-                if (ret.status === 0) {
-                    $("#book_name").empty();
-                    $("#book_name").append($("<option>", {
-                        value: -1,
-                        text: "请选择"
-                    }));
-                    for (var i = 0; i < ret.data.length; i++) {
-                        if (ret.data[i].book_name === funcbook_name) {
-                            $("#book_name").append(
-                                $("<option>", {
-                                    // value: ret.data[i].id,
-                                    text: ret.data[i].book_name,
-                                    selected: true
-                                })
-                            );
-                        } else {
-                            $("#book_name").append(
-                                $("<option>", {
-                                    // value: ret.data[i].id,
-                                    text: ret.data[i].book_name
-                                })
-                            );
-                        }
-                    }
-                    layui.use("form", function() {
-                        layui.form.render('select', 'book_name');
-                    });
-                } else {
-                    showMsg(res.msg, 2);
-                }
-            });
-        }
-        getbook();
-
-        // function getdepartment() {
-        //     fetchJSON("api/department/listAll", {}, "get", function(ret) {
-
-        //         if (ret.status === 0) {
-        //             $("#department").empty();
-        //             $("#department").append($("<option>", {
-        //                 value: -1,
-        //                 text: "请选择"
-        //             }));
-        //             for (var i = 0; i < ret.data.length; i++) {
-        //                 if (ret.data[i].departmentName === funcdepartment) {
-        //                     $("#department").append(
-        //                         $("<option>", {
-        //                             // value: ret.data[i].id,
-        //                             text: ret.data[i].departmentName,
-        //                             selected: true
-        //                         })
-        //                     );
-        //                 } else {
-        //                     $("#department").append(
-        //                         $("<option>", {
-        //                             // value: ret.data[i].id,
-        //                             text: ret.data[i].departmentName
-        //                         })
-        //                     );
-        //                 }
-        //             }
-        //             layui.use("form", function() {
-        //                 layui.form.render('select', 'department');
-        //             });
-        //         } else {
-        //             showMsg(res.msg, 2);
-        //         }
-        //     });
-        // }
-        // getdepartment();
     });
 
 });

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

@@ -264,8 +264,7 @@ $(function() {
                 );
 
                 var data = obj.data.file_path
-                flie = urlBase + data
-                sessionStorage.setItem("url", flie)
+                sessionStorage.setItem("urls", data)
 
             } else if (obj.event === "delete") {
                 // 删除

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

@@ -257,8 +257,7 @@ $(function() {
                 );
 
                 var data = obj.data.file_path
-                flie = urlBase + data
-                sessionStorage.setItem("url", flie)
+                sessionStorage.setItem("urls", data)
 
             } else if (obj.event === "delete") {
                 // 删除

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

@@ -83,7 +83,7 @@ $(function() {
         laydate.render({
             elem: '#input_time',
             isInitValue: false,
-            type: 'month',
+            type: 'year',
             trigger: "click"
         });
         laydate.render({

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

@@ -50,11 +50,11 @@ $(function() {
                             title: "角色名称",
                             align: "center"
                         },
-                        {
-                            field: "departmentName",
-                            title: "部门名称",
-                            align: "center"
-                        },
+                        // {
+                        //     field: "departmentName",
+                        //     title: "部门名称",
+                        //     align: "center"
+                        // },
                         // {
                         //     field: "sex",
                         //     title: "性别",

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

@@ -86,16 +86,14 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-col-sm6">
+                    <!-- <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="departmentSelect" class="layui-form-label"> 部门名称 </label>
                             <div class="layui-input-inline layui-form" lay-filter="departmentFilter">
                                 <select name="departmentId" id="departmentSelect" lay-verify="required"> </select>
                             </div>
                         </div>
-                    </div>
-                </div>
-                <div class="layui-row">
+                    </div> -->
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="isEnable" class="layui-form-label">启用状态</label>
@@ -104,6 +102,9 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
+
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="remark" class="layui-form-label">是否管理员</label>

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

@@ -92,16 +92,14 @@
                             </div>
                         </div>
                     </div> -->
-                    <div class="layui-col-sm6">
+                    <!-- <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="departmentSelect" class="layui-form-label"> <span class="x-red">*</span> 部门名称 </label>
                             <div class="layui-input-inline layui-form" lay-filter="departmentFilter">
                                 <select name="departmentId" id="departmentSelect" lay-verify="required"> </select>
                             </div>
                         </div>
-                    </div>
-                </div>
-                <div class="layui-row">
+                    </div> -->
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="isEnable" class="layui-form-label"> <span class="x-red">*</span> 启用状态</label>
@@ -110,6 +108,9 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
+
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="remark" class="layui-form-label">是否管理员</label>