no message

src/front/user.go

@@ -63,11 +63,11 @@ func (f *Front) Login() {
 			checked = true
 			f.SetSession("user", map[string]interface{}{
 				"s_groupid": (*user)["s_groupid"],
-				//"s_name":    (*user)["s_name"],
-				"i_role":  (*user)["i_role"],
-				"s_pwd":   password,
-				"s_login": username,
-				"id":      mgo.BsonIdToSId((*user)["_id"]),
+				"s_name":    (*user)["s_name"],
+				"i_role":    (*user)["i_role"],
+				"s_pwd":     password,
+				"s_login":   username,
+				"id":        mgo.BsonIdToSId((*user)["_id"]),
 			})
 			UserMenu[username] = GetUserMenu(qu.IntAll((*user)["i_role"]))
 		}
@@ -158,7 +158,7 @@ func (f *Front) UserGroupNew() {
 			m1["s_name"] = ""
 			m1["s_login"] = group["s_name"]
 			m1["s_password"] = qu.SE.EncodeString(qu.ObjToString(group["s_password"]))
-			m1["i_power"] = "1"
+			m1["i_role"] = group["i_role"]
 			m1["s_phone"] = ""
 			m1["i_createtime"] = currenttime
 			m1["i_updatetime"] = currenttime
@@ -172,7 +172,7 @@ func (f *Front) UserGroupNew() {
 				m["s_name"] = ""
 				m["s_login"] = qu.ObjToString(group["s_name"]) + "_zj_" + strconv.Itoa(i)
 				m["s_password"] = qu.SE.EncodeString(qu.ObjToString(user["u1_pwd"]))
-				m["i_power"] = "2"
+				m["i_role"] = "3"
 				m["s_phone"] = ""
 				m["i_createtime"] = currenttime
 				m["i_updatetime"] = currenttime
@@ -187,7 +187,7 @@ func (f *Front) UserGroupNew() {
 				m["s_name"] = ""
 				m["s_login"] = qu.ObjToString(group["s_name"]) + "_" + strconv.Itoa(i)
 				m["s_password"] = qu.SE.EncodeString(qu.ObjToString(user["u2_pwd"]))
-				m["i_power"] = "3"
+				m["i_role"] = "4"
 				m["s_phone"] = ""
 				m["i_createtime"] = currenttime
 				m["i_updatetime"] = currenttime

src/web/templates/com/header.html

@@ -82,15 +82,19 @@
 				    <label class="col-sm-2 control-label">角色:</label>
 				    <div class="col-sm-10">
 				     	<select id="t_role" class="form-control" disabled>
-							<option value={{(session "user").role}}>
+							<option value={{(session "user").i_role}}>
 							<script>
-								role={{(session "user").role}};
-								if(role===2){
-									document.write("开发员")
-								}else if(role=="1"){
+								role={{(session "user").i_role}}
+								if (role === "0") {
+									document.write("超级管理员")
+								}else if(role === "1"){
+									document.write("系统管理员")
+								}else if(role === "2"){
 									document.write("管理员")
+								}else if(role === "3"){
+									document.write("质检员")
 								}else{
-									document.write("系统管理员")
+									document.write("普通用户")
 								}
 							</script>
 							</option>

src/web/templates/project/project_clear.html

@@ -22,30 +22,29 @@
 
                         <div class="form-horizontal">
                             <div class="box-body margin">
-                                <h3><i class="glyphicon glyphicon-exclamation-sign" style="margin-right: 6px"></i>数据情况
-                                </h3>
+                                <h4><i class="glyphicon glyphicon-exclamation-sign" style="margin-right: 6px"></i>数据情况</h4>
                                 <div class="form-group" style="margin-left: 15px">
                                     <span class="form-inline panel-body">分发总量/数据总量（条）：
                                         <input type="text" class="form-control" readonly value="{{.T.allGiveDataNum}}/{{.T.allDataNum}}">
                                     </span>
                                 </div>
                                 <div class="form-group" style="margin-left: 10px">
-                                    <div class="col-xs-6" style="width: auto">
+                                    <div class="col-xs-3" style="width: auto">
                                         <label class="form-inline">数据总量：
                                         <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.allDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">已分发：
+                                        <label class="form-inline" style="margin-left: 5px">已分发：
                                         <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.allGiveDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">待分发：
+                                        <label class="form-inline" style="margin-left: 5px">待分发：
                                         <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.allNoGiveDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">已标注：
+                                        <label class="form-inline" style="margin-left: 5px">已标注：
                                         <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.allIsTagDataNum}}"></label>
                                     </div>
-                                    <div class="col-xs-3 form-group">
+                                    <div class="col-xs-5 form-group">
                                         <label class="form-inline">&nbsp;操作：
-                                            <input type="button" class="btn btn-danger" onclick="" value="标注">
-                                            <input type="button" class="btn btn-info" onclick="dispatchTask('all')" value="分发">
-                                            <input type="button" class="btn btn-primary" value="质检">
-                                            <input type="button" class="btn btn-success" value="质检结果">
+                                            <input type="button" class="btn btn-sm btn-primary" onclick="" value="标注">
+                                            <input type="button" class="btn btn-sm btn-primary" onclick="dispatchTask('all')" value="分发">
+                                            <input type="button" class="btn btn-sm btn-primary" value="质检">
+                                            <input type="button" class="btn btn-sm btn-primary" value="质检结果">
                                         </label>
                                     </div>
                                 </div>
@@ -53,19 +52,19 @@
                                     <div class="col-xs-6" style="width: auto">
                                         <label class="form-inline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;达标：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.okAllDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">已分发：
+                                        <label class="form-inline" style="margin-left: 5px">已分发：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.okIsGiveDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">待分发：
+                                        <label class="form-inline" style="margin-left: 5px">待分发：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.okNotGiveDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">已标注：
+                                        <label class="form-inline" style="margin-left: 5px">已标注：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.okIsTagDataNum}}"></label>
                                     </div>
