xg

src/front/project.go

@@ -70,7 +70,8 @@ func (f *Front) ProjectList() {
 // ProjectSave 项目保存
 func (f *Front) ProjectSave() {
 	defer qu.Catch()
-	s_name := f.GetString("s_name") //项目名称
+	s_name := f.GetString("s_name")     //项目名称
+	clearType := f.GetString("s_clear") // 清洗类型	normal interior
 	if s_name == "" {
 		f.ServeJson(map[string]interface{}{"success": false, "msg": "缺少项目名称字段"})
 		return
@@ -115,6 +116,7 @@ func (f *Front) ProjectSave() {
 			"s_departname":   s_departname,                  //部门名称
 			"s_rulename":     strings.Join(s_rulename, ","), //规则名称
 			"i_importnum":    importDataNum,                 //导入数量
+			"s_cleartype":    clearType,
 			"appid":          appid,
 			"s_createname":   username,          //创建人
 			"s_status":       "未开始",             //项目状态
@@ -168,7 +170,7 @@ func (f *Front) ProjectSave() {
 			"i_createtime":   time.Now().Unix(), //创建时间
 			"s_importtype":   "coll",            //导入类型
 			"s_historyid":    historyid,         //源数据集标识
-			"b_isassessment": false,             //是否进行了质量评估
+			"b_isassessment": true,              //是否进行了质量评估
 		}
 	} else if stype == "edit" { //编辑保存
 		success = true
@@ -367,10 +369,12 @@ func (f *Front) ProjectQualityAssessment() {
 	defer qu.Catch()
 	msg := ""
 	success := false
+	stype := ""
 	//质量评估
 	projectid := f.GetString("pid") //项目id
-	project, _ := util.Mgo.FindById(util.PROJECTCOLLNAME, projectid, map[string]interface{}{"b_isassessment": 1, "appid": 1, "v_fields": 1})
+	project, _ := util.Mgo.FindById(util.PROJECTCOLLNAME, projectid, map[string]interface{}{"b_isassessment": 1, "appid": 1, "v_fields": 1, "s_cleartype": 1})
 	if project != nil && len(*project) > 0 {
+		stype = qu.ObjToString((*project)["s_cleartype"])
 		if isAssessment, ok := (*project)["b_isassessment"].(bool); ok && !isAssessment {
 			appid := qu.ObjToString((*project)["appid"])
 			// todo
@@ -386,7 +390,7 @@ func (f *Front) ProjectQualityAssessment() {
 	} else {
 		msg = "查询项目失败"
 	}
-	f.ServeJson(map[string]interface{}{"success": success, "msg": msg})
+	f.ServeJson(map[string]interface{}{"success": success, "msg": msg, "stype": stype})
 }
 
 // ProjectGroupTaskList 用户组任务分发列表

src/web/templates/project/project_list.html

@@ -509,7 +509,6 @@
     function importData() {
         let sname = $('#project-name').val()
         let clearType = $("input[type='radio'][name='clear-type']:checked").val()
-        console.log(clearType)
         if (sname === "") {
             alert("项目名称为必填项")
             return
@@ -634,19 +633,21 @@
             showTip("请设置标注字段")
         }else {
             showLoading("数据清洗中，请稍候...")
-            $.ajax({
-                url: "/front/project/qualityAssessment",
-                type: 'POST',
-                data: {"pid": tmp["_id"]},
-                success: function (r) {
-                    hideLoading()
-                    if (r.success) {
-                        window.location.href="/front/project/task/list?pid="+tmp["_id"]
-                    } else {
-                        showTip(r.msg);
-                    }
-                }
-            })
+            window.location.href="/front/project/task/list?pid="+tmp["_id"]
+            // $.ajax({
+            //     url: "/front/project/qualityAssessment",
+            //     type: 'POST',
+            //     data: {"pid": tmp["_id"]},
+            //     success: function (r) {
+            //         hideLoading()
+            //         if (r.success) {
+            //             window.location.href="/front/project/task/list?pid="+tmp["_id"]
+            //
+            //         } else {
+            //             showTip(r.msg);
+            //         }
+            //     }
+            // })
         }
     }
 

src/web/templates/project/remark_detail.html

@@ -1171,6 +1171,7 @@
                     status: "2",
                     isnew: true,
                     isFour: true,
+                    parentId: two.__id,
                     parentIndex: index,
                     title: "子包-标的物信息",
                     uInput: [
@@ -1289,7 +1290,9 @@
                             // 转回 content
                             if (type) {
                                 if (two.isFour) {
-                                    var parentNode = one.content[two.parentIndex]
+                                    // 兼容判断
+                                    const parentIndex = one.content.findIndex(v => v.__id === two.parentId)
+                                    var parentNode = one.content[parentIndex]
                                     if (!parentNode.content) {
                                         parentNode.content = []
                                     }
@@ -1298,8 +1301,9 @@
                             } else {
                                 // 转回平级
                                 if (two.content) {
+                                    two.__id = two.title + Date.now() + Math.random()
                                     two.content = two.content.map(s => {
-                                        s.parentIndex = twoIndex
+                                        s.parentId = two.__id
                                         s.isFour = true
                                         return s
                                     })
@@ -1448,8 +1452,11 @@
             },
             //保存事件
             upChange: function (stype, callback) {
+                console.log(tid)
+                console.log(this.editData)
                 var d = JSON.stringify(this.tranEditData(this.editData, true));
                 var _this = this
+                console.log(d)
                 if (tid === "") {
                     $.ajax({
                         url: "/front/data/jyuser/mark",
@@ -1476,7 +1483,6 @@
                         }
                     });
                 }else {
-                    console.log(d)
                     $.ajax({
                         url: "/front/data/user/mark",
                         method: "post",

src/web/templates/project/remark_list_inn.html

@@ -0,0 +1,118 @@
+{{include "com/inc.html"}}
+<!-- Main Header -->
+{{include "com/header.html"}}
+<!-- Left side column. 权限菜单 -->
+{{include "com/menu.html"}}
+<div class="content-wrapper">
+    <section class="content-header">
+        <h1>
+            <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>
+    <!-- Main content -->
+    <section class="content">
+        <div class="row">
+            <div class="col-xs-12">
+                <div class="box">
+                    <div class="box-body">
+                        <div id="status-div" class="col-xs-1" style="width: auto;float:right;">
+                            <label for="statusSelect">状态：
+                                <select class="form-control selectpicker" id="statusSelect">
+                                    <option value=-1>全部</option>
+                                    <option value=0>未标注</option>
+                                    <option value=1>已标注</option>
+                                </select></label>
+                        </div>
+                        <table id="dataTable" class="table table-bordered table-hover">
+                            <thead>
+                            <tr>
+                                <th></th>
+                                <th>状态</th>
+                                <th>标题</th>
+                            </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+</div>
+
+{{include "com/footer.html"}}
+<script>
+    menuActive("/front/user/task/list");
+
+    let tid = {{ .T.tid }}
+    let pid = {{ .T.pid }}
+
+    $(function () {
+        ttable = $('#dataTable').dataTable({
+            "paging": true,
+            "lengthChange": false,
+            "processing": true,
+            "pageLength": 20,
+            "searching": true,
+            "ordering": false,
+            "info": true,
+            "autoWidth": false,
+            "serverSide": true,
+            "ajax": {
+                "url": "/front/user/remark/list",
+                "type": "post",
+                "data": {"tid": tid}
+            },
+            "language": {
+                "url": "/dist/js/dataTables.chinese.lang"
+            },
+            "fnDrawCallback": function () {
+                $("ul.pagination").prepend("&nbsp;&nbsp;&nbsp;转到第 <input type='text' id='changePage'   style='width:20px;'> 页    <a type='text' href='javascript:void(0);' id='dataTable-btn' style='text-align:center'>GO</a>");
+                $('#dataTable-btn').click(function (e) {
+                    var redirectpage = 0
+                    if ($("#changePage").val() && $("#changePage").val() > 0) {
+                        var redirectpage = $("#changePage").val() - 1;
+                    }
+                    ttable.api().page(redirectpage).draw(false);
+                });
+                this.api().column(0).nodes().each(function (cell, i) {
+                    cell.innerHTML = i + 1;
+                });
+            },
+            "columns": [
+                {"data": null, width: "2%"},
+                {"data": "b_istag", width: "6%", render: function (val) {
+                        let tmp;
+                        if (val) {
+                            tmp = '<span style="display: inline-block;font-size:14px;color: green">已标注</span>'
+                        } else {
+                            tmp = '<span style="display: inline-block;font-size:14px;color: #428bca">未标注</span>'
+                        }
+                        return tmp
+                    }},
+                {"data": "v_baseinfo.title", render: function (val, index, row) {
+                        let tmp;
+                        if (row["b_istag"]) {
+                            tmp = '<a style="display: inline-block;cursor:pointer;font-size:16px;color: green" target="_blank" href="/front/user/remark/detail/?pid='+pid+'&tid=' + tid +'&did=' + row._id + '">' + val + '</a>'
+                        } else {
+                            tmp = '<a style="display: inline-block;cursor:pointer;font-size:16px;color: #428bca" target="_blank" href="/front/user/remark/detail/?pid='+pid+'&tid=' + tid +'&did=' + row._id + '">' + val + '</a>'
+                        }
+                        return tmp
+                    }}
+            ],
+            "initComplete": function () {
+                $("#dataTable_filter").append($('#status-div'))
+            },
+            "fnServerParams": function (e) {
+                e.i_ckdata = $("#statusSelect option:selected").val()
+            }
+        });
+        $('#statusSelect').on('changed.bs.select', function () {
+            ttable.api().ajax.reload();
+        })
+    });
+
+</script>