listbymajor

src/main/java/com/zglc/fm/controller/FaultController.java

@@ -146,4 +146,24 @@ public class FaultController {
         return Result.success(new PageInfo<>( faultService.searchByMajor(majorType,name)));
     }
 
+    @ApiOperation("按专业分页列出")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("listByMajor")
+    public Result<PageInfo<FaultEntity>> listByMajor(String majorType,Integer page, Integer size) {
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>( faultService.listByMajor(majorType)));
+    }
+
+    @ApiOperation("分页列出未标引")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("listNotIndexed")
+    public Result<PageInfo<FaultEntity>> listNotIndexed(Integer page, Integer size) {
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>( faultService.listNotIndexed()));
+    }
+
 }

src/main/java/com/zglc/fm/service/FaultService.java

@@ -112,7 +112,6 @@ public class FaultService {
     }
 
     public List<FaultEntity> searchByMajor(String majorType, String name) {
-
         Example example = new Example(FaultEntity.class);
         Example.Criteria criteria = example.createCriteria();
         if (majorType != null)
@@ -129,4 +128,27 @@ public class FaultService {
             return getAllFault();
     }
 
+    public List<FaultEntity> listByMajor(String majorType) {
+        Example example = new Example(FaultEntity.class);
+        Example.Criteria criteria = example.createCriteria();
+        if (majorType != null)
+            criteria.andEqualTo("major_type", majorType);
+        else
+            criteria.andIsNull("major_type");
+        if (criteria.isValid())
+            return faultDao.selectByExample(example);
+        else
+            return getAllFault();
+    }
+
+    public List<FaultEntity> listNotIndexed() {
+        Example example = new Example(FaultEntity.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIsNull("major_type");
+        if (criteria.isValid())
+            return faultDao.selectByExample(example);
+        else
+            return getAllFault();
+    }
+
 }

src/main/resources/application-prod.yml

@@ -4,7 +4,6 @@ spring:
     url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
 #    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
 
-
     username: root
 
     password:  w.cf123321

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

@@ -31,16 +31,12 @@
 
     <div class="x-body">
         <form class="layui-form">
-            <button id="add" class="layui-btn layui-btn-sm">
-        <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>
             <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
 				<i class="layui-icon">&#xe67c;</i>导入</button>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
                 <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新</a>
             <div class="search">
-                <input id="realName" type="text" name="name" placeholder="请输入故障名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
+                <input id="realName" type="text" name="name" placeholder="请输入案例名称" autocomplete="off" class="layui-input" style='width: 200px;height: 30px;'>
                 <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
                   <i class="layui-icon">&#xe615;</i>
                 </button>
@@ -51,8 +47,8 @@
         </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>
+           <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>
 </body>

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

@@ -0,0 +1,281 @@
+$(function() {
+	var defaultPage = 0;
+	var defaultSize = 10;
+	var currentPage = defaultPage;
+	var currentSize = defaultSize;
+	var tableFirstLoad = true;
+	layui.use(["form", "table", "laypage", "layer"], function() {
+		var table = layui.table;
+		var laypage = layui.laypage;
+		var layer = layui.layer;
+		var title = $("#realName");
+		var searchTitleKey = "";
+
+
+		function loadAirList(page, size, searchTitle) {
+			if (page === null || page === undefined) page = defaultPage;
+			if (size === null || size === undefined) size = defaultSize;
+
+			var tableOption = {
+				elem: "#airList",
+				height: "full-81",
+				limit: size,
+				cols: [
+					[
+						{
+                            field: "id",
+                            title: "序号",
+                            align: "center"
+                        },
+						{
+                            field: "fault_name",
+                            title: "案例名称",
+                            align: "center"
+                        },
+						{
+						    field: "fault_number",
+						    title: "案例提供单位",
+						    align: "center"
+						},
+						{
+						    field: "author",
+						    title: "作者",
+						    align: "center"
+						},
+						{
+						    field: "department",
+						    title: "案例编号",
+						    align: "center"
+						},
+						{
+						    field: "aircraft_type",
+						    title: "机型",
+						    align: "center"
+						},
+						{
+						    field: "major_type",
+						    title: "专业",
+						    align: "center"
+						},
+						{
+						    field: "description",
+						    title: "故障件名称",
+						    align: "center"
+						},
+						{
+						    field: "input_time",
+						    title: "日期",
+						    align: "center"
+						},
+						{
+						    field: "fault_time",
+						    title: "故障时间",
+						    align: "center"
+						},
+						{
+						    field: "book_name",
+						    title: "关键词",
+						    align: "center"
+						},
+						{
+						    field: "chapter",
+						    title: "教材章节",
+						    align: "center"
+						},
+						{
+						    field: "file_path",
+						    title: "文件路径",
+						    align: "center"
+						},
+						{
+						    field: "remarks",
+						    title: "备注",
+						    align: "center"
+						},
+						// {
+						// 	fixed: "right",
+						// 	title: "操作",
+						// 	width: 180,
+						// 	toolbar: "#operationToolbar",
+						// 	align: "center"
+						// }
+					]
+				]
+			};
+
+
+			if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
+				var url = "api/fault/listpage?page=" + (page + 1) + "&size=" + size;
+				fetchJSON(url, {}, "get", function(data) {
+					if (data.status === 0) {
+						if (tableFirstLoad) {
+							tableFirstLoad = false;
+							laypage.render({
+								curr: page + 1,
+								elem: "pagination",
+								count: data.data.total,
+								layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
+								jump: function(obj, first) {
+									if (first) return;
+									currentPage = obj.curr - 1;
+									currentSize = obj.limit;
+									loadAirList(currentPage, currentSize, searchTitleKey);
+								}
+							});
+						}
+						// console.log(data.data)
+						tableOption.data = data.data.list;
+						table.render(tableOption);
+					} else {
+						showMsg(data.msg, 2, 2000);
+					}
+				});
+			} else {
+				// var url = ;
+				fetchJSON("api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
+					if (data.status === 0) {
+						if (tableFirstLoad) {
+							tableFirstLoad = false;
+							laypage.render({
+								curr: page + 1,
+								elem: "pagination",
+								count: data.data.total,
+								layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
+								jump: function(obj, first) {
+									if (first) return;
+									currentPage = obj.curr - 1;
+									currentSize = obj.limit;
+									loadAirList(currentPage, currentSize, searchTitleKey);
+								}
+							});
+						}
+						// console.log(data.data)
+						tableOption.data = data.data;
+						table.render(tableOption);
+					} else {
+						showMsg(data.msg, 2, 2000);
+					}
+				});
+			}
+
+
+		}
+		loadAirList();
+
+		$("#searchArticle").on("click", function(e) {
+			e.preventDefault();
+			tableFirstLoad = true;
+			searchTitleKey = title.val().trim();
+			if (searchTitleKey === "")
+				loadAirList(0, currentSize);
+			else
+				loadAirList(0, currentSize, searchTitleKey);
+		});
+
+
+		$("#keyword").on("keyup", function(e) {
+			e.preventDefault();
+			if (e.keyCode === 13) {
+				$("#searchArticle").click();
+			}
+		});
+
+
+		// 监听表内工具条
+		table.on("tool(airList)", function(obj) {
+			var data = obj.data;
+			console.log(data)
+			if (obj.event === "edit") {
+				x_admin_show(
+					"案例标引",
+					encodeURI(
+						"../admin/second.html?id=" + data.id + "&fault_name=" + data.fault_name + "&fault_number=" + data.fault_number +
+						"&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 + "&book_name=" + data.book_name + "&chapter=" + data.chapter+ "&remarks=" + data.remarks
+					),
+					1200,
+					650,
+					function() {
+						loadAirList(currentPage, currentSize);
+					}
+				);
+
+
+
+			} else if (obj.event === "delete") {
+				// console.log(data)
+				// 删除
+				var ids = [];
+				ids.push(data.id);
+				layer.confirm("确认要删除吗？", function() {
+					fetchJSON("api/fault/delete", {
+						ids: ids
+					}, "post", function(data) {
+						if (data.status === 0) {
+							showMsg("已删除!", 1, 2000);
+							tableFirstLoad = true;
+							loadAirList(currentPage, currentSize);
+						} else {
+							showMsg(data.msg, 2, 2000);
+						}
+					});
+				});
+			}
+		});
+		// 批量删除
+		$("#batchDelete").on("click", function(e) {
+			e.preventDefault();
+			var checkedData = table.checkStatus("airList").data;
+			if (checkedData.length === 0) {
+				showMsg("未选择需要删除的日志", 2, 2000);
+				return;
+			}
+			layer.confirm("确认要删除吗？", function() {
+				var ids = [];
+				for (var i = 0; i < checkedData.length; i++) {
+					ids.push(checkedData[i].id);
+				}
+
+				fetchJSON("api/fault/delete", {
+					ids: ids
+				}, "post", function(data) {
+					if (data.status === 0) {
+						showMsg("已删除!");
+						tableFirstLoad = true;
+						loadAirList(currentPage, currentSize);
+					} else {
+						showMsg(data.msg, 2, 2000);
+					}
+				});
+			});
+		});
+		// 导入
+		//表格导入
+		$("#tolead").on("click", function(e) {
+			e.preventDefault();
+			tableFirstLoad = true;
+			x_admin_show("导入",
+				"../admin/faul-add.html",
+				350,
+				200,
+				function() {
+					loadAirList(currentPage, currentSize);
+				});
+		});
+		// 新建用户
+		$("#add").on("click", function(e) {
+			e.preventDefault();
+			tableFirstLoad = true;
+			x_admin_show("案例标引",
+				"../admin/second.html?id=0&fault_name=&fault_number=&author=&department=&aircraft_type=&major_type=&description=&file_path=&input_time=&fault_time=&book_name=&chapter=&remarks=",
+				1200,
+				650,
+				function() {
+					loadAirList(currentPage, currentSize);
+				});
+		});
+
+	});
+});

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

