Browse Source

no message

Jianghan 3 years ago
parent
commit
928fb8e0c7

+ 1 - 1
src/front/remark.go

@@ -115,7 +115,7 @@ func getDetail(id, coll string) map[string]interface{} {
 	}
 	baseInfo["detail"] = qu.ObjToString(baseInfo["title"]) + "</br>" + qu.ObjToString(baseInfo["detail"])
 	baseInfo["_id"] = mgo.BsonIdToSId(baseInfo["_id"])
-	purchasingTag, _ := bzInfo["purchasinglist_alltag"].(bool)
+	purchasingTag, _ := baseInfo["purchasinglist_alltag"].(bool)
 	rep["purchasingTag"] = purchasingTag
 	href := qu.ObjToString(baseInfo["href"])
 	if !strings.HasPrefix(href, "http") {

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

@@ -301,7 +301,7 @@
                             '<a class="btn btn-sm btn-primary" onclick="clearPro(\''+ pos.row +'\')">清洗</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" onclick="">质检</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" href="">质检结果</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-primary" onclick="completePro()">完成</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" onclick="completePro(\'' + val + '\',\''+row.s_sourceinfo+'\',\'' + row.s_status + '\')">完成</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
                     }

+ 1 - 0
src/web/templates/project/remark_list.html

@@ -9,6 +9,7 @@
             <small></small>
         </h1>
         <ol class="breadcrumb">
+            <li><a href="/front/user/task/list"><i class="fa fa-dashboard"></i> 任务列表</a></li>
             <li><a href="#"><i class="fa fa-dashboard"></i> 标注列表</a></li>
         </ol>
     </section>

+ 3 - 4
src/web/templates/project/task_user_list.html

@@ -9,8 +9,7 @@
             <small></small>
         </h1>
         <ol class="breadcrumb">
-            <li><a href="/front/group/user/task/list"><i class="fa fa-dashboard"></i> 任务列表</a></li>
-            <li><a href="#"><i class="fa fa-dashboard"></i> 标注列表</a></li>
+            <li><a href="#"><i class="fa fa-dashboard"></i> 任务列表</a></li>
         </ol>
     </section>
     <!-- Main content -->
@@ -87,8 +86,8 @@
             },
             "columns": [
                 {"data": null, width: "1%"},
-                {"data": "s_projectname", width: "4%"},
-                {"data": "i_givenum", width: "4%"},
+                {"data": "s_projectname", width: "6%"},
+                {"data": "i_givenum", width: "3%"},
                 {"data": "s_status", width: "4%"},
                 {"data": "s_progress", width: "4%"},
                 {"data": "i_starttime", width: "4%", render: function (val) {