下载

admin/experiment-add.html

@@ -105,7 +105,7 @@
 					</div>
 
 					<div class="layui-row">
-						<div class="layui-col-sm6">
+						<!-- <div class="layui-col-sm6">
 							<div class="layui-form-item">
 								<label for="source_id" class="layui-form-label">
 									数据id
@@ -115,6 +115,14 @@
 										class="layui-input">
 								</div>
 							</div>
+						</div> -->
+						<div class="layui-col-sm6">
+							<div class="layui-form-item">
+								<label for="file" class="layui-form-label">选择文件 </label>
+								<div class="layui-input-inline" style="padding-top:6px">
+									<input type="file" name="file" id="file">
+								</div>
+							</div>
 						</div>
 						<div class="layui-col-sm6">
 							<div class="layui-form-item">
@@ -123,10 +131,11 @@
 								</label>
 								<div class="layui-input-inline">
 									<input type="text" id="origin_data_path" name="origin_data_path" autocomplete="off"
-										class="layui-input">
+										class="layui-input" disabled="disabled">
 								</div>
 							</div>
 						</div>
+						
 					</div>
 
 					<div class="layui-row">
@@ -154,7 +163,7 @@
 						</div>
 					</div>
 
-					<div class="layui-row">
+					<!-- <div class="layui-row">
 						<div class="layui-col-sm6">
 							<div class="layui-form-item">
 								<label for="process_data_path" class="layui-form-label">
@@ -166,7 +175,7 @@
 								</div>
 							</div>
 						</div>
-					</div>
+					</div> -->
 				</div>
 				<br>
 				<div class="layui-row" style="text-align: center;">

admin/experiment.html

@@ -62,14 +62,14 @@
 			</table>
 			<div id="pagination"></div>
 			<script type="text/html" id="operationToolbar">
-				<div style="display: flex;">
 				<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+				<a class="layui-btn layui-btn-xs" lay-event="download">下载</a>
 				<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
 				</div>
 			</script>
 			<script type="text/html" id="index">
 					    {{d.LAY_TABLE_INDEX+1}}
-					</script>
+			</script>
 		</div>
 	</body>
 

admin/js/algorithm.js

@@ -6,175 +6,175 @@ $(function() {
 	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 loadalgorithm(page, size, searchTitle) {
-				if (page === null || page === undefined) page = defaultPage;
-				if (size === null || size === undefined) size = defaultSize;
-				var tableOption = {
-					elem: "#algorithm",
-					height: "full-81",
-					limit: size,
-					cols: [
-						[{
-								type: "checkbox"
-							},
-
-							{
-								field: "algorithm_type",
-								title: "算法类别",
-								align: "center",
-								width: 200,
-							},
-							{
-								field: "algorithm_name",
-								title: "算法名称",
-								align: "center"
-							},
-							{
-								field: "algorithm_format",
-								title: "调用格式",
-								align: "center"
-							},
-							{
-								field: "device_name",
-								title: "元气件名称",
-								align: "center"
-							},
-							{
-								field: "create_time",
-								title: "创建时间",
-								align: "center"
-							},
-							{
-								field: "algorithm_path",
-								title: "算法地址",
-								align: "center"
-							},
-							{
-								field: "remarks",
-								title: "备注",
-								align: "center"
-							},
-							{
-								fixed: "right",
-								title: "操作",
-								width: 265,
-								toolbar: "#operationToolbar",
-								align: "center"
-							}
-						]
+		var table = layui.table;
+		var laypage = layui.laypage;
+		var layer = layui.layer;
+		var title = $("#realName");
+		var searchTitleKey = "";
+
+		function loadalgorithm(page, size, searchTitle) {
+			if (page === null || page === undefined) page = defaultPage;
+			if (size === null || size === undefined) size = defaultSize;
+			var tableOption = {
+				elem: "#algorithm",
+				height: "full-81",
+				limit: size,
+				cols: [
+					[{
+							type: "checkbox"
+						},
+
+						{
+							field: "algorithm_type",
+							title: "算法类别",
+							align: "center",
+							width: 200,
+						},
+						{
+							field: "algorithm_name",
+							title: "算法名称",
+							align: "center"
+						},
+						{
+							field: "algorithm_format",
+							title: "调用格式",
+							align: "center"
+						},
+						{
+							field: "device_name",
+							title: "元气件名称",
+							align: "center"
+						},
+						{
+							field: "create_time",
+							title: "创建时间",
+							align: "center"
+						},
+						{
+							field: "algorithm_path",
+							title: "算法地址",
+							align: "center"
+						},
+						{
+							field: "remarks",
+							title: "备注",
+							align: "center"
+						},
+						{
+							fixed: "right",
+							title: "操作",
+							width: 265,
+							toolbar: "#operationToolbar",
+							align: "center"
+						}
 					]
-				};
-
-				if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
-					fetchJSON("api/algorithm/listpage?page=" + (page + 1) + "&size=" + size, {}, "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;
-											loadalgorithm(currentPage, currentSize,
-												searchTitleKey);
-										}
-									});
-								}
-
-								tableOption.data = data.data.list;
-								table.render(tableOption);
-							} else {
-								showMsg(data.msg, 2, 2000);
-							}
-						});
-				}
+				]
+			};
 
