Răsfoiți Sursa

local version

wcf 4 ani în urmă
părinte
comite
0c9b0dff3d

+ 4 - 4
src/main/java/com/zglc/fm/conf/AuthConfigurer.java

@@ -35,13 +35,13 @@ public class AuthConfigurer implements WebMvcConfigurer {
         String os = System.getProperty("os.name");
 
         if (os.toLowerCase().startsWith("win")) {  //如果是Windows系统
-            registry.addResourceHandler("/source/**")
+            registry.addResourceHandler("/sourcefm/**")
                     // /apple/**表示在磁盘apple目录下的所有资源会被解析为以下的路径
-                    .addResourceLocations("file:d:/source/");//媒体资源
+                    .addResourceLocations("file:d:/sourcefm/");//媒体资源
 
         } else {  //linux 和mac
-            registry.addResourceHandler("/source/**")
-                    .addResourceLocations("file:///source/");  //媒体资源
+            registry.addResourceHandler("/sourcefm/**")
+                    .addResourceLocations("file:///sourcefm/");  //媒体资源
         }
 
         registry.addResourceHandler("swagger-ui.html")

+ 2 - 2
src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
 
   datasource:
-    url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
-#    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+    #url: jdbc:mysql://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
 

+ 1 - 17
src/main/resources/static/admin/Electronics.html

@@ -30,28 +30,12 @@
 <body class="layui-anim layui-anim-up">
 
     <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;'>
-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
-                  <i class="layui-icon">&#xe615;</i>
-                </button>
-            </div>
 
-        </form>
         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
         </table>
         <div id="pagination"></div>
         <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>

+ 1 - 17
src/main/resources/static/admin/Flying.html

@@ -30,28 +30,12 @@
 <body class="layui-anim layui-anim-up">
 
     <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;'>
-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
-                  <i class="layui-icon">&#xe615;</i>
-                </button>
-            </div>
 
-        </form>
         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
         </table>
         <div id="pagination"></div>
         <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>

+ 1 - 17
src/main/resources/static/admin/Not_indexed.html

@@ -30,28 +30,12 @@
 <body class="layui-anim layui-anim-up">
 
     <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;'>
-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
-                  <i class="layui-icon">&#xe615;</i>
-                </button>
-            </div>
 
-        </form>
         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
         </table>
         <div id="pagination"></div>
         <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>

+ 2 - 18
src/main/resources/static/admin/ad_hoc.html

@@ -30,29 +30,13 @@
 <body class="layui-anim layui-anim-up">
 
     <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;'>
-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
-                  <i class="layui-icon">&#xe615;</i>
-                </button>
-            </div>
 
-        </form>
         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
         </table>
         <div id="pagination"></div>
         <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>

+ 1 - 17
src/main/resources/static/admin/fire_control.html

@@ -30,28 +30,12 @@
 <body class="layui-anim layui-anim-up">
 
     <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;'>
-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
-                  <i class="layui-icon">&#xe615;</i>
-                </button>
-            </div>
 
-        </form>
         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
         </table>
         <div id="pagination"></div>
         <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>

+ 2 - 7
src/main/resources/static/admin/js/Electronics.js

@@ -21,9 +21,7 @@ $(function() {
                 height: "full-81",
                 limit: size,
                 cols: [
-                    [
-
-                        {
+                    [{
                             field: "fault_name",
                             title: "故障名称",
                             templet: '#typeTpl',
@@ -57,9 +55,6 @@ $(function() {
                             title: "开始时间",
                             align: "center"
                         },
-
-
-
                         {
                             fixed: "right",
                             title: "操作",
@@ -72,7 +67,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) {

+ 6 - 15
src/main/resources/static/admin/js/Flying.js

@@ -4,8 +4,6 @@ $(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;
@@ -23,9 +21,7 @@ $(function() {
                 height: "full-81",
                 limit: size,
                 cols: [
-                    [
-
-                        {
+                    [{
                             field: "fault_name",
                             title: "故障名称",
                             templet: '#typeTpl',
@@ -52,16 +48,11 @@ $(function() {
                             title: "专业类型",
                             align: "center"
                         },
-
-
                         {
                             field: "input_time",
                             title: "开始时间",
                             align: "center"
                         },
-
-
-
                         {
                             fixed: "right",
                             title: "操作",
@@ -73,10 +64,10 @@ $(function() {
                 ]
             };
 
-
-
+            var majorType = "飞发";
+            var name = "";
             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) {
@@ -158,9 +149,9 @@ $(function() {
             console.log(data)
             if (obj.event === "edit") {
                 x_admin_show(
-                    "编辑",
+                    "案例标引",
                     encodeURI(
-                        "../admin/fault-edit.html?id="
+                        "../admin/second.html"
                     ),
                     1300,
                     450,

+ 2 - 13
src/main/resources/static/admin/js/Not_indexed.js

@@ -21,12 +21,9 @@ $(function() {
                 height: "full-81",
                 limit: size,
                 cols: [
-                    [
-
-                        {
+                    [{
                             field: "fault_name",
                             title: "故障名称",
-                            templet: '#typeTpl',
                             align: "center"
                         },
                         {
@@ -34,7 +31,6 @@ $(function() {
                             title: "故障编号",
                             align: "center"
                         },
-
                         {
                             field: "department",
                             title: "单位部门",
@@ -50,16 +46,11 @@ $(function() {
                             title: "专业类型",
                             align: "center"
                         },
-
-
                         {
                             field: "input_time",
                             title: "开始时间",
                             align: "center"
                         },
-
-
-
                         {
                             fixed: "right",
                             title: "操作",
@@ -71,10 +62,8 @@ $(function() {
                 ]
             };
 
-            var majorType = 0;
-            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;
                 fetchJSON(url, {}, "get", function(data) {
                     if (data.status === 0) {
                         if (tableFirstLoad) {

+ 1 - 6
src/main/resources/static/admin/js/ad_hoc.js

@@ -21,9 +21,7 @@ $(function() {
                 height: "full-81",
                 limit: size,
                 cols: [
-                    [
-
-                        {
+                    [{
                             field: "fault_name",
                             title: "故障名称",
                             templet: '#typeTpl',
@@ -57,9 +55,6 @@ $(function() {
                             title: "开始时间",
                             align: "center"
                         },
-
-
-
                         {
                             fixed: "right",
                             title: "操作",

+ 165 - 0
src/main/resources/static/admin/js/book.html

@@ -0,0 +1,165 @@
+<!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>

+ 2 - 9
src/main/resources/static/admin/js/fire_control.js

@@ -21,9 +21,7 @@ $(function() {
                 height: "full-81",
                 limit: size,
                 cols: [
-                    [
-
-                        {
+                    [{
                             field: "fault_name",
                             title: "故障名称",
                             templet: '#typeTpl',
@@ -50,16 +48,11 @@ $(function() {
                             title: "专业类型",
                             align: "center"
                         },
-
-
                         {
                             field: "input_time",
                             title: "开始时间",
                             align: "center"
                         },
-
-
-
                         {
                             fixed: "right",
                             title: "操作",
@@ -72,7 +65,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) {

+ 2 - 4
src/main/resources/static/admin/js/ordnance.js

@@ -21,9 +21,7 @@ $(function() {
                 height: "full-81",
                 limit: size,
                 cols: [
-                    [
-
-                        {
+                    [{
                             field: "fault_name",
                             title: "故障名称",
                             templet: '#typeTpl',
@@ -72,7 +70,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) {

+ 49 - 61
src/main/resources/static/admin/js/second.js

@@ -1,26 +1,25 @@
-let arr =[
-	{
-		id:0,
-		name:"飞发"
-	},
-	{
-		id:1,
-		name:"军械"
-	},
-	{
-		id:2,
-		name:"火控"
-	},
-	{
-		id:3,
-		name:"电子"
-	},
-	{
-		id:4,
-		name:"特设"
-	},
-]
-
+// let arr = [{
+// 		id: 0,
+// 		name: "飞发"
+// 	},
+// 	{
+// 		id: 1,
+// 		name: "军械"
+// 	},
+// 	{
+// 		id: 2,
+// 		name: "火控"
+// 	},
+// 	{
+// 		id: 3,
+// 		name: "电子"
+// 	},
+// 	{
+// 		id: 4,
+// 		name: "特设"
+// 	},
+// ]
+let majorId = 0;
 $(function() {
 	var params = window.location.href.split("?");
 	if (params.length > 1) {
@@ -73,8 +72,8 @@ $(function() {
 	$("#remarks").val(funcremarks);
 
 
-	getArticleType()
-	
+	// getFaultName()
+
 	layui.use("form", function() {
 		layui.form.render();
 	});
@@ -98,74 +97,64 @@ $(function() {
 		});
 		form.on("submit(save)", function(data) {
 			if ($("#fault_name").val().trim() === "") {
-				showMsg("装备不能为空", 2);
+				showMsg("案例名称不能为空", 2);
 				$("#fault_name").focus();
 				return false;
 			}
 			if ($("#fault_number").val().trim() === "") {
-				showMsg("装备不能为空", 2);
+				showMsg("案例提供单位不能为空", 2);
 				$("#fault_number").focus();
 				return false;
 			}
 			if ($("#author").val().trim() === "") {
-				showMsg("装备不能为空", 2);
+				showMsg("作者不能为空", 2);
 				$("#author").focus();
 				return false;
 			}
 			if ($("#department").val().trim() === "") {
-				showMsg("装备不能为空", 2);
+				showMsg("案例编号不能为空", 2);
 				$("#department").focus();
 				return false;
 			}
 			if ($("#aircraft_type").val().trim() === "") {
-				showMsg("装备不能为空", 2);
+				showMsg("机型不能为空", 2);
 				$("#aircraft_type").focus();
 				return false;
 			}
 			if ($("#major_type").val().trim() === "") {
-				showMsg("装备不能为空", 2);
+				showMsg("专业不能为空", 2);
 				$("#major_type").focus();
 				return false;
 			}
 			if ($("#description").val().trim() === "") {
-				showMsg("装备不能为空", 2);
+				showMsg("故障件名称不能为空", 2);
 				$("#description").focus();
 				return false;
 			}
-			if ($("#file_path").val().trim() === "") {
-				showMsg("装备不能为空", 2);
-				$("#file_path").focus();
-				return false;
-			}
 			if ($("#input_time").val().trim() === "") {
-				showMsg("输入时间不能为空", 2);
+				showMsg("日期不能为空", 2);
 				$("#input_time").focus();
 				return false;
 			}
 			if ($("#fault_time").val().trim() === "") {
-				showMsg("输入时间不能为空", 2);
+				showMsg("故障时间不能为空", 2);
 				$("#fault_time").focus();
 				return false;
 			}
 			if ($("#book_name").val().trim() === "") {
-				showMsg("输入时间不能为空", 2);
+				showMsg("关键词不能为空", 2);
 				$("#book_name").focus();
 				return false;
 			}
 			if ($("#chapter").val().trim() === "") {
-				showMsg("输入时间不能为空", 2);
+				showMsg("教材章节不能为空", 2);
 				$("#chapter").focus();
 				return false;
 			}
-			if ($("#remarks").val().trim() === "") {
-				showMsg("输入时间不能为空", 2);
-				$("#remarks").focus();
-				return false;
-			}
 			var func = data.field;
 			func.id = funcId;
 
-			var url = "api/fault/add";
+			var url = "api/fault/edit";
 			fetchJSON(url, func, "post", function(data) {
 				if (data.status === 0) {
 					var index = parent.layer.getFrameIndex(window.name);
@@ -182,17 +171,16 @@ $(function() {
 });
 
 
-function getArticleType() {
-	$("#fault_name").append($("<option>", {
-		value: -1,
-		text: "请选择"
-	}));
-	for (var i = 0; i < arr.length; i++) {
-		$("#fault_name").append(
-			$("<option>", {
-				// value: arr[i].id,
-				text: arr[i].name
-			})
-		);
-	}
-};
+// function getFaultName() {
+// 	$("#fault_name").append($("<option>", {
+// 		value: -1,
+// 		text: "请选择"
+// 	}));
+// 	for (var i = 0; i < arr.length; i++) {
+// 			$("#fault_name").append(
+// 				$("<option>", {
+// 					text: arr[i].name
+// 				})
+// 			);
+// 		}
+// }

+ 1 - 17
src/main/resources/static/admin/ordnance.html

@@ -30,28 +30,12 @@
 <body class="layui-anim layui-anim-up">
 
     <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;'>
-                <button id="searchArticle" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="search">
-                  <i class="layui-icon">&#xe615;</i>
-                </button>
-            </div>
 
-        </form>
         <table id="airList" class="layui-table" lay-filter="airList" lay-data="{id:'airList'}">
         </table>
         <div id="pagination"></div>
         <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>

+ 1 - 1
src/main/resources/static/admin/picture1.html

@@ -147,7 +147,7 @@
 
         <div class="layui-col-xs4 ">
             <div class="list_tup">
-                <a target="_blank " href="chapter.html" title="民用飞机设计与研究 ">
+                <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; ">

+ 158 - 147
src/main/resources/static/admin/second.html

@@ -15,193 +15,204 @@
 		<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/second.js"></script>
 
 		<style>
 			#box {
             position: absolute;
             top: 0%;
-            width: 50%;
+            width: 70%;
             height: 90%;
-            border: 1px solid #000000;
+            /* border: 1px solid #000000; */
             left: 30%;
         }
     </style>
 	</head>
 
-	<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>
+	<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>
-				</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="fault_number" name="fault_number" autocomplete="off" class="layui-input">
+					<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="fault_number" name="fault_number" autocomplete="off" class="layui-input">
+								</div>
+							</div>
 						</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 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>
-				</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="department" name="department" autocomplete="off" class="layui-input">
+					<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="department" name="department" autocomplete="off" class="layui-input">
+								</div>
+							</div>
 						</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 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>
-				</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="major_type" name="major_type" autocomplete="off" class="layui-input">
+					<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="major_type" name="major_type" autocomplete="off" class="layui-input">
+								</div>
+							</div>
 						</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 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>
-				</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 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>
-				</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 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>
-			</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 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>
-			</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 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>
-			</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 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>
-				</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="remarks" name="remarks" autocomplete="off" class="layui-input">
+					<div class="layui-row">
+						<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>
+						.<iframe id="box" src=""></iframe>
+					</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>
+				<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>
+				
+			</form>
 		</div>
 	</body>
-
+	<script>
+		function geturl(){
+			var url = sessionStorage.getItem("url")
+			$("#box").attr("src","url");
+			console.log($("img"))
+		}
+		geturl()
+		
+	</script>
 </html>

+ 2 - 3
src/main/resources/static/other/js/functions.js

@@ -1,7 +1,6 @@
-//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/";
 
 function loginout() {
     /*if ($("#loginMenu").text() == "登录") {