zhangjinkun 7 anni fa
parent
commit
0eacecc3cf

+ 47 - 0
src/jy/admin/rule.go

@@ -0,0 +1,47 @@
+// rule
+package admin
+
+import (
+	. "jy/mongodbutil"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func init() {
+	Admin.GET("/rulepre", func(c *gin.Context) {
+		version := c.Query("version")
+		c.HTML(200, "rule_prelist.html", gin.H{"version": version})
+	})
+	Admin.POST("/rulepre/data", RulePreData)
+	Admin.POST("/rulepre/save", RulePreSave)
+}
+
+//前置规则列表
+func RulePreData(c *gin.Context) {
+	version, _ := c.GetPostForm("version")
+	data, _ := Mgo.Find("rule_pre", `{"version":"`+version+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	c.JSON(200, gin.H{"data": data})
+}
+
+//前置规则创建
+func RulePreSave(c *gin.Context) {
+	name, _ := c.GetPostForm("name")
+	version, _ := c.GetPostForm("version")
+	descript, _ := c.GetPostForm("descript")
+	username, _ := c.GetPostForm("username")
+	data := map[string]interface{}{
+		"name":     name,
+		"version":  version,
+		"descript": descript,
+		"state":    "0",
+		"username": username,
+		"intime":   time.Now().Unix(),
+	}
+	b := Mgo.Save("rule_pre", data)
+	if b != "" {
+		c.JSON(200, gin.H{"rep": true})
+	} else {
+		c.JSON(200, gin.H{"rep": false})
+	}
+}

+ 2 - 3
src/jy/admin/version.go

@@ -11,12 +11,11 @@ import (
 
 func init() {
 	Admin.GET("/version", func(c *gin.Context) {
-		//版本创建人列表
-		u, _ := Mgo.Find("user", `{"role":"0"}`, nil, nil, false, -1, -1)
+		//版本列表
 		v, _ := Mgo.Find("version", `{}`, `{"_id":-1}`, nil, false, -1, -1)
 		c.HTML(
 			http.StatusOK, "version.html",
-			gin.H{"user": u, "version": v},
+			gin.H{"version": v},
 		)
 	})
 	Admin.POST("/version/data", Version)

+ 5 - 8
src/web/templates/admin/com_memu.html

@@ -4,28 +4,24 @@
       <ul class="sidebar-menu" data-widget="tree">
         <li class="header">HEADER</li>
         <!-- Optionally, you can add icons to the links -->
-        <li><a href="/admin/user"><i class="fa fa-link"></i> <span>人员管理</span></a></li>
         <li class="treeview">
-          	<a href="#"><i class="fa fa-laptop"></i> <span>版本控制</span>
+          	<a href="#"><i class="fa fa-laptop"></i> <span>任务</span>
             <span class="pull-right-container">
                 <i class="fa fa-angle-left pull-right"></i>
             </span>
           	</a>
           	<ul class="treeview-menu">
-	            <li><a href="/admin/rule/pre"><i class="fa fa-circle-o"></i>前置规则</a></li>
-          		<li><a href="/admin/rule/back"><i class="fa fa-circle-o"></i>后置规则</a></li>
-				<li><a href="/admin/rule/logic"><i class="fa fa-circle-o"></i>抽取逻辑</a></li>
-	            <li><a href="/admin/version"><i class="fa fa-circle-o"></i>版本管理</a></li>
+	            <li><a href="#"><i class="fa fa-circle-o"></i>菜单</a></li>
 			</ul>
         </li>
 		<li class="treeview">
-          	<a href="#"><i class="fa fa-laptop"></i> <span>标签库</span>
+          	<a href="#"><i class="fa fa-laptop"></i> <span>版本控制</span>
             <span class="pull-right-container">
                 <i class="fa fa-angle-left pull-right"></i>
             </span>
           	</a>
           	<ul class="treeview-menu">
-	            <li><a href="/admin/rule/pre"><i class="fa fa-circle-o"></i>菜单</a></li>
+	            <li><a href="/admin/version"><i class="fa fa-circle-o"></i>版本管理</a></li>
 			</ul>
         </li>
 		<li class="treeview">
@@ -58,6 +54,7 @@
 	            <li><a href="/admin/rule/pre"><i class="fa fa-circle-o"></i>菜单</a></li>
 			</ul>
         </li>
+		<li><a href="/admin/user"><i class="fa fa-link"></i> <span>人员管理</span></a></li>
       </ul>
     </section>
 </aside>

+ 182 - 0
src/web/templates/admin/rule_prelist.html

@@ -0,0 +1,182 @@
+{{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 type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal-info">新增逻辑</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="dataTable" class="table table-bordered table-hover">
+		              <thead>
+		              <tr>
+		                <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">
+  	<div class="modal-dialog">
+	    <form id="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="name" type="text" class="form-control" placeholder="请输名称">
+				    </div>
+				</div>
+				<div class="form-group">
+				    <label for="code" class="col-sm-2 control-label">版本:</label>
+				    <div class="col-sm-10">
+				      <input id="version" type="text" value="{{.version}}" 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">
+				      <input id="descript" type="text" class="form-control" placeholder="描述">
+				    </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="save()">保存</button>
+	    	</div>
+		</div>
+	    <!-- /.modal-content -->
+	    </form>
+  	</div>
+  <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+	
+<!-- footer -->
+{{template "footer"}}
+
+<script>
+menuActive("version")
+$(function () {
+	ttable=$('#dataTable').DataTable({
+		"paging"      : false,
+		"lengthChange": false,
+		"searching"   : true,
+		"ordering"    : false,
+		"info"        : true,
+		"autoWidth"   : false,
+		"ajax": {
+			"url": "/admin/rulepre/data",
+			"type": "post",
+			"data":{"version":{{ .version}} }
+		 },
+		"language": {
+            "url": "../res/dist/js/dataTables.chinese.lang"
+        },
+		"columns": [
+            { "data": "name"},
+			{ "data": "username"},
+			{ "data": "descript"},
+			{ "data": "state",render:function(val,a,row){
+				tmp=""
+				if(val=="0"){
+					tmp="待完成"	
+				}else if (val=="1"){
+					tmp="待审核"	
+				}else{
+					tmp="已审核"
+				}
+				return tmp
+			}},
+			{ "data": "_id",render:function(val,a,row){
+				return  "<a href='#' onclick='edit(\""+val+"\")'><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>"
+			}}
+       	]
+	});
+	//ttable.on('init.dt', function () {});
+})
+function save(){
+	name=$("#name").val()
+	version=$("#version").val()
+	descript=$("#descript").val()
+	if(name==""||descript==""){
+		alert("表单填写不完整!")
+		return false;
+	}
+	$.ajax({
+		url:"/admin/rulepre/save",
+		type:"post",
+		data:{"name":name,"version":version,
+		"descript":descript,"username":{{index (session "user") "name" }}},
+		success:function(r){
+			if(r.rep){
+				$("#dataform")[0].reset();
+				$("#modal-info").modal("hide");
+				ttable.ajax.reload();
+			}else{
+				alert("保存失败");
+			}
+		}
+	})
+}
+function edit(_id){
+	$.ajax({
+		url:"/admin/rulepre/save",
+		type:"post",
+		data:{"_id":_id},
+		success:function(r){
+			if(r.rep){		
+			}
+		}
+	})
+}
+function del(_id){
+	showConfirm("确定删除?", function() {
+		$.ajax({
+			url:"/admin/rulepre/del",
+			type:"post",
+			data:{"_id":_id},
+			success:function(r){
+				if(r.rep){				
+					ttable.ajax.reload();
+				}else{
+					showTip("删除失败", 1000, function() {});
+				}
+			}
+		})
+	});
+}
+ 
+</script>

+ 12 - 25
src/web/templates/admin/version.html

@@ -55,7 +55,7 @@
 		     	<div class="form-group">
 				    <label for="code" class="col-sm-2 control-label">版本号:</label>
 				    <div class="col-sm-10">
-				      <input id="version" type="text" class="form-control" id="code" placeholder="请输入版本号">
+				      <input id="version" type="text" class="form-control" placeholder="请输入版本号">
 				    </div>
 				</div>
 				<div class="form-group">
@@ -69,17 +69,6 @@
 						</select>
 				    </div>
 				</div>	
-				<div class="form-group">
-				    <label for="modify" class="col-sm-2 control-label">创建人:</label>
-				    <div class="col-sm-10">
-				     	<select id="cname" class="form-control">
-							<option value=""></option>
-							{{ range .user }}  
-							<option>{{.name}} </option>
-							{{ end }}
-						</select>
-				    </div>
-				</div>
 				<div class="form-group">
 				    <label for="code" class="col-sm-2 control-label">描述:</label>
 				    <div class="col-sm-10">
@@ -133,23 +122,22 @@ $(function () {
             { "data": "version"},
 			{ "data": "preversion"},
 			{ "data": "cname"},
-			{ "data": "descript"},
+			{ "data": "descript","width":"25%"},
 			{ "data": "isuse",render:function(val,a,row){
 				tmp=""
 				if(val=="1"){
-					tmp="启用"
+					tmp="<a href='#' title='停用' onclick='use(\""+row._id+"\",\"0\")'><i class='fa fa-fw fa-circle text-green'></i></a>"
 				}else{
-					tmp="未启用"
+					tmp="<a href='#' title='启用' onclick='use(\""+row._id+"\",\"1\")'><i class='fa fa-fw fa-circle text-red'></i></a>"
 				}
 				return tmp
 			}},
-			{"data":"_id",render:function(val,a,row){
-				tmp=""
-				if(row.isuse=="1"){
-					tmp="<a href='#' title='停用' onclick='use(\""+val+"\",\"0\")'><i class='fa fa-fw fa-circle text-green'></i></a>"
-				}else{
-					tmp="<a href='#' title='启用' onclick='use(\""+val+"\",\"1\")'><i class='fa fa-fw fa-circle text-red'></i></a>"
-				} 
+			{"data":"_id","width":"25%",render:function(val,a,row){
+				tmp = '<div class="btn-group">'+
+					'<a class="btn btn-sm btn-primary" href="/admin/rulepre?version='+row.version+'">前置规则</a>'+
+					'<a class="btn btn-sm btn-success" href="/admin/ruleback?version='+row.version+'">后置规则</a>'+
+					'<a class="btn btn-sm btn-info" href="/admin/rulelogic?version='+row.version+'">抽取逻辑</a>'+
+					'<a class="btn btn-sm btn-warning" href="/admin/ruletag?version='+row.version+'">标签库</a>';
 				return  tmp
 			}}
        	]
@@ -159,10 +147,9 @@ $(function () {
 function save(){
 	version=$("#version").val()
 	preversion=$("#preversion").val()
-	cname=$("#cname").val()
 	descript=$("#descript").val()
 	//isuse = $("input[name='isuse']:checked").val();
-	if(version==""||cname==""||descript==""){
+	if(version==""||descript==""){
 		alert("表单填写不完整!")
 		return false;
 	}
@@ -170,7 +157,7 @@ function save(){
 		url:"/admin/version/save",
 		type:"post",
 		data:{"version":version,"preversion":preversion,
-		"cname":cname,"descript":descript,"isuse":"0"},
+		"cname":{{index (session "user") "name" }},"descript":descript,"isuse":"0"},
 		success:function(r){
 			if(r.rep){
 				$("#dataform")[0].reset();