@@ -4,6 +4,8 @@ $(function() {
     var currentPage = defaultPage;
     var currentSize = defaultSize;
     var tableFirstLoad = true;
+    var name = "";
+    var majorType = "飞发";
     layui.use(["form", "table", "laypage", "layer"], function() {
         var table = layui.table;
         var laypage = layui.laypage;
@@ -71,10 +73,10 @@ $(function() {
                 ]
             };
 
-            var majorType = "飞发";
-            var name = 0;
+
+
             if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
-                var url = "/api/fault/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name=" + name;
+                var url = "/api/fault/searchByMajor?page=" + (page + 1) + "&size=" + size + "&majorType=" + majorType + "&name" + name;
                 fetchJSON(url, {}, "get", function(data) {
                     if (data.status === 0) {
                         if (tableFirstLoad) {
@@ -156,9 +158,9 @@ $(function() {
             console.log(data)
             if (obj.event === "edit") {
                 x_admin_show(
-                    "案例标引",
+                    "编辑",
                     encodeURI(
-                        "../admin/second.html"
+                        "../admin/fault-edit.html?id="
                     ),
                     1300,
                     450,

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

@@ -72,7 +72,7 @@ $(function() {
             };
 
             var majorType = "特设";
-            var name = 0;
+            var name = "";
             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) {

src/main/resources/static/admin/js/book.html

@@ -1,165 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-cmn-Hans">
-
-<head>
-    <meta charset="UTF-8">
-    <title>维修保障故障资源平台-系统功能管理</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8">
-    <link rel="stylesheet" href="./lib/layui/css/layui.css">
-    <link rel="stylesheet" href="./css/font.css">
-    <link rel="stylesheet" href="./css/xadmin.css">
-    <script src="./lib/jquery.min.js"></script>
-    <script src="./lib/layui/layui.js" charset="utf-8"></script>
-    <script src="./js/xadmin.js"></script>
-    <script src="../other/js/functions.js"></script>
-    <script src="./js/picture3.js"></script>
-    <style>
-        .layui-form {
-            text-align: center;
-        }
-        
-        .search {
-            display: inline-block;
-            width: 800px;
-            height: 30px;
-            margin: 0 auto;
-        }
-        
-        #realName {
-            display: inline-block;
-        }
-        /* 表头信息 */
-        
-        .img-thumb img {
-            margin-top: 0;
-            height: 136px;
-            width: 100px;
-        }
-        
-        img {
-            border: none;
-        }
-        
-        .list_tup a {
-            display: block;
-            width: 500px;
-            height: 156px;
-            padding: 10px 12px;
-            border-radius: 5px;
-        }
-        
-        .list_tup .mask {
-            position: absolute;
-            left: 0;
-            top: 0;
-            z-index: 1;
-            display: none;
-            width: 271px;
-            height: 176px;
-            background-color: #f5f5f5;
-            border-radius: 15px;
-            opacity: .1;
-            filter: alpha(opacity=10);
-        }
-        
-        .list_tup .detials {
-            float: right;
-            width: 140px;
-            margin-top: -140px;
-        }
-        
-        .list_tup .detials h1 {
-            color: #666;
-            font-size: 14px;
-            height: 42px;
-            /* background: url(../../../images/result_tit_bg.png) no-repeat left bottom; */
-            line-height: 42px;
-            margin-bottom: 6px;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            clear: both;
-        }
-        
-        .list_tup .detials p {
-            color: #666;
-            font-size: 12px;
-            line-height: 24px;
-            width: 140px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            clear: both;
-        }
-        
-        .layui-table-header {
-            border-width: 0 0 1px;
-            display: none;
-            border: 0px;
-            /* overflow: hidden; */
-        }
-        
-        .layui-table-cell {
-            height: auto;
-            widows: auto;
-            white-space: normal;
-        }
-        
-        ##typeTpl {
-            display: none
-        }
-    </style>
-</head>
-
-<body class="layui-anim layui-anim-up">
-
-    <div class="x-body">
-        <form class="layui-form">
-            <button id="uploading" class="layui-btn layui-btn-sm">
-				<i class="layui-icon">&#xe61f;</i>上传</button>
-            <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
-                <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
-            </a>
-            <div class="search">
-                <input id="realName" type="text" name="realName" placeholder="请输入名称" autocomplete="off" class="layui-input" style='width: 600px;height: 40px;'>
-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
-                  <i class="layui-icon">&#xe615;</i>
-                </button>
-            </div>
-
-        </form>
-        <table id="airList" class="layui-table" lay-filter="airList " lay-data="{id: 'airList'} " lay-skin="nob">
-        </table>
-
-        <div id="pagination"></div>
-        <!-- <script type="text/html" id="typeTpl">
-            <a target="_blank " href="chapter.html">{{d.img}} </a>
-
-        </script> -->
-        <script type="text/html" id="type">
-            <div>
-                <div class="list_tup">
-                    <a target="_blank " href="chapter.html" title="民用飞机设计与研究 ">
-                        <span class="mask "></span>
-                        <div class="img-thumb ">
-                            <img class="lazy" src="./images/1.jpg " style="display:inline; ">
-                        </div>
-                        <div class="detials ">
-                            <h1>书名：人格决定命运</h1>
-
-                            <p>作者：***</p>
-
-                            <p>出版时间： 2020年2月3日</p>
-
-                        </div>
-                    </a>
-                </div>
-            </div>
-        </script>
-    </div>
-
-</body>
-
-</html>

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

@@ -1,245 +1,239 @@
 $(function() {
-    var defaultPage = 0;
-    var defaultSize = 10;
-    var currentPage = defaultPage;
-    var currentSize = defaultSize;
-    var tableFirstLoad = true;
-    layui.use(["form", "table", "laypage", "layer"], function() {
-        var table = layui.table;
-        var laypage = layui.laypage;
-        var layer = layui.layer;
-        var title = $("#realName");
-        var searchTitleKey = "";
-
-
-        function loadAirList(page, size, searchTitle) {
-            if (page === null || page === undefined) page = defaultPage;
-            if (size === null || size === undefined) size = defaultSize;
-
-            var tableOption = {
-                elem: "#airList",
-                height: "full-81",
-                limit: size,
-                cols: [
-                    [
-
-                        {
+	var defaultPage = 0;
+	var defaultSize = 10;
+	var currentPage = defaultPage;
+	var currentSize = defaultSize;
+	var tableFirstLoad = true;
+	layui.use(["form", "table", "laypage", "layer"], function() {
+		var table = layui.table;
+		var laypage = layui.laypage;
+		var layer = layui.layer;
+		var title = $("#realName");
+		var searchTitleKey = "";
+
+
+		function loadAirList(page, size, searchTitle) {
+			if (page === null || page === undefined) page = defaultPage;
+			if (size === null || size === undefined) size = defaultSize;
+
+			var tableOption = {
+				elem: "#airList",
+				height: "full-81",
+				limit: size,
+				cols: [
+					[
+						{
                             field: "fault_name",
-                            title: "故障名称",
-                            templet: '#typeTpl',
-                            align: "center"
-                        },
-                        {
-                            field: "fault_number",
-                            title: "故障编号",
-                            align: "center"
-                        },
-
-                        {
-                            field: "department",
-                            title: "单位部门",
+                            title: "案例名称",
                             align: "center"
                         },
-                        {
-                            field: "aircraft_type",
-                            title: "飞机类型",
-                            align: "center"
-                        },
-                        {
-                            field: "major_type",
-                            title: "专业类型",
-                            align: "center"
-                        },
-
-
-                        {
-                            field: "input_time",
-                            title: "开始时间",
-                            align: "center"
-                        },
-
-
-
-                        {
-                            fixed: "right",
-                            title: "操作",
-                            width: 180,
-                            toolbar: "#operationToolbar",
-                            align: "center"
-                        }
-                    ]
-                ]
-            };
-
-
-            if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
-                var url = "api/fault/listpage?page=" + (page + 1) + "&size=" + size;
-                fetchJSON(url, {}, "get", function(data) {
-                    if (data.status === 0) {
-                        if (tableFirstLoad) {
-                            tableFirstLoad = false;
-                            laypage.render({
-                                curr: page + 1,
-                                elem: "pagination",
-                                count: data.data.total,
-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
-                                jump: function(obj, first) {
-                                    if (first) return;
-                                    currentPage = obj.curr - 1;
-                                    currentSize = obj.limit;
-                                    loadAirList(currentPage, currentSize, searchTitleKey);
-                                }
-                            });
-                        }
-                        // console.log(data.data)
-                        tableOption.data = data.data.list;
-                        table.render(tableOption);
-                    } else {
-                        showMsg(data.msg, 2, 2000);
-                    }
-                });
-            } else {
-                // var url = ;
-                fetchJSON("api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
-                    if (data.status === 0) {
-                        if (tableFirstLoad) {
-                            tableFirstLoad = false;
-                            laypage.render({
-                                curr: page + 1,
-                                elem: "pagination",
-                                count: data.data.total,
-                                layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
-                                jump: function(obj, first) {
-                                    if (first) return;
-                                    currentPage = obj.curr - 1;
-                                    currentSize = obj.limit;
-                                    loadAirList(currentPage, currentSize, searchTitleKey);
-                                }
-                            });
-                        }
-                        // console.log(data.data)
-                        tableOption.data = data.data;
-                        table.render(tableOption);
-                    } else {
-                        showMsg(data.msg, 2, 2000);
-                    }
-                });
-            }
-
-
-        }
-        loadAirList();
-
-        $("#searchArticle").on("click", function(e) {
-            e.preventDefault();
-            tableFirstLoad = true;
-            searchTitleKey = title.val().trim();
-            if (searchTitleKey === "")
-                loadAirList(0, currentSize);
-            else
-                loadAirList(0, currentSize, searchTitleKey);
-        });
-
-
-        $("#keyword").on("keyup", function(e) {
-            e.preventDefault();
-            if (e.keyCode === 13) {
-                $("#searchArticle").click();
-            }
-        });
-
-
-        // 监听表内工具条
-        table.on("tool(airList)", function(obj) {
-            var data = obj.data;
-            console.log(data)
-            if (obj.event === "edit") {
-                x_admin_show(
-                    "编辑",
-                    encodeURI(
-                        "../admin/second.html"
-                    ),
-                    1300,
-                    450,
-                    function() {
-                        loadAirList(currentPage, currentSize);
-                    }
-                );
-
-
-
-            } else if (obj.event === "delete") {
-                // console.log(data)
-                // 删除
-                var ids = [];
-                ids.push(data.id);
-                layer.confirm("确认要删除吗？", function() {
-                    fetchJSON("api/fault/delete", {
-                        ids: ids
-                    }, "post", function(data) {
-                        if (data.status === 0) {
-                            showMsg("已删除!", 1, 2000);
-                            tableFirstLoad = true;
-                            loadAirList(currentPage, currentSize);
-                        } else {
-                            showMsg(data.msg, 2, 2000);
-                        }
-                    });
-                });
-            }
-        });
-        // 批量删除
-        $("#batchDelete").on("click", function(e) {
-            e.preventDefault();
-            var checkedData = table.checkStatus("airList").data;
-            if (checkedData.length === 0) {
-                showMsg("未选择需要删除的日志", 2, 2000);
-                return;
-            }
-            layer.confirm("确认要删除吗？", function() {
-                var ids = [];
-                for (var i = 0; i < checkedData.length; i++) {
-                    ids.push(checkedData[i].id);
-                }
-
-                fetchJSON("api/fault/delete", {
-                    ids: ids
-                }, "post", function(data) {
-                    if (data.status === 0) {
-                        showMsg("已删除!");
-                        tableFirstLoad = true;
-                        loadAirList(currentPage, currentSize);
-                    } else {
-                        showMsg(data.msg, 2, 2000);
-                    }
-                });
-            });
-        });
-        // 导入
-        //表格导入
-        $("#tolead").on("click", function(e) {
-            e.preventDefault();
-            tableFirstLoad = true;
-            x_admin_show("导入",
-                "../admin/faul-add.html",
-                350,
-                200,
-                function() {
-                    loadAirList(currentPage, currentSize);
-                });
-        });
-        // 新建用户
-        $("#add").on("click", function(e) {
-            e.preventDefault();
-            tableFirstLoad = true;
-            x_admin_show("添加",
-                "../admin/fault-edit.html?id=0&fault_name=&fault_number=&author=&department=&aircraft_type=&major_type=&description=&input_time=&fault_time&chapter&remarks=",
-                1300,
-                450,
-                function() {
-                    loadAirList(currentPage, currentSize);
-                });
-        });
-
-    });
-});
+						{
+						    field: "department",
+						    title: "案例编号",
+						    align: "center"
+						},
+						{
+						    field: "aircraft_type",
+						    title: "机型",
+						    align: "center"
+						},
+						{
+						    field: "major_type",
+						    title: "专业",
+						    align: "center"
+						},
+						{
+						    field: "input_time",
+						    title: "日期",
+						    align: "center"
+						},
+						{
+							fixed: "right",
+							title: "操作",
+							width: 180,
+							toolbar: "#operationToolbar",
+							align: "center"
+						}
+					]
+				]
+			};
+
+
+			if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
+				var url = "api/fault/listpage?page=" + (page + 1) + "&size=" + size;
+				fetchJSON(url, {}, "get", function(data) {
+					if (data.status === 0) {
+						if (tableFirstLoad) {
+							tableFirstLoad = false;
+							laypage.render({
+								curr: page + 1,
+								elem: "pagination",
+								count: data.data.total,
+								layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
+								jump: function(obj, first) {
+									if (first) return;
+									currentPage = obj.curr - 1;
+									currentSize = obj.limit;
+									loadAirList(currentPage, currentSize, searchTitleKey);
+								}
+							});
+						}
+						// console.log(data.data)
+						tableOption.data = data.data.list;
+						table.render(tableOption);
+					} else {
+						showMsg(data.msg, 2, 2000);
+					}
+				});
+			} else {
+				// var url = ;
+				fetchJSON("api/fault/getByName?name=" + searchTitle, {}, "get", function(data) {
+					if (data.status === 0) {
+						if (tableFirstLoad) {
+							tableFirstLoad = false;
+							laypage.render({
+								curr: page + 1,
+								elem: "pagination",
+								count: data.data.total,
+								layout: ["count", "prev", "page", "next", "limit", "refresh", "skip"],
+								jump: function(obj, first) {
+									if (first) return;
+									currentPage = obj.curr - 1;
+									currentSize = obj.limit;
+									loadAirList(currentPage, currentSize, searchTitleKey);
+								}
+							});
+						}
+						// console.log(data.data)
+						tableOption.data = data.data;
+						table.render(tableOption);
+					} else {
+						showMsg(data.msg, 2, 2000);
+					}
+				});
+			}
+
+
+		}
+		loadAirList();
+
+		$("#searchArticle").on("click", function(e) {
+			e.preventDefault();
+			tableFirstLoad = true;
+			searchTitleKey = title.val().trim();
+			if (searchTitleKey === "")
+				loadAirList(0, currentSize);
+			else
+				loadAirList(0, currentSize, searchTitleKey);
+		});
+
+
+		$("#keyword").on("keyup", function(e) {
+			e.preventDefault();
+			if (e.keyCode === 13) {
+				$("#searchArticle").click();
+			}
+		});
+
+
+		// 监听表内工具条
+		table.on("tool(airList)", function(obj) {
+			var data = obj.data;
+			// console.log(data)
+			if (obj.event === "edit") {
+				x_admin_show(
+					"案例标引",
+					encodeURI(
+						"../admin/second.html?id=" + data.id + "&fault_name=" + data.fault_name + "&fault_number=" + data.fault_number +
+						"&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 + "&book_name=" + data.book_name + "&chapter=" + data.chapter+ "&remarks=" + data.remarks
+					),
+					1200,
+					650,
+					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)
+				// 删除
+				var ids = [];
+				ids.push(data.id);
+				layer.confirm("确认要删除吗？", function() {
+					fetchJSON("api/fault/delete", {
+						ids: ids
+					}, "post", function(data) {
+						if (data.status === 0) {
+							showMsg("已删除!", 1, 2000);
+							tableFirstLoad = true;
+							loadAirList(currentPage, currentSize);
+						} else {
+							showMsg(data.msg, 2, 2000);
+						}
+					});
+				});
+			}
+		});
+		// 批量删除
+		$("#batchDelete").on("click", function(e) {
+			e.preventDefault();
+			var checkedData = table.checkStatus("airList").data;
+			if (checkedData.length === 0) {
+				showMsg("未选择需要删除的日志", 2, 2000);
+				return;
+			}
+			layer.confirm("确认要删除吗？", function() {
+				var ids = [];
+				for (var i = 0; i < checkedData.length; i++) {
+					ids.push(checkedData[i].id);
+				}
+
+				fetchJSON("api/fault/delete", {
+					ids: ids
+				}, "post", function(data) {
+					if (data.status === 0) {
+						showMsg("已删除!");
+						tableFirstLoad = true;
+						loadAirList(currentPage, currentSize);
+					} else {
+						showMsg(data.msg, 2, 2000);
+					}
+				});
+			});
+		});
+		// 导入
+		//表格导入
+		$("#tolead").on("click", function(e) {
+			e.preventDefault();
+			tableFirstLoad = true;
+			x_admin_show("导入",
+				"../admin/second1.html?fault_name=&fault_number=&author=&department=&aircraft_type=&major_type=&description=&file_path=&input_time=&fault_time=&book_name=&chapter=&remarks=",
+				900,
+				500,
+				function() {
+					loadAirList(currentPage, currentSize);
+				});
+		});
+		// 新建用户
+		$("#add").on("click", function(e) {
+			e.preventDefault();
+			tableFirstLoad = true;
+			x_admin_show("案例标引",
+				"../admin/second.html?id=0&fault_name=&fault_number=&author=&department=&aircraft_type=&major_type=&description=&file_path=&input_time=&fault_time=&book_name=&chapter=&remarks=",
+				1200,
+				650,
+				function() {
+					loadAirList(currentPage, currentSize);
+				});
+		});
+
+	});
+});

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

@@ -0,0 +1,206 @@
+let arr = [{
+		id: 0,
+		name: "飞发"
+	},
+	{
+		id: 1,
+		name: "军械"
+	},
+	{
+		id: 2,
+		name: "火控"
+	},
+	{
+		id: 3,
+		name: "电子"
+	},
+	{
+		id: 4,
+		name: "特设"
+	},
+]
+var majorId = 0
+$(function() {
+	var params = window.location.href.split("?");
+	if (params.length > 1) {
+		values = params[1].split("&");
+		if (values.length > 14) {
+			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 = "";
+			var funcflie = "";
+			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=", ""));
+				funcbook_name = decodeURI(values[8].replace("book_name=", ""));
+				funcinput_time = decodeURI(values[9].replace("input_time=", ""))
+				funcfault_time = decodeURI(values[10].replace("fault_time=", ""));
+				funcchapter = decodeURI(values[11].replace("chapter=", ""))
+				funcremarks = decodeURI(values[12].replace("remarks=", ""))
+				// funcfile_path = decodeURI(values[13].replace("file_path=", ""));
+				funcflie = decodeURI(values[14].replace("fileSelector=", ""))
+			}
+		}
+	}
+
+	$("#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);
+    $("#fileSelector").val(funcflie);
+
+	getMajorName()
+
+	layui.use(["form", "layer", "laydate","upload"], function() {
+		$ = layui.jquery;
+		var form = layui.form;
+		var layer = layui.layer;
+		var laydate = layui.laydate;
+		//监听提交
+		var upload = layui.upload;
+		laydate.render({
+			elem: '#input_time',
+			isInitValue: false,
+			type: 'datetime',
+			trigger: "click"
+		});
+		laydate.render({
+			elem: '#fault_time',
+			isInitValue: false,
+			type: 'datetime',
+			trigger: "click"
+		});
+		upload.render({
+			elem: '#fileSelector',
+			url: urlBase + "api/fault/import",
+			//accept: 'file', //普通文件
+			headers: {
+				"token":sessionStorage.getItem("token")
+			},
+			data: {},
+			accept: 'file',
+			done: function(res) {
+				if(res.status === 0)
+				{
+					$("#file_path").val(res.msg);
+				}
+				else
+					showMsg(res.msg, 2);
+			}
+		});
+		
+		form.on("submit(save)", function(data) {
+			if ($("#fault_name").val().trim() === "") {
+				showMsg("案例名称不能为空", 2);
+				$("#fault_name").focus();
+				return false;
+			}
+			if ($("#fault_number").val().trim() === "") {
+				showMsg("案例提供单位不能为空", 2);
+				$("#fault_number").focus();
+				return false;
+			}
+			if ($("#author").val().trim() === "") {
+				showMsg("作者不能为空", 2);
+				$("#author").focus();
+				return false;
+			}
+			if ($("#department").val().trim() === "") {
+				showMsg("案例编号不能为空", 2);
+				$("#department").focus();
+				return false;
+			}
+			if ($("#aircraft_type").val().trim() === "") {
+				showMsg("机型不能为空", 2);
+				$("#aircraft_type").focus();
+				return false;
+			}
+			if ($("#major_type").val().trim() === "") {
+				showMsg("专业不能为空", 2);
+				$("#major_type").focus();
+				return false;
+			}
+			if ($("#description").val().trim() === "") {
+				showMsg("故障件名称不能为空", 2);
+				$("#description").focus();
+				return false;
+			}
+			if ($("#input_time").val().trim() === "") {
+				showMsg("日期不能为空", 2);
+				$("#input_time").focus();
+				return false;
+			}
+			if ($("#fault_time").val().trim() === "") {
+				showMsg("故障时间不能为空", 2);
+				$("#fault_time").focus();
+				return false;
+			}
+			if ($("#book_name").val().trim() === "") {
+				showMsg("关键词不能为空", 2);
+				$("#book_name").focus();
+				return false;
+			}
+			if ($("#chapter").val().trim() === "") {
+				showMsg("教材章节不能为空", 2);
+				$("#chapter").focus();
+				return false;
+			}
+			var func = data.field;
+			func.id = funcId;
+			fetchJSON("api/fault/add", 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;
+		});
+		
+		
+	});
+});
+
+
+function getMajorName(){
+	$("#major_type").append($("<option>", {
+			value: -1,
+			text: "请选择"
+		}));
+		for (var i = 0; i < arr.length; i++) {
+			$("#major_type").append(
+				$("<option>", {
+					// value: arr[i].id,
+					text: arr[i].name
+				})
+			);
+		}
+}
+

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

@@ -1,157 +1,207 @@
 <!DOCTYPE html>
 <html lang="zh-cmn-Hans">
 
-<head>
-    <meta charset="UTF-8">
-    <title>维修保障故障资源平台</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8">
-    <link rel="stylesheet" href="./lib/layui/css/layui.css">
-    <link rel="stylesheet" href="./css/font.css">
-    <link rel="stylesheet" href="./css/xadmin.css">
-    <link rel="stylesheet" href="css/reset.css" />
-    <script src="./lib/jquery.min.js"></script>
-    <script src="./lib/layui/layui.js" charset="utf-8"></script>
-    <script src="./js/xadmin.js"></script>
-    <script src="../other/js/functions.js"></script>
+	<head>
+		<meta charset="UTF-8">
+		<title>维修保障故障资源平台</title>
+		<meta name="renderer" content="webkit">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+		<meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8">
+		<link rel="stylesheet" href="./lib/layui/css/layui.css">
+		<link rel="stylesheet" href="./css/font.css">
+		<link rel="stylesheet" href="./css/xadmin.css">
+		<link rel="stylesheet" href="css/reset.css" />
+		<script src="./lib/jquery.min.js"></script>
+		<script src="./lib/layui/layui.js" charset="utf-8"></script>
+		<script src="./js/xadmin.js"></script>
+		<script src="../other/js/functions.js"></script>
 
 
-    <style>
-        #box {
+		<style>
+			#box {
             position: absolute;
-            top: 18%;
+            top: 0%;
             width: 50%;
-            height: 70%;
+            height: 90%;
             border: 1px solid #000000;
-            left: 40%;
+            left: 30%;
         }
     </style>
-</head>
+	</head>
 
-<body class="layui-anim layui-anim-up">
-    <div class="layui-container">
-        <div class="layui-row">
-            <div class="layui-col-sm6" style="margin-top: 10%;">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
+	<body class="layui-anim layui-anim-up">
+		<div class="layui-container">
+			<div class="layui-row" style="margin-top: 2%;">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="fault_name" class="layui-form-label"> <span class="x-red">*</span> 案例名称</label>
+						<div class="layui-input-inline">
+							<select name="fault_name" id="fault_name" lay-filter="fault_name" lay-verify="required" style="width: 100%; height: 36px;">
+							</select>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="fault_number" class="layui-form-label">
 							<span class="x-red">*</span> 案例提供单位
 						</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-row">
-            <div class="layui-col-sm6">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
+						<div class="layui-input-inline">
+							<input type="text" id="fault_number" name="fault_number" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="author" class="layui-form-label">
 							<span class="x-red">*</span> 作者
 						</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-row">
-            <div class="layui-col-sm6">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
-							<span class="x-red">*</span> 日期
+						<div class="layui-input-inline">
+							<input type="text" id="author" name="author" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="department" class="layui-form-label">
+							<span class="x-red">*</span> 部门
 						</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-row">
-            <div class="layui-col-sm6">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
+						<div class="layui-input-inline">
+							<input type="text" id="department" name="department" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<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">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-row">
-            <div class="layui-col-sm6">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
+						<div class="layui-input-inline">
+							<input type="text" id="aircraft_type" name="aircraft_type" autocomplete="off" class="layui-input">
+						</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">
 							<span class="x-red">*</span> 专业
 						</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-row">
-            <div class="layui-col-sm6">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
-							<span class="x-red">*</span> 关键词
-						</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-row">
-            <div class="layui-col-sm6">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
+						<div class="layui-input-inline">
+							<input type="text" id="major_type" name="major_type" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="description" class="layui-form-label">
 							<span class="x-red">*</span> 故障件名称
 						</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-row">
-            <div class="layui-col-sm6">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
+						<div class="layui-input-inline">
+							<input type="text" id="description" name="description" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="file_path" class="layui-form-label">
+							<span class="x-red">*</span> 文件路径
+						</label>
+						<div class="layui-input-inline">
+							<input type="text" id="file_path" name="file_path" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="input_time" class="layui-form-label">
+							<span class="x-red">*</span> 日期
+						</label>
+						<div class="layui-input-inline">
+							<input type="text" id="input_time" name="input_time" autocomplete="off" class="layui-input" placeholder="yyyy-MM-dd">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="fault_time" class="layui-form-label">
+							<span class="x-red">*</span> 故障时间
+						</label>
+						<div class="layui-input-inline">
+							<input type="text" id="fault_time" name="fault_time" autocomplete="off" class="layui-input" placeholder="yyyy-MM-dd">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="book_name" class="layui-form-label">
+							<span class="x-red">*</span> 关键词
+						</label>
+						<div class="layui-input-inline">
+							<input type="text" id="book_name" name="book_name" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="chapter" class="layui-form-label">
 							<span class="x-red">*</span> 教材章节
 						</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-row">
-            <div class="layui-col-sm6">
-                <div class="layui-form-item">
-                    <label for="type" class="layui-form-label" style="width: 108px;">
-							<span class="x-red">*</span> 案例编号
+						<div class="layui-input-inline">
+							<input type="text" id="chapter" name="chapter" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="layui-row">
+				<div class="layui-col-sm6">
+					<div class="layui-form-item">
+						<label for="remarks" class="layui-form-label">
+							<span class="x-red">*</span> 备注
 						</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="type" name="type" autocomplete="off" class="layui-input" style="width: 30vh;">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div id="box"></div>
-        <br>
-        <div class="layui-row">
-            <div class="layui-col-sm12" style="text-align: center;">
-                <div class="layui-form-item">
-                    <button class="layui-btn layui-btn-sm" lay-filter="save" lay-submit="">
-								 保存
-			    </button>
-                </div>
-            </div>
+						<div class="layui-input-inline">
+							<input type="text" id="remarks" name="remarks" autocomplete="off" class="layui-input">
+						</div>
+					</div>
+				</div>
+			</div>
+
+
+
+			<div id="box"></div>
+			<br>
+			<div class="layui-row">
+				<div class="layui-col-sm12" style="text-align: center;">
+					<div class="layui-form-item">
+						<button class="layui-btn layui-btn-sm" lay-filter="save" lay-submit="">
+							保存
+						</button>
+					</div>
+				</div>
 
-        </div>
-    </div>
-</body>
+			</div>
+		</div>
+	</body>
 
-</html>
+</html>

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

@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<html lang="zh-cmn-Hans">
+
+	<head>
+		<meta charset="UTF-8">
+		<title>维修保障故障资源平台</title>
+		<meta name="renderer" content="webkit">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+		<meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8">
+		<link rel="stylesheet" href="./lib/layui/css/layui.css">
+		<link rel="stylesheet" href="./css/font.css">
+		<link rel="stylesheet" href="./css/xadmin.css">
+		<link rel="stylesheet" href="css/reset.css" />
+		<script src="./lib/jquery.min.js"></script>
+		<script src="./lib/layui/layui.js" charset="utf-8"></script>
+		<script src="./js/xadmin.js"></script>
+		<script src="../other/js/functions.js"></script>
+		<script src="./js/second1.js"></script>
+
+		<style>
+			#box {
+            position: absolute;
+            top: 0%;
+            width: 70%;
+            height: 90%;
+            /* border: 1px solid #000000; */
+            left: 30%;
+        }
+    </style>
+	</head>
+
+	<body>
+		<div class="x-body layui-anim layui-anim-up">
+			<form class="layui-form">
+				<div class="layui-container">
+					<div class="layui-row" style="margin-top: 2%;">
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="fault_name" class="layui-form-label">
+									<span class="x-red">*</span> 案例名称
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="fault_name" name="fault_name" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="fault_number" class="layui-form-label">
+									<span class="x-red">*</span> 案例单位
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="fault_number" name="fault_number" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="layui-row">
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="author" class="layui-form-label">
+									<span class="x-red">*</span> 作者
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="author" name="author" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="department" class="layui-form-label">
+									<span class="x-red">*</span> 案例编号
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="department" name="department" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="layui-row">
+						<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">
+									<input type="text" id="aircraft_type" name="aircraft_type" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="major_type" class="layui-form-label"> <span class="x-red">*</span> 专业</label>
+								<div class="layui-input-inline">
+									<select name="major_type" id="major_type" lay-filter="major_type" lay-verify="required"> </select>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="layui-row">
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="description" class="layui-form-label">
+									<span class="x-red">*</span> 故障件名称
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="description" name="description" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="book_name" class="layui-form-label">
+									<span class="x-red">*</span> 关键词
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="book_name" name="book_name" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+
+					</div>
+					<div class="layui-row">
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="input_time" class="layui-form-label">
+									<span class="x-red">*</span> 日期
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="input_time" name="input_time" autocomplete="off" class="layui-input" placeholder="yyyy-MM-dd">
+								</div>
+							</div>
+						</div>
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="fault_time" class="layui-form-label">
+									<span class="x-red">*</span> 故障时间
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="fault_time" name="fault_time" autocomplete="off" class="layui-input" placeholder="yyyy-MM-dd">
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="layui-row">
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="chapter" class="layui-form-label">
+									<span class="x-red">*</span> 教材章节
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="chapter" name="chapter" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="remarks" class="layui-form-label">备注
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="remarks" name="remarks" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="layui-row">
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="file_path" class="layui-form-label">
+									文件路径
+								</label>
+								<div class="layui-input-inline">
+									<input type="text" id="file_path" name="file_path" autocomplete="off" class="layui-input">
+								</div>
+							</div>
+						</div>
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="fileSelector" class="layui-form-label"> <span class="x-red">*</span> 选择文件 </label>
+								<div class="layui-input-inline" style="padding-top:6px">
+									<input type="file" name="file" id="fileSelector">
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<br>
+				<div class="layui-row">
+					<div class="layui-col-sm12" style="text-align: center;">
+						<div class="layui-form-item">
+							<button class="layui-btn layui-btn-sm" lay-filter="save" lay-submit="">
+								保存
+							</button>
+						</div>
+					</div>
+				</div>
+			</form>
+	</body>
+</html>

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

@@ -1,6 +1,7 @@
 //var urlBase = window.location.origin + "/";
 
 var urlBase = "http://180.76.52.24:11083/";
+// var urlBase = "http://127.0.0.1:11083/";
 
 function loginout() {
     /*if ($("#loginMenu").text() == "登录") {