no message

src/web/templates/project/project_clear.html

@@ -216,16 +216,16 @@
                 {
                     "data": "_id", width: "4%", render: function (val, a, row) {
                         let str = ""
-                        if (row['i_createtime'] === undefined) {
+                        if (row['i_starttime'] === undefined) {
                             str = "未开始"
-                        }else if (row['i_createtime'] && row['i_completetime'] === undefined) {
+                        }else if (row['i_starttime'] && row['i_completetime'] === undefined) {
                             let dt = new Date()
-                            dt.setTime(parseInt(row['i_createtime']) * 1000);
+                            dt.setTime(parseInt(row['i_starttime']) * 1000);
                             str = dt.format("yyyy-MM-dd") + " - 未结束"
                         }else {
                             let dt = new Date()
                             let ds = new Date()
-                            dt.setTime(parseInt(row['i_createtime']) * 1000);
+                            dt.setTime(parseInt(row['i_starttime']) * 1000);
                             ds.setTime(parseInt(row["i_completetime"]) * 1000)
                             str = dt.format("yyyy-MM-dd") + " - " + ds.format("yyyy-MM-dd")
                         }

src/web/templates/project/project_list.html

@@ -61,7 +61,7 @@
 </div>
 
 <div class="modal fade" id="modal-create-project" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog" style="width: 30%">
+    <div class="modal-dialog" style="width: 50%">
         <div class="modal-content">
             <div class="modal-header">
                 <div class="modal-header">
@@ -174,7 +174,7 @@
 </div>
 
 <div class="modal fade" id="modal-edit-project" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog" style="width: 30%">
+    <div class="modal-dialog" style="width: 50%">
         <div class="modal-content">
             <div class="modal-header">
                 <div class="modal-header">
@@ -282,16 +282,16 @@
                 {
                     "data": "_id", width: "4%", render: function (val, a, row) {
                         let str = ""
-                        if (row['i_createtime'] === undefined) {
+                        if (row['i_starttime'] === undefined) {
                             str = "未开始"
-                        }else if (row['i_createtime'] && row['i_completetime'] === undefined) {
+                        }else if (row['i_starttime'] && row['i_completetime'] === undefined) {
                             let dt = new Date()
-                            dt.setTime(parseInt(row['i_createtime']) * 1000);
+                            dt.setTime(parseInt(row['i_starttime']) * 1000);
                             str = dt.format("yyyy-MM-dd") + " - 未结束"
                         }else {
                             let dt = new Date()
                             let ds = new Date()
-                            dt.setTime(parseInt(row['i_createtime']) * 1000);
+                            dt.setTime(parseInt(row['i_starttime']) * 1000);
                             ds.setTime(parseInt(row["i_completetime"]) * 1000)
                             str = dt.format("yyyy-MM-dd") + " - " + ds.format("yyyy-MM-dd")
                         }
@@ -302,7 +302,7 @@
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
                             '<a class="btn btn-sm btn-primary" onclick="editPro(\'' + pos.row + '\')">编辑</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-warning" onclick="clearPro(\''+ val +'\')">清洗</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-warning" onclick="clearPro(\''+ pos.row +'\')">清洗</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-info" onclick="del(\'' + val + '\')">判重</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-default" href="">完成</a>&nbsp;&nbsp;<br>' +
                             '<div style="margin-top: 5px">' +
@@ -338,24 +338,6 @@
         $("#markFieldSelect").selectpicker("refresh");
     });
 
-
-    function del(id) {
-        showConfirm("确定删除该用户组？", function () {
-            $.ajax({
-                url: "",
-                type: 'POST',
-                data: {"id": id},
-                success: function (r) {
-                    if (r.rep) {
-                        ttable.ajax.reload();
-                    } else {
-                        showTip("状态修改失败");
-                    }
-                }
-            })
-        })
-    }
-
     function createPro() {
        $("#modal-create-project").modal('show')
     }
@@ -435,10 +417,20 @@
 
     function editPro(index) {
         projectmap = ttable.fnGetData()[index]
+        console.log(projectmap.v_fields)
         $('#modal-edit-project').modal('show')
         $('#company-edit-name').val(projectmap["s_entname"])
         $('#rule-edit-name').val(projectmap["s_rulename"])
         $('#dpart-edit-name').val(projectmap["s_departname"])
+        if (projectmap.v_fields !== undefined) {
+            $('#markFieldSelect option').each(function(){
+                let v = $(this).val()
+                if (projectmap.v_fields[v] !== undefined) {
+                    $(this)[0].selected = true
+                }
+            })
+            $("#markFieldSelect").selectpicker("refresh");
+        }
     }
 
     function saveData() {
@@ -469,6 +461,7 @@
                     "s_rulename": tmp["s_rulename"], "v_fields": tmp["v_fields"], "s_name": tmp["s_name"]},
                 success: function (r) {
                     if (r.success) {
+                        showTip("保存成功", 1000)
                         cancelModel()
                         ttable.api().ajax.reload();
                     } else {
@@ -480,17 +473,23 @@
     }
 
     function clearPro(val) {
-        $.ajax({
-            url: "/front/project/qualityAssessment",
-            type: 'POST',
-            data: {"pid": val},
-            success: function (r) {
-                if (r.success) {
-                    window.location.href="/front/project/task/list?pid=" + val
-                } else {
-                    showTip(r.msg);
+        let tmp = ttable.fnGetData()[val]
+        if (tmp["v_fields"] === undefined) {
+            showTip("请设置标注字段")
+        }else {
+            $.ajax({
+                url: "/front/project/qualityAssessment",
+                type: 'POST',
+                data: {"pid": tmp._id},
+                success: function (r) {
+                    if (r.success) {
+                        window.location.href="/front/project/task/list?pid=" + val
+                    } else {
+                        showTip(r.msg);
+                    }
                 }
-            }
-        })
+            })
+        }
+
     }
 </script>