-                                    <div class="col-xs-3 form-group">
+                                    <div class="col-xs-5 form-group">
                                         <label class="form-inline">操作：
-                                            <input type="button" class="btn btn-danger" onclick="" value="标注">
-                                            <input type="button" class="btn btn-info" onclick="dispatchTask('notag')" value="分发">
-                                            <input type="button" class="btn btn-primary" value="质检">
-                                            <input type="button" class="btn btn-success" value="质检结果">
+                                            <input type="button" class="btn btn-sm btn-primary" onclick="" value="标注">
+                                            <input type="button" class="btn btn-sm btn-primary" onclick="dispatchTask('notag')" value="分发">
+                                            <input type="button" class="btn btn-sm btn-primary" value="质检">
+                                            <input type="button" class="btn btn-sm btn-primary" value="质检结果">
                                         </label>
                                     </div>
                                 </div>
@@ -73,26 +72,26 @@
                                     <div class="col-xs-6" style="width: auto">
                                         <label class="form-inline">&nbsp;&nbsp;&nbsp;&nbsp;未达标：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.IsNoOkAllDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">已分发：
+                                        <label class="form-inline" style="margin-left: 5px">已分发：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.IsNoOkIsGiveDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">待分发：
+                                        <label class="form-inline" style="margin-left: 5px">待分发：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.IsNotOkNotGiveDataNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">已标注：
+                                        <label class="form-inline" style="margin-left: 5px">已标注：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.IsNotOkIsTagDataNum}}"></label>
                                     </div>
-                                    <div class="col-xs-3 form-group">
+                                    <div class="col-xs-5 form-group">
                                         <label class="form-inline">操作：
-                                            <input type="button" class="btn btn-danger" onclick="" value="标注">
-                                            <input type="button" class="btn btn-info" onclick="dispatchTask('tag')" value="分发">
-                                            <input type="button" class="btn btn-primary" value="质检">
-                                            <input type="button" class="btn btn-success" value="质检结果">
+                                            <input type="button" class="btn btn-sm btn-primary" onclick="" value="标注">
+                                            <input type="button" class="btn btn-sm btn-primary" onclick="dispatchTask('tag')" value="分发">
+                                            <input type="button" class="btn btn-sm btn-primary" value="质检">
+                                            <input type="button" class="btn btn-sm btn-primary" value="质检结果">
                                         </label>
                                     </div>
                                 </div>
 
                             </div>
                         </div>
-                        <div id="status-div" class="col-xs-9">
+                        <div id="status-div" class="col-xs-1" style="width: auto;float:right;">
                             <select class="form-control selectpicker" id="pushModelSelect">
                                 <option value=-1>全部</option>
                                 <option value=0>开启</option>
