Merge branch 'master' of http://192.168.3.207:10080/qmx/jy-data-extract

src/jy/admin/clear.go

@@ -24,7 +24,7 @@ func init() {
 //加载数据
 func ClearData(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
-	data, _ := Mgo.Find("cleanup", `{"s_version":"`+version+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("cleanup", `{"s_version":"`+version+`","delete":true}`, `{"_id":-1}`, nil, false, -1, -1)
 	for _, d := range *data {
 		timeStr := time.Unix(d["l_intime"].(int64), 0).Format(Date_Short_Layout)
 		d["l_intime"] = timeStr
@@ -56,7 +56,7 @@ func ClearSave(c *gin.Context) {
 		username, _ := c.GetPostForm("username")
 		fieldname, _ := c.GetPostForm("fieldname")
 		fieldArr := strings.Split(fieldname, "+")
-		data, _ := Mgo.FindOne("cleanup", `{"s_version":"`+version+`","s_field":"`+fieldArr[1]+`"}`)
+		data, _ := Mgo.FindOne("cleanup", `{"s_version":"`+version+`","s_field":"`+fieldArr[1]+`","delete":true}`)
 		if len(*data) > 0 { //创建判重
 			c.JSON(200, gin.H{"rep": false})
 			return
@@ -69,6 +69,7 @@ func ClearSave(c *gin.Context) {
 			"s_name":    fieldArr[0],
 			"clear":     clear,
 			"clearInfo": clearInfo,
+			"delete":    true,
 		}
 		b := Mgo.Save("cleanup", save)
 		if b != "" {
@@ -94,7 +95,9 @@ func ClearSave(c *gin.Context) {
 //删除数据
 func ClearDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("cleanup", `{"_id":"`+_id+`"}`)
+	b := Mgo.Update("cleanup", `{"_id":"`+_id+`"}`, map[string]interface{}{
+		"$set": map[string]interface{}{"delete": false},
+	}, false, false)
 	if b {
 		c.JSON(200, gin.H{"rep": true})
 	} else {

src/jy/admin/rule.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	. "jy/mongodbutil"
 	"jy/util"
-	"regexp"
-	"strings"
 	"time"
 
 	"github.com/gin-contrib/sessions"
@@ -100,14 +98,14 @@ func init() {
 	Admin.POST("/logicore/use", RuleLogicCoreUse)
 
 	//ruletag
-	Admin.GET("/ruletag", func(c *gin.Context) {
-		version := c.Query("version")
-		c.HTML(200, "rule_taglist.html", gin.H{"version": version})
-	})
-	Admin.POST("/ruletag/data", RuleTagData)
-	Admin.POST("/ruletag/save", RuleTagSave)
-	Admin.POST("/ruletag/del", RuleTagDel)
-	Admin.POST("/ruletag/editsave", RuleTagEditSave)
+	//	Admin.GET("/ruletag", func(c *gin.Context) {
+	//		version := c.Query("version")
+	//		c.HTML(200, "rule_taglist.html", gin.H{"version": version})
+	//	})
+	//	Admin.POST("/ruletag/data", RuleTagData)
+	//	Admin.POST("/ruletag/save", RuleTagSave)
+	//	Admin.POST("/ruletag/del", RuleTagDel)
+	//	Admin.POST("/ruletag/editsave", RuleTagEditSave)
 }
 
 func RulePreData(c *gin.Context) {
@@ -373,99 +371,99 @@ func RuleLogicCoreUse(c *gin.Context) {
 }
 
 //标签库列表
-func RuleTagData(c *gin.Context) {
-	version, _ := c.GetPostForm("version")
-	data, _ := Mgo.Find("rule_tag", `{"version":"`+version+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
-	for _, d := range *data {
-		timeStr := time.Unix(d["intime"].(int64), 0).Format(Date_Short_Layout)
-		d["intime"] = timeStr
-	}
-	c.JSON(200, gin.H{"data": data})
-}
+//func RuleTagData(c *gin.Context) {
+//	version, _ := c.GetPostForm("version")
+//	data, _ := Mgo.Find("rule_tag", `{"version":"`+version+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
+//	for _, d := range *data {
+//		timeStr := time.Unix(d["intime"].(int64), 0).Format(Date_Short_Layout)
+//		d["intime"] = timeStr
+//	}
+//	c.JSON(200, gin.H{"data": data})
+//}
 
 //添加标签
-func RuleTagSave(c *gin.Context) {
-	name, _ := c.GetPostForm("name")
-	version, _ := c.GetPostForm("version")
-	contentStr, _ := c.GetPostForm("content")
-	username, _ := c.GetPostForm("username")
-	tp, _ := c.GetPostForm("tp")
-	content := strings.Split(contentStr, ",")
-	data, _ := Mgo.FindOne("rule_tag", `{"name":"`+name+`"}`)
-	if len(*data) > 0 { //判重，防止添加name相同的标签
-		c.JSON(200, gin.H{"rep": false})
-		return
-	}
-	if tp == "正则" { //验证是否是正则
-		for _, ct := range content {
-			_, err := regexp.Compile(ct)
-			if err != nil {
-				c.JSON(200, gin.H{"rep": false})
-				return
-			}
-		}
-	}
-	save := map[string]interface{}{
-		"name":    name,
-		"version": version,
-		"content": content,
-		"creater": username,
-		"intime":  time.Now().Unix(),
-		"type":    tp,
-		"delete":  false,
-	}
-	b := Mgo.Save("rule_tag", save)
-	if b != "" {
-		c.JSON(200, gin.H{"rep": true})
-	} else {
-		c.JSON(200, gin.H{"rep": false})
-	}
-}
+//func RuleTagSave(c *gin.Context) {
+//	name, _ := c.GetPostForm("name")
+//	version, _ := c.GetPostForm("version")
+//	contentStr, _ := c.GetPostForm("content")
+//	username, _ := c.GetPostForm("username")
+//	tp, _ := c.GetPostForm("tp")
+//	content := strings.Split(contentStr, ",")
+//	data, _ := Mgo.FindOne("rule_tag", `{"name":"`+name+`"}`)
+//	if len(*data) > 0 { //判重，防止添加name相同的标签
+//		c.JSON(200, gin.H{"rep": false})
+//		return
+//	}
+//	if tp == "正则" { //验证是否是正则
+//		for _, ct := range content {
+//			_, err := regexp.Compile(ct)
+//			if err != nil {
+//				c.JSON(200, gin.H{"rep": false})
+//				return
+//			}
+//		}
+//	}
+//	save := map[string]interface{}{
+//		"name":    name,
+//		"version": version,
+//		"content": content,
+//		"creater": username,
+//		"intime":  time.Now().Unix(),
+//		"type":    tp,
+//		"delete":  false,
+//	}
+//	b := Mgo.Save("rule_tag", save)
+//	if b != "" {
+//		c.JSON(200, gin.H{"rep": true})
+//	} else {
+//		c.JSON(200, gin.H{"rep": false})
+//	}
+//}
 
 //删除标签
-func RuleTagDel(c *gin.Context) {
-	_id, _ := c.GetPostForm("_id")
-	//b := Mgo.Del("rule_tag", `{"_id":"`+_id+`"}`)
-	b := Mgo.UpdateById("rule_tag", _id, `{"$set":{"delete":true}}`)
-	if b {
-		c.JSON(200, gin.H{"rep": true})
-	} else {
-		c.JSON(200, gin.H{"rep": false})
-	}
-}
+//func RuleTagDel(c *gin.Context) {
+//	_id, _ := c.GetPostForm("_id")
+//	//b := Mgo.Del("rule_tag", `{"_id":"`+_id+`"}`)
+//	b := Mgo.UpdateById("rule_tag", _id, `{"$set":{"delete":true}}`)
+//	if b {
+//		c.JSON(200, gin.H{"rep": true})
+//	} else {
+//		c.JSON(200, gin.H{"rep": false})
+//	}
+//}
 
 //编辑保存
-func RuleTagEditSave(c *gin.Context) {
-	_id, _ := c.GetPostForm("_id")
-	contentStr, _ := c.GetPostForm("content")
-	content := strings.Split(contentStr, ",")
-	data, _ := Mgo.FindOne("rule_tag", `{"_id":"`+_id+`"}`)
-	if (*data)["type"] == "正则" { //验证是否是正则
-		for _, ct := range content {
-			_, err := regexp.Compile(ct)
-			if err != nil {
-				c.JSON(200, gin.H{"rep": false})
-				return
-			}
-		}
-	}
-	if len(*data) > 0 {
-		set := map[string]interface{}{
-			"name":    (*data)["name"],
-			"version": (*data)["version"],
-			"creater": (*data)["creater"],
-			"intime":  (*data)["intime"],
-			"type":    (*data)["type"],
-			"content": content,
-			"delete":  false,
-		}
-		b := Mgo.Update("rule_tag", `{"_id":"`+_id+`"}`, set, false, false)
-		if b {
-			c.JSON(200, gin.H{"rep": true})
-		} else {
-			c.JSON(200, gin.H{"rep": false})
-		}
-	} else {
-		c.JSON(200, gin.H{"rep": false})
-	}
-}
+//func RuleTagEditSave(c *gin.Context) {
+//	_id, _ := c.GetPostForm("_id")
+//	contentStr, _ := c.GetPostForm("content")
+//	content := strings.Split(contentStr, ",")
+//	data, _ := Mgo.FindOne("rule_tag", `{"_id":"`+_id+`"}`)
+//	if (*data)["type"] == "正则" { //验证是否是正则
+//		for _, ct := range content {
+//			_, err := regexp.Compile(ct)
+//			if err != nil {
+//				c.JSON(200, gin.H{"rep": false})
+//				return
+//			}
+//		}
+//	}
+//	if len(*data) > 0 {
+//		set := map[string]interface{}{
+//			"name":    (*data)["name"],
+//			"version": (*data)["version"],
+//			"creater": (*data)["creater"],
+//			"intime":  (*data)["intime"],
+//			"type":    (*data)["type"],
+//			"content": content,
+//			"delete":  false,
+//		}
+//		b := Mgo.Update("rule_tag", `{"_id":"`+_id+`"}`, set, false, false)
+//		if b {
+//			c.JSON(200, gin.H{"rep": true})
+//		} else {
+//			c.JSON(200, gin.H{"rep": false})
+//		}
+//	} else {
+//		c.JSON(200, gin.H{"rep": false})
+//	}
+//}

src/jy/admin/tag.go

@@ -38,7 +38,7 @@ func init() {
 //标签库列表
 func TagData(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
-	data, _ := Mgo.Find("tag", `{"s_version":"`+version+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("tag", `{"s_version":"`+version+`","delete":true}`, `{"_id":-1}`, nil, false, -1, -1)
 	for _, d := range *data {
 		timeStr := time.Unix(d["l_intime"].(int64), 0).Format(Date_Short_Layout)
 		d["l_intime"] = timeStr
@@ -52,7 +52,7 @@ func TagSave(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
 	username, _ := c.GetPostForm("username")
 	tp, _ := c.GetPostForm("tp")
-	data, _ := Mgo.FindOne("tag", `{"s_tagname":"`+tagname+`","s_version":"`+version+`"}`)
+	data, _ := Mgo.FindOne("tag", `{"s_tagname":"`+tagname+`","s_version":"`+version+`","delete":true}`)
 	if len(*data) > 0 { //判重，防止添加name相同的标签
 		c.JSON(200, gin.H{"rep": false})
 		return
@@ -63,6 +63,7 @@ func TagSave(c *gin.Context) {
 		"s_creater": username,
 		"s_type":    tp,
 		"l_intime":  time.Now().Unix(),
+		"delete":    true,
 	}
 	b := Mgo.Save("tag", save)
 	if b != "" {
@@ -75,12 +76,17 @@ func TagSave(c *gin.Context) {
 //删除标签
 func TagDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("tag", `{"_id":"`+_id+`"}`)
+	b := Mgo.Update("tag", `{"_id":"`+_id+`"}`, map[string]interface{}{
+		"$set": map[string]interface{}{"delete": false},
+	}, false, false)
 	data, _ := Mgo.Find("tagdetailinfo", `{"s_parentid":"`+_id+`"}`, `{"_id":-1}`, nil, false, -1, -1)
 	if len(*data) > 0 { //删除父标签下所有详细标签
 		for _, d := range *data {
 			cid := d["_id"].(bson.ObjectId).Hex()
-			Mgo.Del("tagdetailinfo", `{"_id":"`+cid+`"}`)
+			//Mgo.Del("tagdetailinfo", `{"_id":"`+cid+`"}`)
+			Mgo.Update("tagdetailinfo", `{"_id":"`+cid+`"}`, map[string]interface{}{
+				"$set": map[string]interface{}{"delete": false},
+			}, false, false)
 		}
 	}
 	if b {
@@ -93,10 +99,8 @@ func TagDel(c *gin.Context) {
 //查找某个tag的信息
 func OneTagData(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
-	//tagname, _ := c.GetPostForm("tagname")
 	parentid, _ := c.GetPostForm("parentid")
-	//data, _ := Mgo.Find("tagdetailinfo", `{"s_version":"`+version+`","s_pratagname":"`+tagname+`","s_parentid":"`+parentid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
-	data, _ := Mgo.Find("tagdetailinfo", `{"s_version":"`+version+`","s_parentid":"`+parentid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("tagdetailinfo", `{"s_version":"`+version+`","s_parentid":"`+parentid+`","delete":true}`, `{"_id":-1}`, nil, false, -1, -1)
 	for _, d := range *data {
 		timeStr := time.Unix(d["l_intime"].(int64), 0).Format(Date_Short_Layout)
 		d["l_intime"] = timeStr
@@ -109,8 +113,7 @@ func OneTagCreate(c *gin.Context) {
 	name, _ := c.GetPostForm("name")
 	version, _ := c.GetPostForm("version")
 	parentid, _ := c.GetPostForm("parentid")
-	//data, _ := Mgo.FindOne("tagdetailinfo", `{"s_name":"`+name+`","s_pratagname":"`+pratagname+`","s_version":"`+version+`"}`)
-	data, _ := Mgo.FindOne("tagdetailinfo", `{"s_name":"`+name+`","s_parentid":"`+parentid+`","s_version":"`+version+`"}`)
+	data, _ := Mgo.FindOne("tagdetailinfo", `{"s_name":"`+name+`","s_parentid":"`+parentid+`","s_version":"`+version+`","delete":true}`)
 	if len(*data) > 0 { //判重
 		c.JSON(200, gin.H{"rep": false})
 		return
@@ -137,6 +140,7 @@ func OneTagCreate(c *gin.Context) {
 		"l_intime":     time.Now().Unix(),
 		"content":      jsondata,
 		"s_parentid":   parentid,
+		"delete":       true,
 	}
 	b := Mgo.Save("tagdetailinfo", save)
 	if b != "" {
@@ -149,7 +153,9 @@ func OneTagCreate(c *gin.Context) {
 //删除某个详细标签
 func OneTagDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("tagdetailinfo", `{"_id":"`+_id+`"}`)
+	b := Mgo.Update("tagdetailinfo", `{"_id":"`+_id+`"}`, map[string]interface{}{
+		"$set": map[string]interface{}{"delete": false},
+	}, false, false)
 	if b {
 		c.JSON(200, gin.H{"rep": true})
 	} else {
@@ -161,14 +167,7 @@ func OneTagDel(c *gin.Context) {
 func OneTagEditSave(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
 	content, _ := c.GetPostForm("content")
-	//tp, _ := c.GetPostForm("tp")
 	var jsondata interface{}
-	//	var err error
-	//	if tp == "地区" {
-	//		err = json.Unmarshal([]byte(content), &jsondata)
-	//	} else {
-	//		err = json.Unmarshal([]byte(content), &jsondata)
-	//	}
 	err := json.Unmarshal([]byte(content), &jsondata)
 	if err != nil { //不是json格式
 		c.JSON(200, gin.H{"rep": false})
@@ -192,7 +191,5 @@ func OneTagEditSave(c *gin.Context) {
 func OneTagSearch(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
 	data, _ := Mgo.FindOne("tagdetailinfo", `{"_id":"`+_id+`"}`)
-	//b, _ := json.Marshal((*data)["content"])
-	//fmt.Println("data====", string(b))
 	c.JSON(200, gin.H{"data": data})
 }

src/web/templates/admin/rule_arealist.html

@@ -1,240 +0,0 @@
-{{template "inc"}}
-<!-- Main Header -->
-{{template "header"}}
-<!-- Left side column. 权限菜单 -->
-{{template "memu"}}
-
-<!-- Content Wrapper. Contains page content -->
-<div class="content-wrapper">
-	<section class="content-header">
-		<h1>
-			<small><button class="btn btn-primary createAreaTag" onclick='createAreaTag("")'>新建标签</button></small>
-		</h1>
-		<ol class="breadcrumb">
-		  <li><a href="/admin/version"><i class="fa fa-dashboard"></i> 版本控制</a></li>
-		  <li><a href="/admin/version">版本管理</a></li>
-		  <li class="active"><a href="#">标签库</a></li>
-		</ol>
-    </section>
-  <!-- Main content -->
-  <section class="content">
-      <div class="row">
-	      <div class="col-xs-12">
-	        <div class="box">
-		        <div class="box-body">
-		            <table id="dataAreaTable" class="table table-bordered table-hover">
-		              <thead>
-		              <tr>
-		                <th>省/直辖市</th>
-						<th>创建人</th>
-						<th>创建时间</th>
-						<th>类型</th>
-						<th>内容</th>
-						<th>操作</th>
-		              </tr>
-		              </thead>
-		            </table>
-		        </div>
-	          <!-- /.box-body -->
-	        </div>
-        <!-- /.box -->
-		</div>
-	</div>
-  </section>
-</div>
-<!--新增标签--> 
-<div class="modal fade" id="modal-info-areaAddTag">
-  	<div class="modal-dialog">
-	    <form id="areaAdd-dataform" class="form-horizontal" role="form">
-		<div class="modal-content">
-		    <div class="modal-header">
-		        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		          <span aria-hidden="true">&times;</span></button>
-		        <h4 class="modal-title">标签信息</h4>
-		    </div>
-		    <div class="modal-body">
-		     	<div class="form-group">
-				    <label for="code" class="col-sm-2 control-label">省/直辖市:</label>
-				    <div class="col-sm-10">
-					   	<select class="form-control" id="areaAdd-area"></select>
-					</div>
-					<span class="modifyCheck hide check">--请选择--</span>
-				</div>
-				<div class="form-group">
-				    <label for="code" class="col-sm-2 control-label">版本:</label>
-				    <div class="col-sm-10">
-				      <input id="areaAdd-version" type="text" value="{{.version}}" class="form-control" disabled>
-				    </div>
-				</div>
-		    </div>
-		    <div class="modal-footer">
-		        <button type="button" class="btn btn-default" data-dismiss="modal" onclick="reset()">取消</button>
-		        <button type="button" class="btn btn-primary" onclick="areaAddsave()">保存</button>
-	    	</div>
-		</div>
-	    <!-- /.modal-content -->
-	    </form>
-  	</div>
-  <!-- /.modal-dialog -->
-</div>
-<!-- /.modal -->
-<!--编辑标签--> 
-<div class="modal fade" id="modal-info-areaEditTag">
-  	<div class="modal-dialog">
-	    <form id="areaEdit-dataform" class="form-horizontal" role="form">
-		<div class="modal-content">
-		    <div class="modal-header">
-		        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		          <span aria-hidden="true">&times;</span></button>
-		        <h4 class="modal-title">标签信息</h4>
-		    </div>
-		    <div class="modal-body">
-		     	<div class="form-group">
-				    <label for="code" class="col-sm-2 control-label">名称:</label>
-				    <div class="col-sm-10">
-				      <input id="areaEdit-name" type="text" class="form-control" disabled>
-				    </div>
-				</div>
-				<div class="form-group">
-				    <label for="code" class="col-sm-2 control-label">内容:</label>
-				    <div class="col-sm-10">
-				      <textarea id="areaEdit-content" class="form-control" placeholder="内容"></textarea>
-					</div>
-				</div>
-		    </div>
-		    <div class="modal-footer">
-		        <button type="button" class="btn btn-default" data-dismiss="modal" onclick="reset()">取消</button>
-		        <button type="button" class="btn btn-primary" onclick="areaEditsave()">保存</button>
-	    	</div>
-			<div class="modal-footer">
-		         <input id="areaEdit-id" type="hidden" class="form-control" name="_id">
-	    	</div>
-		</div>
-	    <!-- /.modal-content -->
-	    </form>
-  	</div>
-  <!-- /.modal-dialog -->
-</div>
-<!-- /.modal -->
-
-<!-- footer -->
-{{template "footer"}}
-
-<script>
-menuActive("version")
-$(function () {
-	ttableAreatag=$('#dataAreaTable').DataTable({
-		"lengthChange": false,
-		"searching"   : true,
-		"ordering"    : false,
-		"info"        : true,
-		"autoWidth"   : false,
-		"paging"	  : true,
-		
-		"ajax": {
-			"url": "/admin/rulearea/data",
-			"type": "post",
-			"data":{"version":{{ .version}} }
-		 },
-		"language": {
-            "url": "../res/dist/js/dataTables.chinese.lang"
-        },
-		"columns": [
-            { "data": "name"},
-			{ "data": "creater"},
-			{ "data": "intime"},
-			{ "data": "type"},
-			{ "data": "content"},
-			{ "data": "_id",render:function(val,a,row){
-				return  "<a href='#' onclick='edit(\""+val+"\",\""+row["name"]+"\",\""+row["content"]+"\")'><i class='fa fa-fw fa-edit text-yellow'></i></a> &nbsp;"+
-						"<a href='#' onclick='del(\""+val+"\")'><i class='fa fa-fw fa-trash text-red'></i></a>"
-			}}
-       	]
-	});
-	//ttableAreatag.on('init.dt', function () {});
-})
-
-
-function createAreaTag(){
-	var area = ["四川","甘肃","台湾","港陆","长达","济钢","黑龙江","包钢","本钢","梅钢","天铁","宝钢","福建","湖南","天钢","泰钢","新疆","昆钢","韶钢","香港","南钢","浙江","河北","云南","北京","江苏","宁夏","山东","莱钢","柳钢","北台","宁钢","华伟","安徽","青海","兆顺","临钢","重钢","上海","吉林","天津","国丰","太钢","春冶","攀钢","重庆","八钢","文丰","沙钢","广西","河南","海南","西和县","澳门","通钢","鞍钢","陕西","马钢","武钢","西城","德龙","首钢","山西","鄂钢","萍钢","安钢","涟钢","湖北","广东","内蒙古","普阳","新金","酒钢","兆泰","新钢","湘钢","西藏","江西","贵州","辽宁","飞达","镇","乡","市","局","厅","滇","辽","沪","浙","皖","闽","赣","鲁","豫","鄂","湘","粤","桂","琼","渝","川","藏","陕","甘","黑","蒙","吉","澳","湾","山","河",]
-	$("#areaAdd-area").empty();
-	$("#areaAdd-area").append("<option value=''>--请选择--</option>");
-	for(var i in area){
-		$("#areaAdd-area").append("<option value='"+area[i]+"'>"+area[i]+"</option>");
-	}
-	$("#modal-info-areaAddTag").modal("show");
-}
-
-//新建保存
-function areaAddsave(){
-	selectVal = $("#areaAdd-area").val();
-	if (selectVal == ""){
-		alert("请选择省/直辖市！");
-		return false;
-	}
-	$.ajax({
-		url:"/admin/rulearea/save",
-		type:"post",
-		data:{"selectVal":selectVal},
-		success:function(r){
-			if(r.rep){
-				$("#add-dataform")[0].reset();
-				$("#modal-info-addtag").modal("hide");
-				ttableAreatag.ajax.reload();
-			}else{
-				$("#add-dataform")[0].reset();
-				$("#modal-info-addtag").modal("hide");
-				alert("保存失败");
-			}
-		}
-	})
-}
-//编辑
-function edit(_id,name,content){
-	$("#edit-name").val(name);
-	$("#edit-content").val(content);
-	$("#edit-id").val(_id);
-	$("#modal-info-edittag").modal("show");
-}
-//编辑保存
-function editsave(){
-	_id=$("#edit-id").val();
-	content=$("#edit-content").val();
-	if(content==""){
-		alert("表单填写不完整！");
-		return false;
-	}
-	$.ajax({
-		url:"/admin/ruletag/editsave",
-		type:"post",
-		data:{"_id":_id,"content":content},
-		success:function(r){
-			if(r.rep){
-				$("#edit-dataform")[0].reset();
-				$("#modal-info-edittag").modal("hide");
-				ttableAreatag.ajax.reload();
-			}else{
-				alert("保存失败");
-			}
-		}
-	})
-}
-//删除
-function del(_id){
-	showConfirm("确定删除？", function() {
-		$.ajax({
-			url:"/admin/ruletag/del",
-			type:"post",
-			data:{"_id":_id},
-			success:function(r){
-				if(r.rep){				
-					ttableAreatag.ajax.reload();
-				}else{
-					showTip("删除失败", 1000, function() {});
-				}
-			}
-		})
-	});
-}
- 
-</script>