Merge branch 'dev2.0' of http://192.168.3.207:8080/data_processing/data_validation into dev2.0

src/front/user.go

@@ -294,6 +294,7 @@ func (f *Front) UserState() {
 func (f *Front) UserAll() {
 	defer qu.Catch()
 	if f.Method() == "POST" {
+
 		start, _ := f.GetInteger("start")
 		limit, _ := f.GetInteger("length")
 		draw, _ := f.GetInteger("draw")
@@ -302,6 +303,14 @@ func (f *Front) UserAll() {
 		query := map[string]interface{}{
 			"b_delete": false,
 		}
+		user := f.GetSession("user").(map[string]interface{})
+		gid := qu.ObjToString(user["s_groupid"])
+		if user["i_role"] == "0" || user["i_role"] == "1" {
+
+		} else {
+			query["s_groupid"] = gid
+		}
+
 		if search != "" {
 			query["$or"] = []interface{}{
 				bson.M{"s_login": bson.M{"$regex": search}},

src/web/templates/project/project_clear.html

@@ -362,7 +362,7 @@
                 data: { "s_sourceinfo": sourceinfo, "taskid": id, "s_tatus": status,"i_givenum" :givenum},
                 success: function (r) {
                     if (r.success) {
-                        ttable.api().ajax.reload()
+                        location.reload()
                     } else {
                         showTip(r.msg);
                     }
@@ -382,7 +382,7 @@
                 data: {"s_sourceinfo": sourceinfo, "taskid": id},
                 success: function (r) {
                     if (r.success) {
-                        ttable.api().ajax.reload()
+                        location.reload()
                     } else {
                         showTip(r.msg);
                     }
@@ -401,7 +401,7 @@
                 data: {"s_sourceinfo": sourceinfo, "s_status": status, "taskid": id},
                 success: function (r) {
                     if (r.success) {
-                        ttable.api().ajax.reload()
+                        location.reload()
                     } else {
                         showTip(r.msg);
                     }

src/web/templates/project/task_detail.html

@@ -193,7 +193,7 @@
                         }else {
                             var dt = new Date()
                             dt.setTime(parseInt(val) * 1000);
-                            return dt.format("yyyy-MM-dd")
+                            return dt.format("yyyy-MM-dd hh:mm:ss")
                         }
                     }},
                 {"data": "i_completetime", width: "4%", render: function (val) {
@@ -202,7 +202,7 @@
                         }else {
                             var dt = new Date()
                             dt.setTime(parseInt(val) * 1000);
-                            return dt.format("yyyy-MM-dd")
+                            return dt.format("yyyy-MM-dd hh:mm:ss")
                         }
                     }},
                 {

src/web/templates/user/user_group_create.html

@@ -37,25 +37,42 @@
                         </div>
                     </div>
                     <div class="form-group margin-bottom">
-                        <label class="col-sm-2 control-label">负责人</label>
+                        <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="负责人名称">
+                            <input type="text" class="form-control" id="leader" placeholder="负责人名称" required>
                         </div>
                         <label class="col-sm-2 control-label">联系方式</label>
                         <div class="col-sm-3">
                             <input type="text" class="form-control" id="contract" placeholder="联系方式：电话/邮箱">
                         </div>
                     </div>
+                    <div class="form-group margin-bottom">
+                        <label class="col-sm-2 control-label">用户组权限</label>
+                        <div class="col-sm-5 radio">
+                            <label class="margin-r-5">
+                                <input type="radio" name="role" value=1 checked>系统管理员
+                            </label>
+                            <label class="margin-r-5">
+                                <input type="radio" name="role" value=2 checked>管理员
+                            </label>
+                            <label class="margin-r-5">
+                                <input type="radio" name="role" value=3>质检员
+                            </label>
+                            <label>
+                                <input type="radio" name="role" value="4">普通用户
+                            </label>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <label class="col-sm-2 control-label">登陆密码</label>
                         <div class="col-sm-2">
                             <input type="password" id="group-pwd" readonly="readonly" class="form-control" placeholder="手动输入密码">
                         </div>
-                        <div class="col-sm-2">
-                            <label class="col-sm-5 control-label" style="font-size: xx-small;width: auto">默认密码：</label>
+                        <div class="col-xs-3" style="width: auto">
+                            <label class="control-label" style="font-size: xx-small;width: auto">默认密码：</label>
                             <input id="group-switch-pwd" name="switch-pwd" type="checkbox">
                         </div>
-                        <label class="col-sm-1 control-label">服务时间</label>
+                        <label class="col-sm-1 control-label" style="width: auto">服务时间</label>
                         <div class="col-sm-3">
                             <input type="text" id="stratDate" class="col-sm-2 form-control" readonly="readonly" placeholder="开始日期 - 结束日期">
                         </div>
@@ -69,24 +86,24 @@
                         <h1></h1>
                         <div class="form-group margin-bottom">
                             <label class="col-sm-2 control-label">用户账号</label>
-                            <div class="col-sm-2">
+                            <div class="col-sm-3">
                                 <input type="text" readonly="readonly" class="form-control" placeholder="默认用户组名称+zj+数字">
                             </div>
-                            <label class="col-sm-1 control-label">用户个数(个)</label>
-                            <div class="col-sm-1">
+                            <label class="col-sm-2 control-label">用户个数(个)</label>
+                            <div class="col-sm-3">
                                 <input type="number" id="u1-size" class="form-control" value="1" oninput="if(value<0)value=0;if(value>10)value=10">
                             </div>
-                            <label class="col-sm-1 control-label">登陆密码</label>
+                        </div>
+                        <div class="form-group margin-bottom">
+                            <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="手动输入密码">
                             </div>
-                            <div class="col-sm-2">
-                                <label class="col-sm-5 control-label" style="font-size: xx-small;width: auto">默认密码：</label>
+                            <div class="col-xs-3" style="width: auto">
+                                <label class="control-label" style="font-size: xx-small;">默认密码：</label>
                                 <input id="u1-switch-pwd" name="switch-pwd" type="checkbox">
                             </div>
-                        </div>
-                        <div class="form-group margin-bottom">
-                            <label class="col-sm-2 control-label">用户状态</label>
+                            <label class="col-sm-1 control-label" style="width: auto">用户状态</label>
                             <div class="col-sm-3">
                                 <input id="u1-switch-state" name="switch-state" type="checkbox">
                             </div>
@@ -101,24 +118,24 @@
                         <h1></h1>
                         <div class="form-group margin-bottom">
                             <label class="col-sm-2 control-label">用户账号</label>
-                            <div class="col-sm-2">
+                            <div class="col-sm-3">
                                 <input type="text" readonly="readonly" class="form-control" placeholder="默认用户组名称+数字">
                             </div>
-                            <label class="col-sm-1 control-label">用户个数(个)</label>
-                            <div class="col-sm-1">
+                            <label class="col-sm-2 control-label">用户个数(个)</label>
+                            <div class="col-sm-3">
                                 <input type="number" id="u2-size" class="form-control" value="1" oninput="if(value<0)value=0;if(value>30)value=30">
                             </div>
-                            <label class="col-sm-1 control-label">登陆密码</label>
+                        </div>
+                        <div class="form-group margin-bottom">
+                            <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="手动输入密码">
                             </div>
-                            <div class="col-sm-2">
-                                <label class="col-sm-5 control-label" style="font-size: xx-small;width: auto">默认密码：</label>
+                            <div class="col-xs-3" style="width: auto">
+                                <label class="control-label" style="font-size: xx-small;width: auto">默认密码：</label>
                                 <input name="switch-pwd" id="u2-switch-pwd" type="checkbox">
                             </div>
-                        </div>
-                        <div class="form-group margin-bottom">
-                            <label class="col-sm-2 control-label">用户状态</label>
+                            <label class="col-sm-1 control-label" style="width: auto">用户状态</label>
                             <div class="col-sm-3">
                                 <input id="u2-switch-state" name="switch-state" type="checkbox">
                             </div>
@@ -199,23 +216,19 @@
     // 用户状态
     $("#u1-switch-state").bootstrapSwitch('onSwitchChange', function (event, state){user["u1_state"] = state})
     $("#u2-switch-state").bootstrapSwitch('onSwitchChange', function (event, state){user["u2_state"] = state})
-    // $("#stratDate").datepicker({
-    //     language: 'zh-CN',
-    //     autoclose: true,
-    //     clearBtn: true,
-    //     format: "yyyy-mm-dd"
-    // });
 
     function saveMethod() {
 
         const gname = $("#group-name").val();
         const company = $("#company-name").val()
-        if (gname == null || company == null) {
+        const lender = $("#leader").val()
+        if (gname === "" || company === "" || lender === "") {
             return
         }
+        group["i_role"] = $("input[name='role']:checked").val()
         group["s_name"] = gname
         group["s_entname"] = company
-        group["s_personname"] = $("#leader").val()
+        group["s_personname"] = lender
         group["s_personcontact"] = $("#contract").val()
         group["s_password"] = $("#group-pwd").val()
         user["u1_size"] = $("#u1-size").val()

src/web/templates/user/user_list.html

@@ -153,9 +153,13 @@
                 {"data": "s_login", width: "9%"},
                 {"data": "s_name", width: "9%"},
                 {"data": "i_role", width:"9%", render: function (val) {
-                        if (val === "1") {
-                            return "管理员"
+                        if (val === "0") {
+                            return "超级管理员"
+                        }else if (val === "1") {
+                            return "系统管理员"
                         }else if (val === "2") {
+                            return "管理员"
+                        }else if (val === "3") {
                             return "质检员"
                         }else {
                             return "普通用户"
@@ -173,7 +177,7 @@
                 {"data": "i_createtime",width:"9%", render: function (val) {
                         var dt = new Date()
                         dt.setTime(parseInt(val) * 1000);
-                        return dt.format("yyyy-MM-dd")
+                        return dt.format("yyyy-MM-dd ")
                     }},
                 {"data": "i_updatetime",width:"9%", render: function (val) {
                         var dt = new Date()