local version 1.13

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

@@ -70,15 +70,15 @@ $(function() {
 	$("#book_name").val(funcbook_name);
 	$("#chapter").val(funcchapter);
 	$("#remarks").val(funcremarks);
-
+	$("#box").attr('src',urlBase+funcfile_path);
 
 	// getFaultName()
 
-	layui.use("form", function() {
+	layui.use("form", function () {
 		layui.form.render();
 	});
 
-	layui.use(["form", "layer", "laydate"], function() {
+	layui.use(["form", "layer", "laydate"], function () {
 		$ = layui.jquery;
 		var form = layui.form;
 		var layer = layui.layer;
@@ -95,7 +95,7 @@ $(function() {
 			type: 'datetime',
 			trigger: "click"
 		});
-		form.on("submit(save)", function(data) {
+		form.on("submit(save)", function (data) {
 			if ($("#fault_name").val().trim() === "") {
 				showMsg("案例名称不能为空", 2);
 				$("#fault_name").focus();
@@ -153,9 +153,8 @@ $(function() {
 			}
 			var func = data.field;
 			func.id = funcId;
-
 			var url = "api/fault/edit";
-			fetchJSON(url, func, "post", function(data) {
+			fetchJSON(url, func, "post", function (data) {
 				if (data.status === 0) {
 					var index = parent.layer.getFrameIndex(window.name);
 					showMsg("修改成功", 1, 2000);
@@ -167,7 +166,44 @@ $(function() {
 			return false;
 		});
 
+
+	function getTypes() {
+		fetchJSON("api/aircraft/listAll", {}, "get", function (ret) {
+			console.log(ret)
+			if (ret.status === 0) {
+				$("#aircraft_type").empty();
+				$("#aircraft_type").append($("<option>", {
+					value: -1,
+					text: "请选择"
+				}));
+				for (var i = 0; i < ret.data.length; i++) {
+					if (ret.data[i].aircraft_type === funcaircraft_type) {
+						$("#aircraft_type").append(
+							$("<option>", {
+								value: ret.data[i].id,
+								text: ret.data[i].aircraft_type,
+								selected: true
+							})
+						);
+					} else {
+						$("#aircraft_type").append(
+							$("<option>", {
+								value: ret.data[i].id,
+								text: ret.data[i].aircraft_type
+							})
+						);
+					}
+				}
+				form.render('select');
+			} else {
+				showMsg(ret.msg, 2);
+			}
+		});
+	}
+
+	getTypes();
 	});
+
 });
 
 
@@ -184,3 +220,4 @@ $(function() {
 // 			);
 // 		}
 // }
+

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

@@ -74,7 +74,6 @@ $(function() {
 	$("#remarks").val(funcremarks);
     $("#fileSelector").val(funcflie);
 
-	getMajorName()
 
 	layui.use(["form", "layer", "laydate","upload"], function() {
 		$ = layui.jquery;
@@ -113,7 +112,54 @@ $(function() {
 					showMsg(res.msg, 2);
 			}
 		});
-		
+
+		function getMajorType(){
+			fetchJSON("api/aircraft/listAll", {}, "get", function(ret) {
+				console.log(ret)
+				if (ret.status === 0) {
+					$("#aircraft_type").empty();
+					$("#aircraft_type").append($("<option>", {
+						value: -1,
+						text: "请选择"
+					}));
+					for (var i = 0; i < ret.data.length; i++) {
+
+						$("#aircraft_type").append(
+							$("<option>", {
+								value: ret.data[i].id,
+								text: ret.data[i].aircraft_type
+							})
+						);
+
+					}
+					form.render('select');
+				} else {
+					showMsg(ret.msg, 2);
+				}
+			});
+		}
+		getMajorType();
+		function getMajor()
+		{
+			$("#major").empty();
+			$("#major").append($("<option>", {
+				value: -1,
+				text: "请选择"
+			}));
+			for (var i = 0; i < arr.length; i++) {
+
+				$("#major").append(
+					$("<option>", {
+						value: arr[i].id,
+						text: arr[i].name
+					})
+				);
+
+			}
+			form.render('select');
+
+		}
+		getMajor();
 		form.on("submit(save)", function(data) {
 			if ($("#fault_name").val().trim() === "") {
 				showMsg("案例名称不能为空", 2);
@@ -187,20 +233,3 @@ $(function() {
 		
 	});
 });
-
-
-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

@@ -88,7 +88,7 @@
 									<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">
+									<select name="aircraft_type" id="aircraft_type" lay-verify="required"> </select>
 								</div>
 							</div>
 						</div>
@@ -189,7 +189,7 @@
 						</div>
 					</div>
 					<div>
-						.<iframe id="box" src=""></iframe>
+						<iframe id="box" src=""></iframe>
 					</div>
 				</div>
 				<br>
@@ -206,13 +206,5 @@
 			</form>
 		</div>
 	</body>
-	<script>
-		function geturl(){
-			var url = sessionStorage.getItem("url")
-			$("#box").attr("src","url");
-			console.log($("img"))
-		}
-		geturl()
-		
-	</script>
+
 </html>

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

@@ -84,15 +84,15 @@
 									<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">
+									<select name="aircraft_type" id="aircraft_type" lay-verify="required"> </select>
 								</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>
+								<label for="major" 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>
+									<select name="major" id="major" lay-verify="required"> </select>
 								</div>
 							</div>
 						</div>