+			if (searchTitle === null || searchTitle === undefined || searchTitle === "") {
+				fetchJSON("api/algorithm/listpage?page=" + (page + 1) + "&size=" + size, {}, "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;
+										loadalgorithm(currentPage, currentSize,
+											searchTitleKey);
+									}
+								});
+							}
 
+							tableOption.data = data.data.list;
+							table.render(tableOption);
+						} else {
+							showMsg(data.msg, 2, 2000);
+						}
+					});
 			}
 
-			loadalgorithm();
 
-			$("#searchArticle").on("click", function(e) {
-				e.preventDefault();
-				tableFirstLoad = true;
-				searchTitleKey = title.val().trim();
-				if (searchTitleKey === "")
-					loadalgorithm(0, currentSize);
-				else
-					loadalgorithm(0, currentSize, searchTitleKey);
-			});
+		}
 
+		loadalgorithm();
 
-			$("#keyword").on("keyup", function(e) {
-				e.preventDefault();
-				if (e.keyCode === 13) {
-					$("#searchArticle").click();
-				}
-			});
+		$("#searchArticle").on("click", function(e) {
+			e.preventDefault();
+			tableFirstLoad = true;
+			searchTitleKey = title.val().trim();
+			if (searchTitleKey === "")
+				loadalgorithm(0, currentSize);
+			else
+				loadalgorithm(0, currentSize, searchTitleKey);
+		});
 
