no message

src/config.json

@@ -6,12 +6,12 @@
     "alltocoll": "marked",
     "bidding":{
         "addr":"192.168.3.207:27092",
-        "db": "mxs",
+        "db": "qfw_data",
         "coll1": "bidding",
         "coll2": "bidding_back",
         "size": 10,
-        "username": "dataAnyWrite",
-        "password": "data@dataAnyWrite"
+        "username": "",
+        "password": ""
     },
     "extract":{
         "addr": "192.168.3.207:27092",

src/front/remark.go

@@ -102,7 +102,7 @@ func (f *Front) RemarkDetail() {
 	f.T["worder_new"] = rep["worder_new"]
 	f.T["pcl_new"] = rep["pcl_new"]
 	f.T["pkg_new"] = rep["pkg_new"]
-	f.T["nextid"] = GetNextDataId(did, coll) //下一条id
+	f.T["nextid"] = GetNextDataId(did, coll, pid) //下一条id
 	_ = f.Render("project/remark_detail.html", &f.T)
 }
 
@@ -524,13 +524,15 @@ func DealData(tmpLen int, publishtime float64, tmp []map[string]interface{}, mor
 }
 
 //获取当前数据下一条的id
-func GetNextDataId(id, coll string) string {
+func GetNextDataId(id, coll, tid string) string {
 	nextIdQuery := map[string]interface{}{
 		"_id": map[string]interface{}{
 			"$gt": mgo.StringTOBsonId(id),
 		},
 	}
-
+	if tid != "" {
+		nextIdQuery["s_usertaskid"] = tid
+	}
 	one, _ := util.Mgo.Find(coll, nextIdQuery, `{"_id":1}`, `{"_id":1}`, true, 0, 1)
 	if one != nil && len(*one) == 1 {
 		return mgo.BsonIdToSId((*one)[0]["_id"])
@@ -705,7 +707,7 @@ func (f *Front) CheckDetail() {
 	f.T["worder_new"] = rep["worder_new"]
 	f.T["pcl_new"] = rep["pcl_new"]
 	f.T["pkg_new"] = rep["pkg_new"]
-	f.T["nextid"] = GetNextDataId(did, coll) //下一条id
+	f.T["nextid"] = GetNextDataId(did, coll, tid) //下一条id
 	_ = f.Render("project/check_detail.html", &f.T)
 }
 

src/main.go

@@ -34,7 +34,7 @@ func init() {
 }
 
 func main() {
-	//qu.Debug(SE.EncodeString("60b99c2d72c25c51c492af6a"))
+	//qu.Debug(SE.EncodeString("5c0a207ca5cb26b9b76ce197"))
 	//return
 	//go front.QuaFieldScore([]string{"buyer"},"zktest_data") //临时测试-质量
 	//Mgo.UpdateById("test11", "61a9975a180a78e6edf8285d", map[string]interface{}{

src/web/templates/project/check_result.html

@@ -25,9 +25,9 @@
                             <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.taskTagNum}} / {{ .T.taskNum }}"></label>
+                                        <input type="text" class="form-control" readonly value="{{.T.taskTagNum}} / {{ .T.taskNum }}"></label>
                                     <label class="form-inline">已检数据/已标总量：
-                                        <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.taskCheckNum}} / {{ .T.taskTagNum }}"></label>
+                                        <input type="text" class="form-control" readonly value="{{.T.taskCheckNum}} / {{ .T.taskTagNum }}"></label>
                                 </div>
                             </div>
                         </div>

src/web/templates/project/project_list.html

@@ -80,7 +80,7 @@
                         </div>
                         <form id="model-form-project" class="form-horizontal" enctype="multipart/form-data">
                             <div class="box-body">
-                                <div class="form-group margin-bottom">
+                                <div class="form-group">
                                     <label class="col-sm-3 control-label"><span style="color:red;">* </span>项目名称</label>
                                     <div class="col-sm-5">
                                         <input type="text" class="form-control" id="project-name" placeholder="项目名称" onblur="checkProName()">
@@ -411,12 +411,12 @@
                 type: 'POST',
                 data: projectmap,
                 success: function (r) {
+                    hideLoading()
                     if (r.success) {
-                        hideLoading()
                         $("#modal-create-project").modal('hide')
                         ttable.api().ajax.reload();
                     } else {
-                        showTip(r.msg)
+                        showTip(r.msg, 3000)
                     }
                 }
             })
@@ -440,12 +440,13 @@
                     processData: false,
                     contentType: false,
                     success: function (r) {
+                        hideLoading()
                         if (r.success) {
-                            hideLoading()
                             $("#modal-create-project").modal('hide')
                             showTip(r.msg, 3000);
                             ttable.api().ajax.reload();
                         } else {
+                            console.log(r.msg)
                             showMsg(r.msg);
                         }
                     }
@@ -573,9 +574,11 @@
             $.ajax({
                 url: "/front/project/isExists",
                 type: "POST",
-                data: {},
+                data: {"s_name": pname},
                 success: function (r) {
-
+                    if (r.exists) {
+                        alert("项目名称已经存在")
+                    }
                 }
             })
         }

src/web/templates/project/remark_list.html

@@ -51,6 +51,8 @@
     let pid = {{ .T.pid }}
     let sourceinfo = {{ .T.s_sourceinfo }}
 
+    let index = 0
+
     $(function () {
         ttable = $('#dataTable').dataTable({
             "paging": true,
@@ -78,7 +80,7 @@
                     ttable.api().page(redirectpage).draw(false);
                 });
                 this.api().column(0).nodes().each(function (cell, i) {
-                    cell.innerHTML = i + 1;
+                    cell.innerHTML = index + 1;
                 });
             },
             "columns": [