@@ -394,19 +393,23 @@
     }
 
     function closeTask(val, status) {
-        showConfirm("确认要关闭当前任务吗？", function () {
-            $.ajax({
-                url: "/front/project/task/close",
-                type: 'POST',
-                data: {"s_status": status, "id": val},
-                success: function (r) {
-                    if (r.success) {
-                        location.reload()
-                    } else {
-                        showTip(r.msg);
+        if (status === "未开始") {
+            showConfirm("确认要关闭当前任务吗？", function () {
+                $.ajax({
+                    url: "/front/project/task/close",
+                    type: 'POST',
+                    data: {"s_status": status, "id": val},
+                    success: function (r) {
+                        if (r.success) {
+                            location.reload()
+                        } else {
+                            showTip(r.msg);
+                        }
                     }
-                }
+                })
             })
-        })
+        }else {
+            showTip("操作不允许")
+        }
     }
 </script>

src/web/templates/project/project_list.html

@@ -19,16 +19,11 @@
                 <div class="box">
                     <div class="box-body">
 
-                        <div class="form-horizontal">
-                            <div class="box-body">
-                                <div class="form-group" style="margin-left: 20px">
-                                    <a class="btn btn-sm btn-success h4" onclick="createPro()"><i
-                                            class="fa fa-fw fa-plus fa-lg"></i>新建项目</a>
-                                </div>
-                            </div>
+                        <div class="form-group" style="margin-left: 20px">
+                            <a class="btn btn-sm btn-success h4" onclick="createPro()"><i
+                                    class="fa fa-fw fa-plus fa-lg"></i>新建项目</a>
                         </div>
-
-                        <div id="status-div" class="col-xs-9">
+                        <div id="status-div" class="col-xs-1" style="width: auto;float: right">
                             <select class="form-control selectpicker" id="pushModelSelect">
                                 <option value=-1>全部</option>
                                 <option value=0>开启</option>
@@ -304,7 +299,6 @@
                             '<a class="btn btn-sm btn-warning" onclick="clearPro(\''+ pos.row +'\')">清洗</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-info" onclick="">质检</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-default" href="">完成</a>&nbsp;&nbsp;<br>' +
-                            '<div style="margin-top: 5px">' +
                             '<a class="btn btn-sm btn-primary" href="">上传</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" href="">下载</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" href="">质检结果</a>&nbsp;&nbsp;' +

src/web/templates/project/task_detail.html

@@ -21,33 +21,32 @@
 
                         <div class="form-horizontal">
                             <div class="box-body margin">
-                                <h3><i class="glyphicon glyphicon-exclamation-sign" style="margin-right: 6px"></i>数据情况
-                                </h3>
-                                <div class="form-group" style="margin-left: 10px;margin-top: 20px">
-                                    <div class="col-xs-6" style="width: auto">
+                                <h4><i class="glyphicon glyphicon-exclamation-sign" style="margin-right: 6px"></i>数据情况</h4>
+                                <div class="form-group" style="margin-left: 10px;margin-top: 10px">
+                                    <div class="col-xs-5" style="width: auto">
                                         <label class="form-inline">数据总量：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.allNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">已分发：
+                                        <label class="form-inline" style="margin-left: 5px">已分发：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.isGiveNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">待分发：
+                                        <label class="form-inline" style="margin-left: 5px">待分发：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.isNotGiveNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">已标注：
+                                        <label class="form-inline" style="margin-left: 5px">已标注：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.isTagNum}}"></label>
-                                        <label class="form-inline" style="margin-left: 20px">未标注：
+                                        <label class="form-inline" style="margin-left: 5px">未标注：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.isNotTagNum}}"></label>
                                     </div>
                                     <div class="col-xs-4 form-group">
                                         <label class="form-inline">操作：
-                                            <input type="button" class="btn btn-info" onclick="dispatchTask('0')" value="分发">
-                                            <input type="button" class="btn btn-primary" value="质检">
-                                            <input type="button" class="btn btn-success" value="质检结果">
+                                            <input type="button" class="btn btn-sm btn-primary" onclick="dispatchTask('0')" value="分发">
+                                            <input type="button" class="btn btn-sm btn-primary" value="质检">
+                                            <input type="button" class="btn btn-sm btn-primary" value="质检结果">
                                         </label>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <hr>
