抽取测试

src/web/templates/admin/result_list.html

@@ -176,8 +176,9 @@ $(function () {
 						{label:"任务名称",s_label:"s_taskname",type:"tpl_list_local",must:true,url:"/admin/task/gettaskname"},
 						{label:"起始id",s_label:"s_startid",must:true},
 						{label:"抽取数量",s_label:"s_datanum",placeholder:"5",must:true},
-						{label:"结果表",s_label:"s_resultcoll",must:true},
-						{label:"日志表",s_label:"s_trackcoll",must:true},
+						{label:"结果版本",s_label:"s_resulttrack",must:true}
+						//{label:"结果表",s_label:"s_resultcoll",must:true},
+						//{label:"日志表",s_label:"s_trackcoll",must:true},
 						
 				]
 				//测试启动按钮
@@ -188,16 +189,20 @@ $(function () {
 							var id = $("#s_startid").val();
 							var num = $("#s_datanum").val();
 							var taskid = $("#s_taskname").val();
-							var resultcoll = $("#s_resultcoll").val();
-							var trackcoll = $("#s_trackcoll").val();
-							sessionStorage.setItem("resultcoll",resultcoll);
-							sessionStorage.setItem("trackcoll",trackcoll);
+							var resulttrack = $("#s_resulttrack").val();
+							//var resultcoll = $("#s_resultcoll").val();
+							//var trackcoll = $("#s_trackcoll").val();
+							
 							var bcon = true;
-							if(id == "" || resultcoll == "" || trackcoll == ""){
+							if(id == "" || resulttrack == ""){
 								bcon = false;
 								alert("红色标签的表单不能为空！");
 								return
 							}
+							var resultcoll = "result_"+resulttrack; 
+							var trackcoll = "track_"+resulttrack; 
+							sessionStorage.setItem("resultcoll",resultcoll);
+							sessionStorage.setItem("trackcoll",trackcoll);
 							if(num != ""){//验证数字
 								if(!reg.test(num)){
 									bcon = false;

src/web/templates/admin/track.html

@@ -15,11 +15,20 @@
     box-shadow: 0 0 20px rgba(0, 0, 0, .2);
     z-index: 999;
 	width:680px;
-	height: 484px;
+	/*height: 484px;*/
 }
 .first{
 	margin-bottom:0px; 
 }
+.first tr>th:nth-child(1){
+	width:101px;
+}
+.first tr>th:nth-child(2){
+	width:306px;
+}
+.first tr>th:nth-child(3){
+	width:259px;
+}
 .first thead tr th{
 	padding-left: 4px;
 	width:132px;
@@ -38,8 +47,22 @@
 	padding-left: 0px;
     padding-right: 0px;
 }
-.table>tbody>tr>td div{
-	width: 132px;
+.table>tbody>tr>td:nth-child(1) div{
+	width: 100px;
+    padding-left: 4px;
+	white-space: normal;
+	word-break: break-all;
+    word-wrap: break-word;
+}
+.table>tbody>tr>td:nth-child(2) div{
+	width: 300px;
+    padding-left: 4px;
+	white-space: normal;
+	word-break: break-all;
+    word-wrap: break-word;
+}
+.table>tbody>tr>td:nth-child(3) div{
+	width: 269px;
     padding-left: 4px;
 	white-space: normal;
 	word-break: break-all;
@@ -54,6 +77,12 @@
 .datanull{
 	padding-Left:20px;
 }
+.extractsource{
+	padding: 0px 50px;
+}
+.extracttype{
+	padding: 0px 50px;
+}
 </style>
 <div class="content-wrapper">
 	<section class="content-header" style="padding: 49px 15px 0 15px;">
@@ -95,25 +124,37 @@
 		if(flag3){
 			$("#resultdata").css("overflow-x","hidden");
 		}
+		var wheight = $(".content-wrapper").height();
+		$(".box").css("height",wheight*0.8+"px");
+		$(".second").css("height",wheight*0.8-90+"px");
 	})
 	
 	function createnewbox(key,arr){
 		var tablehtml = "";
 		var flag2 = false;
+		var sourcehtml = "";
+		var typehtml = "";
 		for(var i in arr){
 			flag2 = true;
+			if(sourcehtml == ""){
+				sourcehtml = '<span class="extractsource">抽取来源:<span class="sourceval">'+arr[i]["extfrom"]+'</span></span>'
+			}
+			if(typehtml == ""){
+				typehtml = '<span class="extracttype">抽取来源:<span class="typeval">'+arr[i]["matchtype"]+'</span></span>'
+			}
 			tablehtml = tablehtml + createtable(arr[i])
 		}
 		if(flag2){
 			var boxhtml = '<div class="resultshowstyle">'
 							+'<div class="box box-primary">'
-								+'<div class="codestyle">Code : '+key+'</div>'
+								+'<div class="codestyle">Code : '+key+sourcehtml+typehtml
+								+'</div>'
 								+'<table class="table first">'
 									+'<thead>'
 			    						+'<tr>'
 			      							+'<th>匹配代码</th>'
-			      							+'<th>抽取来源</th>'
-											+'<th>抽取类型</th>'
+			      							//+'<th>抽取来源</th>'
+											//+'<th>抽取类型</th>'
 											+'<th>抽取结果</th>'
 											+'<th>抽取描述</th>'
 											+'<th style="width:20px;"></th>'
@@ -134,8 +175,8 @@
 	function createtable(map){
 		var trhtml = '<tr>'
 						+'<td><div>'+map["code"]+'</div></td>'
-						+'<td><div>'+map["extfrom"]+'</div></td>'
-						+'<td><div>'+map["matchtype"]+'</div></td>'
+						//+'<td><div>'+map["extfrom"]+'</div></td>'
+						//+'<td><div>'+map["matchtype"]+'</div></td>'
 						+'<td><div>'+map["value"]+'</div></td>'
 						+'<td><div>'+map["name"]+'</div></td>'
 						+'<td><div style="width:20px;"></div></td>'