前端架构

src/jy/admin/user.go

@@ -21,6 +21,7 @@ func init() {
 	Admin.POST("/user/save", UserSave)
 	Admin.POST("/user/searchbyid", UserSearchById)
 	Admin.POST("/user/del", UserDel)
+	Admin.POST("/user/uppwd", UserUppwd)
 }
 
 func User(c *gin.Context) {
@@ -56,3 +57,10 @@ func UserDel(c *gin.Context) {
 	b := Mgo.Del("user", `{"_id":"`+_id+`"}`)
 	c.JSON(200, gin.H{"rep": b})
 }
+
+func UserUppwd(c *gin.Context) {
+	_id, _ := c.GetPostForm("_id")
+	pwd, _ := c.GetPostForm("pwd")
+	b := Mgo.UpdateById("user", _id, `{"$set":{"pwd":"`+Se.EncodeString(pwd)+`"}}`)
+	c.JSON(200, gin.H{"rep": b})
+}

src/jy/admin/version.go

@@ -13,7 +13,7 @@ func init() {
 	Admin.GET("/version", func(c *gin.Context) {
 		//版本创建人列表
 		u, _ := Mgo.Find("user", `{"role":"0"}`, nil, nil, false, -1, -1)
-		v, _ := Mgo.Find("version", `{}`, 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},

src/jy/front/front.go

@@ -5,6 +5,8 @@ import (
 	. "jy/mongodbutil"
 	. "jy/router"
 	. "jy/util"
+	"net/http"
+	qu "qfw/util"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
@@ -16,7 +18,8 @@ func init() {
 		front.Static("/front", "./web/templates/front")
 		front.Static("/res", "./web/res")
 	}
-	front.POST("/login", Login) //登录
+	front.POST("/login", Login)  //登录
+	front.GET("/logout", Logout) //注销
 }
 
 func Login(c *gin.Context) {
@@ -25,6 +28,8 @@ func Login(c *gin.Context) {
 	res, _ := Mgo.FindOne("user", fmt.Sprintf(`{"email":"%s","pwd":"%s"}`, email, Se.EncodeString(pwd)))
 	if res != nil && len(*res) > 0 {
 		session := sessions.Default(c)
+		(*res)["pwd"] = pwd
+		(*res)["_id"] = qu.BsonIdToSId((*res)["_id"])
 		session.Set("user", res)
 		session.Save()
 		c.JSON(200, gin.H{"checked": true})
@@ -32,3 +37,8 @@ func Login(c *gin.Context) {
 		c.JSON(200, gin.H{"checked": false})
 	}
 }
+func Logout(c *gin.Context) {
+	session := sessions.Default(c)
+	session.Delete("user")
+	c.Redirect(http.StatusMovedPermanently, "/front/login.html")
+}

src/web/templates/admin/com_header.html

@@ -17,15 +17,16 @@
       <div class="navbar-custom-menu">
         <ul class="nav navbar-nav">
           <!-- User Account Menu -->
-          <li class="dropdown user user-menu">
+          	<li class="dropdown user user-menu">
             <!-- Menu Toggle Button -->
             <a href="#" class="dropdown-toggle" data-toggle="modal" data-target="#modal-topuserinfo">
               <!-- The user image in the navbar-->
               <img src="../res/dist/img/user2-160x160.jpg" class="user-image" alt="User Image">
               <!-- hidden-xs hides the username on small devices so only the image appears. -->
-              <span class="hidden-xs">{{ .session.user }}admin</span>
+              <span class="hidden-xs">{{index (session "user") "name" }}</span>
             </a>
-          </li>
+          	</li>
+			<li><a href="/logout"><span class="hidden-xs">注销</span></a></li>
         </ul>
       </div>
     </nav>
@@ -63,28 +64,37 @@
 		     	<div class="form-group">
 				    <label for="code" class="col-sm-2 control-label">账号:</label>
 				    <div class="col-sm-10">
-				      <input id="t_email" type="email" class="form-control" id="code" placeholder="请输入账号">
+				      <input id="t_email" type="email" value={{index (session "user") "email" }} 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="t_pwd" type="password" class="form-control" id="code" placeholder="请输入密码">
+				      <input id="t_pwd" type="password" value={{index (session "user") "pwd" }} class="form-control" placeholder="请输入密码">
 				    </div>
 				</div>
 				<div class="form-group">
 				    <label for="site" class="col-sm-2 control-label">姓名:</label>
 				    <div class="col-sm-10">
-				      <input id="t_name" type="text" class="form-control" placeholder="请输入姓名">
+				      <input id="t_name" type="text" value={{index (session "user") "name" }} class="form-control" disabled>
 				    </div>
 				</div>
 				<div class="form-group">
 				    <label for="modify" class="col-sm-2 control-label">角色:</label>
 				    <div class="col-sm-10">
-				     	<select id="t_role" class="form-control" id="modify">
-							<option value="2">开发员</option>
-							<option value="1">审核员</option>
-					  		<option value="0">管理员</option>
+				     	<select id="t_role" class="form-control" disabled>
+							<option value={{index (session "user") "role" }}>
+							<script>
+								role={{index (session "user") "role" }}
+								if(role=="2"){
+									document.write("开发员")
+								}else if(role=="1"){
+									document.write("审核员")
+								}else{
+									document.write("管理员")
+								}
+							</script>
+							</option>
 						</select>
 				    </div>
 				</div>
@@ -100,5 +110,19 @@
   <!-- /.modal-dialog -->
 </div>
 <!-- /.modal -->
-	  
+<script>
+function t_save(){
+	pwd=$("#t_pwd").val()
+	showConfirm("确定修改？", function() {
+		$.ajax({
+			url:"/admin/user/uppwd",
+			type:"post",
+			data:{"_id":{{index (session "user") "_id" }},"pwd":pwd},
+			success:function(r){
+				$("#modal-topuserinfo").modal("hide");
+			}
+		})
+	});
+}
+</script>
 {{ end }}

src/web/templates/admin/com_memu.html

@@ -4,7 +4,7 @@
       <ul class="sidebar-menu" data-widget="tree">
         <li class="header">HEADER</li>
         <!-- Optionally, you can add icons to the links -->
-        <li class="active"><a href="/admin/user"><i class="fa fa-link"></i> <span>人员管理</span></a></li>
+        <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>
             <span class="pull-right-container">
@@ -12,11 +12,69 @@
             </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>管理2</a></li>
-          	</ul>
+			</ul>
+        </li>
+		<li class="treeview">
+          	<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>
+			</ul>
+        </li>
+		<li class="treeview">
+          	<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>
+			</ul>
+        </li>
+		<li class="treeview">
+          	<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>
+			</ul>
+        </li>
+		<li class="treeview">
+          	<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>
+			</ul>
         </li>
       </ul>
     </section>
 </aside>
+<script>
+function menuActive(name){
+	$(".sidebar-menu").tree();
+	$(".sidebar-menu").filter(".menu-open").removeClass("menu-open");
+	$(".sidebar-menu").filter(".active").removeClass("active");
+	var a;
+	$(".sidebar-menu a").each(function(i){
+		if($(this).attr("href").endsWith(name)){
+			a=$(this)
+		}
+	});
+	a.parent().addClass("active");
+	a.parent().parent().parent().addClass("active");
+	a.parent().parent().parent().addClass("menu-open");
+}
+</script>
 {{ end }}

src/web/templates/admin/index.html

@@ -4,8 +4,6 @@
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
 
-{{index (session "user") "name" }}
-
   <!-- Content Wrapper. Contains page content -->
   <div class="content-wrapper">
     <!-- Main content -->

src/web/templates/admin/user.html

@@ -6,15 +6,19 @@
 
 <!-- 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" onclick="formReset()">新增用户</button></small>
+		</h1>
+		<ol class="breadcrumb">
+		  <li><a href="/admin/user"><i class="fa fa-dashboard"></i> 人员管理</a></li>
+		</ol>
+    </section>
   <!-- Main content -->
   <section class="content">
       <div class="row">
 	      <div class="col-xs-12">
 	        <div class="box">
-		        <div class="box-header">
-		            <button type="button" class="btn btn-info" data-toggle="modal" data-target="#modal-info" onclick="formReset()">新增用户</button>
-		        </div>
-		        <!-- /.box-header -->
 		        <div class="box-body">
 		            <table id="dataTable" class="table table-bordered table-hover">
 		              <thead>
@@ -49,7 +53,7 @@
 		     	<div class="form-group">
 				    <label for="code" class="col-sm-2 control-label">账号:</label>
 				    <div class="col-sm-10">
-				      <input id="email" type="email" class="form-control" id="code" placeholder="请输入账号">
+				      <input id="email" type="email" class="form-control" placeholder="请输入账号">
 				    </div>
 				</div>
 				<div class="form-group">
@@ -91,6 +95,7 @@
 {{template "footer"}}
 
 <script>
+menuActive("user")
 $(function () {
 	ttable=$('#dataTable').DataTable({
 		"paging"      : true,

src/web/templates/admin/version.html

@@ -6,15 +6,20 @@
 
 <!-- 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 class="active"><a href="/admin/version">版本管理</a></li>
+		</ol>
+    </section>
   <!-- Main content -->
   <section class="content">
       <div class="row">
 	      <div class="col-xs-12">
 	        <div class="box">
-		        <div class="box-header">
-		            <button type="button" class="btn btn-info" data-toggle="modal" data-target="#modal-info">新增版本</button>
-		        </div>
-		        <!-- /.box-header -->
 		        <div class="box-body">
 		            <table id="dataTable" class="table table-bordered table-hover">
 		              <thead>
@@ -107,6 +112,7 @@
 {{template "footer"}}
 
 <script>
+menuActive("version")
 $(function () {
 	ttable=$('#dataTable').DataTable({
 		"paging"      : false,

src/web/templates/front/login.html

@@ -30,7 +30,7 @@
 <body class="hold-transition login-page">
 <div class="login-box">
   <div class="login-logo">
-    <b>extract</b>3.0
+    <b>extract</b> 3.0
   </div>
   <!-- /.login-logo -->
   <div class="login-box-body">