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

src/front/user.go

@@ -62,11 +62,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"]))
 		}

src/web/templates/project/project_clear.html

@@ -291,7 +291,7 @@
     }
 
     function cancelModel() {
-        $('#TaskDiv .form-group .clone-template').remove()
+        $('#TaskDiv .form-group.clone-template').remove()
         $("#modal-create-task").modal('hide')
         document.getElementById("modal-form-task").reset();
     }
@@ -334,7 +334,7 @@
         $.ajax({
             url: "/front/project/task/save",
             type: 'POST',
-            data: {"grouptaskid": projectid, "s_group": JSON.stringify(arr), "s_type": stype},
+                data: {"s_projectid": projectid, "s_group": JSON.stringify(arr), "s_type": stype},
             success: function (r) {
                 if (r.success) {
                     location.reload()

src/web/templates/project/task_detail.html

@@ -231,7 +231,7 @@
     });
 
     function cancelModel() {
-        $('#TaskDiv .form-group .clone-template').remove()
+        $('#TaskDiv .form-group.clone-template').remove()
         $("#modal-create-task").modal('hide')
         document.getElementById("modal-form-task").reset();
     }