Merge branch 'dev3.3' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.3

src/jy/admin/site_management.go

@@ -0,0 +1,73 @@
+// version
+package admin
+
+import (
+	"github.com/gin-gonic/gin"
+	"gopkg.in/mgo.v2/bson"
+	. "jy/mongodbutil"
+	"net/http"
+	"net/url"
+	"strings"
+)
+
+func init() {
+	Admin.GET("/site_management", func(c *gin.Context) {
+		site_vid, _ := c.GetQuery("site_vid")
+		c.HTML(
+			http.StatusOK, "site_management.html",
+			gin.H{"site_vid": site_vid},
+		)
+	})
+	//初始化版本站点列表
+	Admin.POST("/site_management/dataForVid", func(c *gin.Context) {
+		site_vid, _ := c.GetQuery("site_vid")
+		if site_vid == "" {
+			data, _ := Mgo.Find("site_management", nil, `{"_id":-1}`, nil, false, -1, -1)
+			c.JSON(200, gin.H{"data": data})
+		} else {
+			data, _ := Mgo.Find("site_management", bson.M{"site_vid": site_vid}, `{"_id":-1}`, nil, false, -1, -1)
+			c.JSON(200, gin.H{"data": data})
+		}
+	}) //版本站点列表
+	Admin.POST("/site_management/byId", func(c *gin.Context) {
+		_id := c.PostForm("_id")
+		if  !bson.IsObjectIdHex(_id) {
+			c.JSON(400, gin.H{"rep": false})
+			return
+		}
+		data, _ := Mgo.FindById("site_management", _id, bson.M{})
+		c.JSON(200, gin.H{"rep": true,"data":data})
+	})
+
+	//站点信息保存
+	Admin.POST("/site_management/save", func(c *gin.Context) {
+		_id, _ := c.GetPostForm("_id")
+		data := GetPostForm(c)
+		if _id != "" {
+			Mgo.UpdateById("site_management", _id, map[string]interface{}{"$set": data})
+			c.JSON(200, gin.H{"rep": true})
+		} else {
+			if data["site_name"] == nil || data["site_href"] == nil || data["site_script"] == nil {
+				c.JSON(400, gin.H{"rep": false})
+				return
+			}
+			u, _ := url.Parse(data["site_href"].(string))
+			//log.Println(u,e,u.Scheme)
+			if u.Scheme == "" {
+				data["site_href"] = "http://" + strings.TrimSpace(data["site_href"].(string))
+			}
+			Mgo.Save("site_management", data)
+			c.JSON(200, gin.H{"rep": true, "site_vid": data["site_vid"]})
+		}
+	})
+	//站点信息保存
+	Admin.POST("/site_management/delete", func(c *gin.Context) {
+		_id, _ := c.GetPostForm("_id")
+		if _id == "" || !bson.IsObjectIdHex(_id)  {
+			c.JSON(400, gin.H{"rep": false})
+		} else {
+			Mgo.Del("site_management",bson.M{"_id":bson.ObjectIdHex(_id)})
+			c.JSON(200, gin.H{"rep": true})
+		}
+	})
+}

src/jy/pretreated/analytable.go