-			// 监听表内工具条
-			table.on("tool(algorithm)", function(obj) {
-					var data = obj.data;
-					if (obj.event === "edit") {
-						// 打开编辑框 进行详细编辑
-						x_admin_show(
-							"编辑",
-							encodeURI(
-								"../admin/algorithm-add.html?id=" + data.id + "&algorithm_type=" +
-								data.algorithm_type + "&algorithm_name=" + data.algorithm_name +
-								"&algorithm_format=" + data.algorithm_format + "&device_name=" +
-								data.device_name + "&create_time=" + data.create_time +
-								"&algorithm_path=" + data.algorithm_path + "&remarks=" + data
-								.remarks
-							),
-							468,
-							560,
-							function() {
-								loadalgorithm(currentPage, currentSize);
-							}
-						);
-					} else if (obj.event === "delete") {
-						// 删除
-						var ids = [];
-						ids.push(data.id);
-						layer.confirm("确认要删除吗？", function() {
-							fetchJSON("api/algorithm/delete", {
-								ids: ids
-							}, "post", function(data) {
-								if (data.status === 0) {
-									showMsg("已删除!", 1, 2000);
-									tableFirstLoad = true;
-									loadalgorithm(currentPage, currentSize);
-								} else {
-									showMsg(data.msg, 2, 2000);
-								}
-							});
-						});
-					} else 
-					if (obj.event === 'download') {
-						var file_path = data.algorithm_path;
-						var newurl = file_path.substr(1, file_path.length);
-						file_path = newurl.substr(newurl.indexOf('\\') + 1, file_path.length);
-						newurl = file_path.substr(0, file_path.indexOf('.'))
-						newurl = urlBase + "sourcekg/" + newurl + ".rar";
-						console.log(newurl)
-						window.open('http://127.0.0.1:11085/sourcekg/1626248784559.rar')
-						
-				}
-			});
+
+		$("#keyword").on("keyup", function(e) {
+			e.preventDefault();
+			if (e.keyCode === 13) {
+				$("#searchArticle").click();
+			}
+		});
+
+		// 监听表内工具条
+		table.on("tool(algorithm)", function(obj) {
+			var data = obj.data;
+			if (obj.event === "edit") {
+				// 打开编辑框 进行详细编辑
+				x_admin_show(
+					"编辑",
+					encodeURI(
+						"../admin/algorithm-add.html?id=" + data.id + "&algorithm_type=" +
+						data.algorithm_type + "&algorithm_name=" + data.algorithm_name +
+						"&algorithm_format=" + data.algorithm_format + "&device_name=" +
+						data.device_name + "&create_time=" + data.create_time +
+						"&algorithm_path=" + data.algorithm_path + "&remarks=" + data
+						.remarks
+					),
+					468,
+					560,
+					function() {
+						loadalgorithm(currentPage, currentSize);
+					}
+				);
+			} else if (obj.event === "delete") {
+				// 删除
+				var ids = [];
+				ids.push(data.id);
+				layer.confirm("确认要删除吗？", function() {
+					fetchJSON("api/algorithm/delete", {
+						ids: ids
+					}, "post", function(data) {
+						if (data.status === 0) {
+							showMsg("已删除!", 1, 2000);
+							tableFirstLoad = true;
+							loadalgorithm(currentPage, currentSize);
+						} else {
+							showMsg(data.msg, 2, 2000);
+						}
+					});
+				});
+			} else
+			if (obj.event === 'download') {
+				var file_path = data.algorithm_path;
+				var newurl = file_path.substr(1, file_path.length);
+				file_path = newurl.substr(newurl.indexOf('\\') + 1, file_path.length);
+				newurl = file_path.substr(0, file_path.indexOf('.'))
+				newurl = urlBase + "sourcekg/" + newurl + ".csv";
+				console.log(newurl)
+				window.open(newurl)
+
+			}
+		});
 		// 批量删除
 		$("#batchDelete").on("click", function(e) {
 			e.preventDefault();

admin/js/experiment-add.js

@@ -50,7 +50,23 @@ $(function() {
 			layer = layui.layer;
 		var upload = layui.upload;
 		//监听提交
-
+		
+		upload.render({
+			elem: '#file',
+			url: urlBase + "api/repairManual/import",
+			//accept: 'file', //普通文件
+			headers: {
+				"token": sessionStorage.getItem("token")
+			},
+			data: {},
+			accept: 'file',
+			done: function(res) {
+				if (res.status === 0) {
+					$("#origin_data_path").val(res.msg);
+				} else
+					showMsg(res.msg, 2);
+			}
+		});
 
 		form.on("submit(save)", function(data) {
 			
@@ -61,7 +77,9 @@ $(function() {
 			}else{
 				var url="api/experiment/edit"
 			}
-			console.log(url)
+			// console.log(url)
+			func.process_data_path = "string"
+			func.source_id = 0;
 			fetchJSON(url, func, "post", function(data) {
 				if (data.status === 0) {
 					var index = parent.layer.getFrameIndex(window.name);

admin/js/experiment.js

@@ -62,11 +62,11 @@ $(function() {
 							title: "数据类型",
 							align: "center"
 						},
-						{
-							field: "source_id",
-							title: "数据id",
-							align: "center"
-						},
+						// {
+						// 	field: "source_id",
+						// 	title: "数据id",
+						// 	align: "center"
+						// },
 						{
 							field: "origin_data_path",
 							title: "数据文件路径",
@@ -82,15 +82,15 @@ $(function() {
 							title: "算法名称",
 							align: "center"
 						},
-						{
-							field: "process_data_path",
-							title: "处理数据路径",
-							align: "center"
-						},
+						// {
+						// 	field: "process_data_path",
+						// 	title: "处理数据路径",
+						// 	align: "center"
+						// },
 						{
 							fixed: "right",
 							title: "操作",
-							width: 179,
+							width: 200,
 							toolbar: "#operationToolbar",
 							align: "center"
 						}
@@ -187,9 +187,10 @@ $(function() {
 						"&experiment_name=" + data.experiment_name + "&start_time=" + data
 						.start_time + "&end_time=" + data.end_time +
 						"&data_type=" + data.data_type + "&source_id=" + data.source_id +
-						"&origin_data_path=" + data.origin_data_path + "&algorithm_id=" + data
-						.algorithm_id+ "&algorithm_name=" + data
-						.algorithm_name+ "&process_data_path=" + data
+						"&origin_data_path=" + data.origin_data_path + "&algorithm_id=" +
+						data
+						.algorithm_id + "&algorithm_name=" + data
+						.algorithm_name + "&process_data_path=" + data
 						.algorithm_name
 					),
 					800,
@@ -216,6 +217,16 @@ $(function() {
 						}
 					});
 				});
+			} else
+			if (obj.event === 'download') {
+				var file_path = data.origin_data_path;
+				var newurl = file_path.substr(1, file_path.length);
+				file_path = newurl.substr(newurl.indexOf('\\') + 1, file_path.length);
+				newurl = file_path.substr(0, file_path.indexOf('.'))
+				newurl = urlBase + "sourcekg/" + newurl + ".csv";
+				console.log(newurl)
+				window.open(newurl)
+
 			}
 
 		});