From f4f8d98fc1ef8732826d48c48e8d0dd86629fd88 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 28 Sep 2021 09:06:43 +0800 Subject: [PATCH 01/52] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/self/labelTaskPage.js | 124 ++++++++++++++++++++----------- templates/repo/datasets/label/index.tmpl | 66 +++++++++------- 2 files changed, 119 insertions(+), 71 deletions(-) diff --git a/public/self/labelTaskPage.js b/public/self/labelTaskPage.js index 4ce48407a..3d72ae497 100644 --- a/public/self/labelTaskPage.js +++ b/public/self/labelTaskPage.js @@ -23,7 +23,7 @@ var pageSize = 10; var tableData; var tablePageData; -var preDictTaskData; +var modelListData; var dataSetTaskData; var userInfoData; @@ -121,14 +121,19 @@ function countLabel(){ } -function display_createdatasetlabel(sindex=-1){ +function display_createdatasetlabel(type){ var html=""; for (var i=0;i"+dataSetTaskData[i].task_name+ ""; - $("#datasetlabeltaskname").attr({value:dataSetTaskData[i].task_name + "-人工标注"}); + if(type == 1){ + $("#autolabeltaskname").attr({value:dataSetTaskData[i].task_name + "-自动标注"}); + }else{ + $("#datasetlabeltaskname").attr({value:dataSetTaskData[i].task_name + "-人工标注"}); + } + }else{ var row = ""; + }else{ + var row = ""; + } + html=html+row; + } + console.log(html); + + document.getElementById('model_list').innerHTML=html; + + } + function sele_export_Change(sele){ var isNeedPicture = $('#isNeedPicture option:selected').val(); @@ -242,7 +270,7 @@ function submit_datasettask(){ } var labelpropertytaskid = $('#labelpropertytask_dataset option:selected').val(); createsucced = true; - label_task_create(task_name, relate_task_id, 2,assign_user_id,labelpropertytaskid); + label_task_create(task_name, relate_task_id, 2,assign_user_id,labelpropertytaskid,-1); if(createsucced){ $(".ui.dataset.modal").modal("hide"); //$("#labelDataModal").modal('hide'); @@ -250,25 +278,30 @@ function submit_datasettask(){ page(0,pageSize); } -function submit_labeltask(){ - console.log($('#labeltaskname').val()); - var task_name = $('#labeltaskname').val(); +function submit_autolabeltask(){ + console.log($('#autolabeltaskname').val()); + var task_name = $('#autolabeltaskname').val(); if (isEmpty(task_name) || task_name.length > 32){ - alert("人工标注任务名称不能为空或者不能超过32个字符。"); + alert("自动标注任务名称不能为空或者不能超过32个字符。"); + return; + } + var model_id = $('#model_list option:selected').val(); + if(isEmpty(model_id)){ + alert("标注模型不能为空。"); return; } - var relate_task_id = $('#pre_predict_task_for_label option:selected').val(); + var relate_task_id = $('#dataset_list_auto option:selected').val(); if(isEmpty(relate_task_id)){ - alert("关联的自动标注任务不能为空。"); + alert("数据集对象不能为空。"); return; } var assign_user_id = $('#label_assign_user option:selected').val(); if(isEmpty(assign_user_id)){ assign_user_id = token; } - var labelpropertytaskid = $('#labelpropertytask_dataset option:selected').val(); + var labelpropertytaskid = $('#labelpropertytask_auto option:selected').val(); createsucced = true; - label_task_create(task_name, relate_task_id, 1,assign_user_id,labelpropertytaskid); + label_task_create(task_name, relate_task_id, 1,assign_user_id,labelpropertytaskid,model_id); if(createsucced){ $("#labelModal").modal('hide'); } @@ -276,10 +309,10 @@ function submit_labeltask(){ } -function label_task_create(task_name, relate_task_id, taskType,assign_user_id,labelpropertytaskid){ +function label_task_create(task_name, relate_task_id, taskType,assign_user_id,labelpropertytaskid,model_id){ - var task_flow_type = $('#task_flow_type option:selected').val(); + var task_flow_type = $('#task_flow_type option:selected').val(); var relate_other_label_task = []; if(task_flow_type == 2){ @@ -309,20 +342,21 @@ function label_task_create(task_name, relate_task_id, taskType,assign_user_id,la 'assign_user_id':assign_user_id, 'task_flow_type':task_flow_type, 'relate_task_id':relate_task_id,//task id - 'relate_other_label_task': relate_other_label_task_jsonstr, + 'relate_other_label_task': relate_other_label_task_jsonstr, "taskType": taskType, - "appid": repoId, - "createUserName":userName, - "labelPropertyTaskId":labelpropertytaskid + "appid": repoId, + "createUserName":userName, + "labelPropertyTaskId":labelpropertytaskid, + "modelId":model_id }), success:function(res){ console.log(res); if(res.code == 0){ - alert("人工标注任务创建成功!"); + alert("自动标注任务创建成功!"); createsucced = true; } else{ - alert("创建人工标注任务失败，" + res.message); + alert("创建自动标注任务失败，" + res.message); createsucced = false; } }, @@ -433,11 +467,11 @@ function delete_labeltask(){ return; } var Check = $("table[id='label_task_list'] input[type=checkbox]:checked");//在table中找input下类型为checkbox属性为选中状态的数据 -       Check.each(function () {//遍历 -             var row = $(this).parent("td").parent("tr");//获取选中行 -             var id = row.find("[id='labeltask_id']").html();//获取name='Sid'的值 -             delete_labeltask_byid(id); -         }); + ? ? ? Check.each(function () {//遍历 + ? ? ? ? ? ? var row = $(this).parent("td").parent("tr");//获取选中行 + ? ? ? ? ? ? var id = row.find("[id='labeltask_id']").html();//获取name='Sid'的值 + ? ? ? ? ? ? delete_labeltask_byid(id); + ? ? ? ? }); page(0,pageSize); } @@ -692,12 +726,12 @@ function setMultiTaskId(){ return; } var taskList = []; -   Check.each(function () {//遍历 -       var row = $(this).parent("td").parent("tr");//获取选中行 -       var id = row.find("[id='labeltask_id']").html();//获取name='Sid'的值 + ? Check.each(function () {//遍历 + ? ? ? var row = $(this).parent("td").parent("tr");//获取选中行 + ? ? ? var id = row.find("[id='labeltask_id']").html();//获取name='Sid'的值 taskList.push(id); -       //$('#hide_labeltaskid').val(id); -   }); + ? ? ? //$('#hide_labeltaskid').val(id); + ? }); setTaskId(JSON.stringify(taskList)); } diff --git a/templates/repo/datasets/label/index.tmpl b/templates/repo/datasets/label/index.tmpl index db65ad251..dd53826d3 100644 --- a/templates/repo/datasets/label/index.tmpl +++ b/templates/repo/datasets/label/index.tmpl @@ -17,9 +17,11 @@
{{template "repo/header" .}} + +
-

人工标注任务列表

+

标注任务列表

@@ -45,8 +47,8 @@
- - + + @@ -66,6 +68,11 @@
@@ -109,38 +116,45 @@
-

新建自动标注结果人工标注

+

新建自动标注任务

-
- - - -
-
- - -
-
- - -
-
- +
+ + +
+ +
+ + +
+ + +
+ + +
+ + + + - +
From 0dfff672314fdbcad8e2a66a302ac984d4908a48 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 28 Sep 2021 09:24:41 +0800 Subject: [PATCH 02/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/self/labelTaskPage.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/self/labelTaskPage.js b/public/self/labelTaskPage.js index 3d72ae497..53d887358 100644 --- a/public/self/labelTaskPage.js +++ b/public/self/labelTaskPage.js @@ -35,8 +35,8 @@ console.log("repoId=" + repoId); function setDataSetTask(){ - dataset_task_list(); - display_createdatasetlabel(0); + //dataset_task_list(); + //display_createdatasetlabel(0); //getUser(); //dislpayUser(); getLabelPropertyTask(); @@ -152,8 +152,8 @@ function display_createdatasetlabel(type){ function setPredictTask(){ - dataset_task_list(); - display_createdatasetlabel(1); + //dataset_task_list(); + //display_createdatasetlabel(1); get_model_list(); From 7de35e84de7e35640f315b0a6137e99741229a44 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 28 Sep 2021 09:42:34 +0800 Subject: [PATCH 03/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/self/labelTaskPage.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/public/self/labelTaskPage.js b/public/self/labelTaskPage.js index 53d887358..9d904737e 100644 --- a/public/self/labelTaskPage.js +++ b/public/self/labelTaskPage.js @@ -467,11 +467,11 @@ function delete_labeltask(){ return; } var Check = $("table[id='label_task_list'] input[type=checkbox]:checked");//在table中找input下类型为checkbox属性为选中状态的数据 - ? ? ? Check.each(function () {//遍历 - ? ? ? ? ? ? var row = $(this).parent("td").parent("tr");//获取选中行 - ? ? ? ? ? ? var id = row.find("[id='labeltask_id']").html();//获取name='Sid'的值 - ? ? ? ? ? ? delete_labeltask_byid(id); - ? ? ? ? }); + Check.each(function () {//遍历 + var row = $(this).parent("td").parent("tr");//获取选中行 + var id = row.find("[id='labeltask_id']").html();//获取name='Sid'的值 + delete_labeltask_byid(id); + }); page(0,pageSize); } @@ -726,12 +726,12 @@ function setMultiTaskId(){ return; } var taskList = []; - ? Check.each(function () {//遍历 - ? ? ? var row = $(this).parent("td").parent("tr");//获取选中行 - ? ? ? var id = row.find("[id='labeltask_id']").html();//获取name='Sid'的值 - taskList.push(id); - ? ? ? //$('#hide_labeltaskid').val(id); - ? }); + Check.each(function () {//遍历 + var row = $(this).parent("td").parent("tr");//获取选中行 + var id = row.find("[id='labeltask_id']").html();//获取name='Sid'的值 + taskList.push(id); + //$('#hide_labeltaskid').val(id); + }); setTaskId(JSON.stringify(taskList)); } From 051728ef8e05be20ce490ac7a0cda409d913f222 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 28 Sep 2021 10:07:11 +0800 Subject: [PATCH 04/52] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/datasets/label/index.tmpl | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/repo/datasets/label/index.tmpl b/templates/repo/datasets/label/index.tmpl index dd53826d3..f0a19360d 100644 --- a/templates/repo/datasets/label/index.tmpl +++ b/templates/repo/datasets/label/index.tmpl @@ -112,51 +112,51 @@ +
- +