maxiaoshan 3 years ago
parent
commit
e7e4e498f3
2 changed files with 4 additions and 6 deletions
  1. 3 5
      src/front/mark.go
  2. 1 1
      src/web/templates/project/remark_detail.html

+ 3 - 5
src/front/mark.go

@@ -21,7 +21,7 @@ func (f *Front) DataMark() {
 	obj := []map[string]interface{}{}
 	infoId := f.GetString("s_infoid")
 	userTaskId := f.GetString("s_usertaskid")
-	qu.Debug(userTaskId)
+	qu.Debug("Task ID:", userTaskId, "	Data ID:", infoId)
 	data := f.GetString("data")
 	err := json.Unmarshal([]byte(data), &obj)
 	if err != nil {
@@ -88,14 +88,12 @@ func (f *Front) DataMark() {
 		allTagFields[k] = nil
 	}
 	qu.Debug("allTagFields===", allTagFields)
-	qu.Debug("0000000")
 	userTask, _ := util.Mgo.FindById(util.TASKCOLLNAME, userTaskId, map[string]interface{}{"s_personid": 1, "s_personname": 1, "s_projectname": 1, "s_sourceinfo": 1})
 	if userTask == nil || len(*userTask) == 0 {
 		f.ServeJson(map[string]interface{}{"success": success, "msg": "查询用户任务失败"})
 		return
 	}
-	sourceInfo := qu.ObjToString((*userTask)["s_sourceinfo"]) //数据源表
-	qu.Debug("11111111111")
+	sourceInfo := qu.ObjToString((*userTask)["s_sourceinfo"])                                                     //数据源表
 	dataInfo, _ := util.Mgo.FindById(sourceInfo, infoId, map[string]interface{}{"v_baseinfo": 1, "v_taginfo": 1}) //查询标注保存前的原始信息
 	tagInfo, _ := (*dataInfo)["v_taginfo"].(map[string]interface{})
 	baseInfo, _ := (*dataInfo)["v_baseinfo"].(map[string]interface{})
@@ -143,7 +141,7 @@ func (f *Front) DataMark() {
 		qu.Debug("444444")
 		//2、更新marked表
 		tmp, _ := util.Mgo.FindById(sourceInfo, infoId, map[string]interface{}{"v_baseinfo": 1, "v_taginfo": 1, "i_ckdata": 1})
-
+		qu.Debug("infoId:", infoId)
 		delete((*tmp), "_id")
 		(*tmp)["updatetime"] = time.Now().Unix()
 		qu.Debug("5555555555555")

+ 1 - 1
src/web/templates/project/remark_detail.html

@@ -1380,7 +1380,7 @@
                   $.ajax({
                       url: "/front/data/mark",
                       method: "post",
-                      data: {key: d, _id: _id, stype: stype},
+                      data: {"data": d, "s_infoid": _id, "stype": stype,"s_usertaskid":{{ .T.tid }}},
                       success: function (res) {
                           if (res) {
                               _this.$message({