审核正则添加

src/jy/admin/audit/rulemanager.go

@@ -173,17 +173,23 @@ func GetOrder(sel string) int {
 
 func GetRule(c *gin.Context) {
 	fid, _ := c.GetPostForm("fid")
+	rule_type, _ := c.GetPostForm("rule_type")
+	start := c.GetInt("start")
+	limit := c.GetInt("length")
 	query := map[string]interface{}{
 		"s_fid":  fid,
 		"delete": false,
 	}
-	data, _ := Mgo.Find("rc_rule", query, `{"_id":1}`, nil, false, -1, -1)
-	//count := Mgo.Count("rc_rule", query)
+	if rule_type != "-1" {
+		query["s_type"] = rule_type
+	}
+	data, _ := Mgo.Find("rc_rule", query, `{"_id":1}`, nil, false, start, limit)
+	count := Mgo.Count("rc_rule", query)
 	for _, d := range *data {
 		timeStr := time.Unix(d["l_createtime"].(int64), 0).Format(Date_Short_Layout)
 		d["l_createtime"] = timeStr
 	}
-	c.JSON(200, gin.H{"data": data})
+	c.JSON(200, gin.H{"data": data, "recordsFiltered": count, "recordsTotal": count})
 }
 
 func SaveRule(c *gin.Context) {

src/web/templates/admin/audit_rulelist.html

@@ -24,11 +24,12 @@
 		              <thead>
 		              <tr>
 		                <th>名称</th>
-						<th>时间</th>
-						<th>创建人</th>
-						<th>描述</th>
-						<th>是否启用</th>
-						<th>操作</th>
+        						<th>时间</th>
+        						<th>创建人</th>
+        						<th>描述</th>
+                    <th>类型</th>
+        						<th>是否启用</th>
+        						<th>操作</th>
 		              </tr>
 		              </thead>
 		            </table>
@@ -55,7 +56,7 @@ $(function () {
 		"ordering"    : false,
 		"info"        : true,
 		"autoWidth"   : true,
-		"serverSide": false,
+		"serverSide": true,
 		"ajax": {
 			"url": "/admin/rulemanager/getrule",
 			"type": "post",
@@ -69,6 +70,13 @@ $(function () {
 			{ "data": "l_createtime"},
 			{ "data": "s_username"},
 			{ "data": "s_descript"},
+      { "data": "s_type",render:function(val){
+        if(val=="ok"){
+					return "正确";
+				}else if(val == "err"){
+					return "异常";
+				}
+      }},
 			{ "data": "isuse",render:function(val,a,row){
 				tmp=""
 				if(val){
@@ -96,7 +104,15 @@ $(function () {
 					'&nbsp;&nbsp;<a class="btn btn-sm btn-danger" onclick="del(\''+val+'\')">删除</a>'
 					
 			}}
-       	]
+     ],
+		"fnServerParams": function (e) {  
+			var rule_type=$("#rule_type").val();
+  			if(rule_type){
+  				e.rule_type=rule_type;
+  			}else{
+  				e.rule_type="-1";
+  			}
+      }
 	});
 	ttablerulemanager.on('init.dt', function () {
 		$("#showbtn").on('click','a.opr',function(){
@@ -140,7 +156,8 @@ $(function () {
 					{label:"名称",s_label:"s_name",must:true},
 					{label:"描述",s_label:"s_descript"},
 					{label:"启用",s_label:"isuse",type:"tpl_list_local",list:[{"s_name":"是","_id":true},{"s_name":"否","_id":false}],default:true},
-					{label:"正则",s_label:"s_rule",type:"tpl_text",rows:2,must:true},
+					{label:"类型",s_label:"s_type",type:"tpl_list_local",must:true,list:[{"s_name":"正确","_id":"ok"},{"s_name":"异常","_id":"err"}],default:"0"},
+          {label:"正则",s_label:"s_rule",type:"tpl_text",rows:2,must:true},
 					{s_label:"_id",type:"tpl_hidden"},
 					{s_label:"s_fid",type:"tpl_hidden",val:fid},
 					{s_label:"s_field",type:"tpl_hidden",val:fname}
@@ -185,6 +202,15 @@ $(function () {
 			break;
 			}
 		});
+		var opt="<option value='-1'>全部</option>"+
+		"<option value='ok'>正确</option>"+
+		"<option value='err'>异常</option>";
+		var select="<div class='form-group'><label for='name'>类型：</label>"+
+			"<select id='rule_type' onchange='checkclick(this.value)' class='form-control input-sm'>"+
+			opt+
+			"</select></div>"
+		$("#rulemanagerTable_filter").prepend("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+		$("#rulemanagerTable_filter").prepend(select);
 	})
 })