-                        <div id="status-div" class="col-xs-9">
+                        <div id="status-div" class="col-xs-1" style="width: auto;float: right">
                             <select class="form-control selectpicker" id="pushModelSelect">
                                 <option value=-1>全部</option>
                                 <option value=0>开启</option>
@@ -56,8 +55,7 @@
                         </div>
                         <div class="form-horizontal">
                             <div class="box-body margin">
-                                <h3><i class="glyphicon glyphicon-tasks" style="margin-right: 6px"></i>数据清洗任务列表
-                                </h3>
+                                <h4><i class="glyphicon glyphicon-tasks" style="margin-right: 6px"></i>数据清洗任务列表</h4>
 
                                 <table id="dataTable" class="table table-bordered table-hover">
                                     <thead>
@@ -396,19 +394,23 @@
         }
     }
     function closeTask(val, status, sourceinfo) {
-        showConfirm("确认要关闭当前任务吗？", function () {
-            $.ajax({
-                url: "",
-                type: 'POST',
-                data: {"s_sourceinfo": sourceinfo, "taskid": id, "s_status": status},
-                success: function (r) {
-                    if (r.success) {
-                        ttable.api().ajax.reload()
-                    } else {
-                        showTip(r.msg);
+        if (status === "未开始") {
+            showConfirm("确认要关闭当前任务吗？", function () {
+                $.ajax({
+                    url: "",
+                    type: 'POST',
+                    data: {"s_sourceinfo": sourceinfo, "taskid": id, "s_status": status},
+                    success: function (r) {
+                        if (r.success) {
+                            ttable.api().ajax.reload()
+                        } else {
+                            showTip(r.msg);
+                        }
                     }
-                }
+                })
             })
-        })
+        }else {
+            showTip("操作不允许")
+        }
     }
 </script>

src/web/templates/user/user_group.html

@@ -19,16 +19,12 @@
                 <div class="box">
                     <div class="box-body">
 
-                        <div class="form-horizontal">
-                            <div class="box-body">
-                                <div class="form-group" style="margin-left: 20px">
-                                    <a class="btn btn-sm btn-success margin" href="/front/group/new"><i class="fa fa-fw fa-plus fa-lg"></i>新建用户组</a>
-                                    <a class="btn btn-sm btn-default margin" onclick="bulkSetup(true)">批量开启</a>
-                                    <a class="btn btn-sm btn-default margin" onclick="bulkSetup(false)">批量关闭</a>
-                                </div>
-                            </div>
+                        <div class="form-group" style="margin-left: 20px">
+                            <a class="btn btn-sm btn-success margin" href="/front/group/new"><i class="fa fa-fw fa-plus fa-lg"></i>新建用户组</a>
+                            <a class="btn btn-sm btn-default margin" onclick="bulkSetup(true)">批量开启</a>
+                            <a class="btn btn-sm btn-default margin" onclick="bulkSetup(false)">批量关闭</a>
                         </div>
-                        <div id="status-div" class="col-xs-9">
+                        <div id="status-div" class="col-xs-1" style="width: auto;float: right">
                             <select class="form-control selectpicker" id="pushModelSelect">
                                 <option value=-1>全部</option>
                                 <option value=0>开启</option>
@@ -98,14 +94,14 @@
                     {"data": "", width: "1%", render: function() {
                         return `<input type="checkbox" name="ckb-keyid" onclick="singleSelect(this)" style="text-align: center">`
                     }},
-                {"data": "s_name", width: "15%"},
-                {"data": "s_personname", width: "9%"},
-                {"data": "i_createtime",width:"9%", render: function (val) {
+                {"data": "s_name", width: "10%"},
+                {"data": "s_personname", width: "5%"},
+                {"data": "i_createtime",width:"5%", render: function (val) {
                         var dt = new Date()
                         dt.setTime(parseInt(val) * 1000);
                         return dt.format("yyyy-MM-dd")
                     }},
-                {"data": "i_updatetime",width:"9%", render: function (val) {
+                {"data": "i_updatetime", width:"5%", render: function (val) {
                   var dt = new Date()
                   dt.setTime(parseInt(val) * 1000);
                   return dt.format("yyyy-MM-dd")
@@ -118,7 +114,7 @@
                             tmp="<a href='#' title='启用' onclick='setupState(\""+row._id+"\",true)'><i class='fa fa-fw fa-circle text-red'></i></a>未启用"
                         }
                         return tmp
-                    }, width: "10%" },
+                    }, width: "5%" },
                 {"data": "_id", width:"11%",render: function (val, a, row, pos) {
                       tmp = '<div>' +
                           '<a class="btn btn-sm btn-primary" href="/front/group/edit?id='+val+'">编辑</a>&nbsp;&nbsp;'+

src/web/templates/user/user_group_create.html

@@ -20,13 +20,13 @@
             <div class="box box-primary">
                 <div class="box-header with-border">
                     <i class="fa fa-group"></i>
-                    <h3 class="box-title">用户组信息</h3>
+                    <h4 class="box-title">用户组信息</h4>
                 </div>
                 <div class="box-body">
                     <div class="form-group" style="text-align: right;margin-right: 20px" >
 <!--                        <a class="btn btn-sm btn-success" onclick="addMember()"><i class="fa fa-fw fa-plus fa-lg"></i>添加成员信息</a>-->
                     </div>
-                    <div class="form-group margin-bottom">
+                    <div class="form-group">
                         <label class="col-sm-2 control-label"><span style="color:red;">* </span>用户组名称</label>
                         <div class="col-sm-3">
                             <input type="text" class="form-control" id="group-name" placeholder="用户组名称" required>
@@ -36,7 +36,7 @@
                             <input type="text" class="form-control" id="company-name" placeholder="公司名称" required>
                         </div>
                     </div>
-                    <div class="form-group margin-bottom">
+                    <div class="form-group">
                         <label class="col-sm-2 control-label"><span style="color:red;">* </span>负责人</label>
                         <div class="col-sm-3">
                             <input type="text" class="form-control" id="leader" placeholder="负责人名称" required>
@@ -46,7 +46,7 @@
                             <input type="text" class="form-control" id="contract" placeholder="联系方式：电话/邮箱">
                         </div>
                     </div>
-                    <div class="form-group margin-bottom">
+                    <div class="form-group">
                         <label class="col-sm-2 control-label">用户组权限</label>
                         <div class="col-sm-5 radio">
                             <label class="margin-r-5">
@@ -79,12 +79,12 @@
                     </div>
 
                     <div class="box-body">
-                        <div class="box-header with-border margin-bottom">
+                        <div class="box-header with-border">
                             <i class="fa fa-user"></i>
-                            <h3 class="box-title">质检员信息</h3>
+                            <h4 class="box-title">质检员信息</h4>
                         </div>
                         <h1></h1>
-                        <div class="form-group margin-bottom">
+                        <div class="form-group">
                             <label class="col-sm-2 control-label">用户账号</label>
                             <div class="col-sm-3">
                                 <input type="text" readonly="readonly" class="form-control" placeholder="默认用户组名称+zj+数字">
@@ -94,7 +94,7 @@
                                 <input type="number" id="u1-size" class="form-control" value="1" oninput="if(value<0)value=0;if(value>10)value=10">
                             </div>
                         </div>
-                        <div class="form-group margin-bottom">
+                        <div class="form-group">
                             <label class="col-sm-2 control-label">登陆密码</label>
                             <div class="col-sm-2">
                                 <input type="password" id="u1-pwd" readonly="readonly" class="form-control" placeholder="手动输入密码">
@@ -111,12 +111,12 @@
                     </div>
 
                     <div class="box-body">
-                        <div class="box-header with-border margin-bottom">
+                        <div class="box-header with-border">
                             <i class="fa fa-user"></i>
-                            <h3 class="box-title">成员信息</h3>
+                            <h4 class="box-title">成员信息</h4>
                         </div>
                         <h1></h1>
-                        <div class="form-group margin-bottom">
+                        <div class="form-group">
                             <label class="col-sm-2 control-label">用户账号</label>
                             <div class="col-sm-3">
                                 <input type="text" readonly="readonly" class="form-control" placeholder="默认用户组名称+数字">
@@ -126,7 +126,7 @@
                                 <input type="number" id="u2-size" class="form-control" value="1" oninput="if(value<0)value=0;if(value>30)value=30">
                             </div>
                         </div>
-                        <div class="form-group margin-bottom">
+                        <div class="form-group">
                             <label class="col-sm-2 control-label">登陆密码</label>
                             <div class="col-sm-2">
                                 <input type="password" readonly="readonly" id="u2-pwd" class="form-control" placeholder="手动输入密码">