@@ -227,6 +227,9 @@ func (table *Table) KVFilter() {
 			if k == "2、建设规模" {
 				k = "预算"
 			}
+			if k == `中标价(万元)\费率(%)`{
+				k = "中标价(万元)"
+			}
 			kvTags, tag := CommonDataAnaly(k, table.Tag, table.Desc, v) //对key标准化处理，没有找到会走中标
 			//qutil.Debug(k, v, k1, w1, v1, tag, b)
 			if tag != "" && table.Tag == "" {

src/web/templates/admin/site_management.html

@@ -0,0 +1,270 @@
+{{template "inc"}}
+<!-- Main Header -->
+{{template "header"}}
+<!-- Left side column. 权限菜单 -->
+{{template "memu"}}
+<link href="../res/doublebox/css/hdw.css" rel="stylesheet" type="text/css">
+<style>.myred {
+        color: red;
+    }</style>
+<script src="../res/doublebox/js/hdw.js"></script>
+
+<!-- Content Wrapper. Contains page content -->
+<div class="content-wrapper">
+
+    <section class="content-header">
+        <h1>
+            {{/*<small><a class="btn btn-primary opr" opr="new">新增版本</a></small>*/}}
+            <small>
+                <button type="button" class="btn btn-primary" data-toggle="modal" onclick='createOneVersion("")'>新增站点
+                </button>
+            </small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="/admin/site_management"><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-body">
+                        <table id="dataTable" 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-version">
+    <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" id="version_title">新增站点</h4>
+                </div>
+                <div class="modal-body">
+                    <input name="name" id="site_vid" type="hidden" value={{.site_vid}}>
+                    <div class="form-group">
+                        <label for="code" class="col-sm-2 control-label myred">站点名称:</label>
+                        <div class="col-sm-10">
+                            <input name="name" type="text" id="site_name" value="" class="form-control"
+                                   placeholder="站点名称">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="code" class="col-sm-2 control-label myred">描述:</label>
+                        <div class="col-sm-10">
+                            <input name="name" type="text" id="site_descript" value="" class="form-control"
+                                   placeholder="描述信息">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="code" id="fieldname" class="col-sm-2 control-label myred">网址:</label>
+                        <div class="col-sm-10">
+                            <input name="name" type="text" id="site_href" value="" class="form-control"
+                                   placeholder="网址信息">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="code" id="fieldname" class="col-sm-2 control-label myred">脚本:</label>
+                        <div class="col-sm-10">
+                            <input name="name" type="text" id="site_script" value="" class="form-control"
+                                   placeholder="脚本">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default cancel" data-dismiss="modal" onclick="reset()">取消
+                    </button>
+                    <button type="button" class="btn btn-primary save" onclick="save()">保存</button>
+                </div>
+            </div>
+            <!-- /.modal-content -->
+            <input type="hidden" id="site_id" value="">
+        </form>
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!-- footer -->
+{{template "dialog"}}
+{{template "footer"}}
+
+<script>
+    menuActive("version")
+    var site_vid = $("#site_vid").val();//版本id
+    $(function () {
+        ttable = $('#dataTable').DataTable({
+            "paging": false,
+            "lengthChange": false,
+            "searching": true,
+            "ordering": false,
+            "info": true,
+            "autoWidth": false,
+            "ajax": {
+                "url": "/admin/site_management/dataForVid?site_vid=" + site_vid,
+                "type": "post",
+                "data": {}
+            },
+            "language": {
+                "url": "/res/dist/js/dataTables.chinese.lang"
+            },
+            "columns": [
+                {"data": "site_name"},
+                {"data": "site_descript", "width": "10%"},
+                {
+                    "data": "site_href", "width": "25%", render: function (val, a, row) {
+                        return '<a href=' + val + '   target=' + val + '>' + val + '</a>'
+                    }
+                },
+                {"data": "site_script",},
+                {
+                    "data": "_id", "width": "28%", render: function (val, a, row) {
+                        tmp = '<div class="btn-group">' +
+                            '<a class="btn btn-sm btn-primary" href="/admin/site_management/rulepre?version=' + row.site_vid + '">前置规则</a>' +
+                            '<a class="btn btn-sm btn-info" href="/admin/site_management/ruleback?version=' + row.site_vid + '">后置规则</a>' +
+                            '<a class="btn btn-sm btn-warning" href="/admin/site_management/tag?version=' + row.site_vid + '">标签库</a>' +
+                            '<a class="btn btn-sm btn-danger" href="/admin/site_management/clear?version=' + row.site_vid + '">函数清理</a>' +
+                            '</div>';
+                        return tmp
+                    }
+                },
+                {
+                    "data": "_id", "width": "28%", render: function (val, a, row) {
+                        tmp_id = row._id
+                        tmp = '<div class="btn-group">' +
+                            '<button  class="btn btn-sm btn-primary "  onclick="edit_table_btn(\'' + tmp_id + '\');"  value=' + row._id + ' >编&nbsp;&nbsp;辑</button > &nbsp;' +
+                            '<button  class="btn btn-sm btn-danger" onclick="delete_table_btn(\'' + tmp_id + '\');"  value=' + row._id + ' >删除站点</button > &nbsp;' +
+                            '</div>';
+                        return tmp
+                    }
+                }
+            ]
+        });
+
+    })
+
+    //创建标签
+    function createOneVersion() {
+        _id = "";
+        $("#version_title").html("新增站点");
+        $("#site_id").val("");
+        $("#site_name").val("");
+        $("#site_descript").val("");
+        $("#site_href").val("");
+        $("#site_script").val("");
+        $("#modal-info-version").modal("show");
+    }
+
+    //保存
+    function save() {
+        var _id = $("#site_id").val();//版本id
+        var site_vid = $("#site_vid").val();//版本id
+        var site_name = $("#site_name").val();//站点名称
+        var site_descript = $("#site_descript").val();//站点描述
+        var site_href = $("#site_href").val()//站点网址
+        var site_script = $("#site_script").val()//站点脚本
+        if (site_name == "" || site_href == "" || site_script == "") {
+            alert("站点填写不完整！");
+            return false;
+        }
+        console.log({
+            "_id": _id,
+            "site_name": site_name,
+            "site_descript": site_descript,
+            "site_href": site_href,
+            "site_script": site_script,
+            "site_vid": site_vid
+        })
+        // {{/*data:{"_id":_id,"s_descript":s_descript,"version":version,"clearJsonStr":clearJsonStr,"username":{{index (session "user") "name" }}},*/}}
+        $.ajax({
+            url: "/admin/site_management/save",
+            type: "post",
+            data: {
+                "_id": _id,
+                "site_name": site_name,
+                "site_descript": site_descript,
+                "site_href": site_href,
+                "site_script": site_script,
+                "site_vid": site_vid,
+            },
+            success: function (r) {
+                if (r && r.rep) {
+                    window.location.href = "/admin/site_management?site_vid=" + site_vid
+                } else {
+                    showTip("已存在！", 1000)
+                }
+            }
+        })
+    }
+
+    //修改
+    function edit_table_btn(obj) {
+        if (obj == "") {
+            showTip("id不存在！", 1500)
+            return
+        }
+        $.ajax({
+            url: "/admin/site_management/byId",
+            type: "post",
+            data: {
+                "_id": obj,
+            },
+            success: function (r) {
+                console.log(r.data._id)
+                if (r.rep) {
+                    $("#version_title").html("修改站点");
+                    $("#site_id").val(r.data._id);
+                    $("#site_name").val(r.data.site_name);
+                    $("#site_descript").val(r.data.site_descript);
+                    $("#site_href").val(r.data.site_href);
+                    $("#site_script").val(r.data.site_script);
+                    $("#modal-info-version").modal("show");
+                } else {
+                    showTip("查询错误！", 1200)
+                }
+            }
+        })
+    }
+
+    //删除站点
+    function delete_table_btn(obj) {
+        if (obj == "") {
+            showTip("id不存在！", 1500)
+            return
+        }
+        $.ajax({
+            url: "/admin/site_management/delete",
+            type: "post",
+            data: {
+                "_id": obj,
+            },
+            success: function (r) {
+                if (r.rep) {
+                    window.location.href = "/admin/site_management?site_vid=" + site_vid
+                } else {
+                    showTip("删除失败", 1000, function() {});
+                }
+            }
+        })
+    }
+
+</script>

src/web/templates/admin/version.html

@@ -179,7 +179,8 @@ $(function () {
 						'<a class="btn btn-sm btn-info" href="/admin/version/pkginfo?vid='+val+'" >分包</a>'+
 						/*'<a class="btn btn-sm btn-primary opr" opr="edit">编&nbsp;&nbsp;辑1</a>'+*/
 						"<a class=\"btn btn-sm btn-primary opr\" href='#' onclick=\"edit('"+val+"')\">编&nbsp;&nbsp;辑</a> &nbsp;"+
-						'<a class="btn btn-sm btn-danger" href="#" onclick="del(\''+val+'\',\''+row["version"]+'\')">删&nbsp;&nbsp;除</a>'
+						'<a class="btn btn-sm btn-danger" href="#" onclick="del(\''+val+'\',\''+row["version"]+'\')">删&nbsp;&nbsp;除</a>'+
+						'<a class="btn btn-sm btn-danger" href="/admin/site_management?site_vid='+val+'" >站点管理</a>'
 					'</div>';
 			}}
        	]