Merge branch 'dev3.1' into dev3.1.2

src/web/templates/admin/audit_classlist.html

@@ -4,7 +4,7 @@
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
 
-<div class="content-wrapper">
+<div class="content-wrapper" id="showbtn">
 	<section class="content-header">
 		<h1>
 			<small><a class="btn btn-primary opr" opr="new">新增{{.fname}}分类</a></small>
@@ -73,7 +73,7 @@ $(function () {
        	]
 	});
 	ttablerulemanager.on('init.dt', function () {
-		$("#rulemanagerTable").on('click','a.opr',function(){
+		$("#showbtn").on('click','a.opr',function(){
 			var n=$(this).attr("opr");
 			var _tit="",htmlObj={},obj,tag=[];
 			var delid=$(this).attr("value");

src/web/templates/admin/audit_recogfield.html

@@ -4,7 +4,7 @@
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
 
-<div class="content-wrapper">
+<div class="content-wrapper" id="showbtn">
 	<section class="content-header">
 		<h1>
 			<small><a class="btn btn-primary opr" opr="new">新增识别字段</a></small>
@@ -73,7 +73,7 @@ $(function () {
        	]
 	});
 	ttablerecogfield.on('init.dt', function () {
-		$("#recogfieldTable").on('click','a.opr',function(){
+		$("#showbtn").on('click','a.opr',function(){
 			var n=$(this).attr("opr");
 			var _tit="",htmlObj={},obj,tag=[];
 			//var delid=$(this).attr("value");

src/web/templates/admin/audit_rulelist.html

@@ -4,7 +4,7 @@
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
 
-<div class="content-wrapper">
+<div class="content-wrapper" id="showbtn">
 	<section class="content-header">
 		<h1>
 			<small><a class="btn btn-primary opr" opr="new">新增{{.cname}}规则</a></small>
@@ -88,7 +88,7 @@ $(function () {
        	]
 	});
 	ttablerulemanager.on('init.dt', function () {
-		$("#rulemanagerTable").on('click','a.opr',function(){
+		$("#showbtn").on('click','a.opr',function(){
 			var n=$(this).attr("opr");
 			var rownum=parseInt($(this).attr("num"));
 			var tobj = {{.data.rule}}[rownum];//本行数据

src/web/templates/admin/task_list.html

@@ -4,7 +4,7 @@
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
 
-<div class="content-wrapper">
+<div class="content-wrapper" id="showbtn">
 	<section class="content-header">
 		<h1>
 			<small><a class="btn btn-primary opr" opr="new">新增任务</a></small>
@@ -82,7 +82,7 @@ $(function () {
        	]
 	});
 	ttable.on('init.dt', function () {
-		$("#dataTable").on('click','a.opr',function(){
+		$("#showbtn").on('click','a.opr',function(){
 			var n=$(this).attr("opr");
 			var taskid=$(this).attr("taskid");
 			var htmlObj={},obj,tag=[],bts=[];