Merge pull request 'fix bug #412 #410 #409 #408 #407' (#413) from merge_label_system into V20210910

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/413

public/self/dataset_preview.js

@@ -573,7 +573,10 @@ function next(){
 
 function clickLast(){
 	if(fileindex == 0){
+    lastindex=true;
 		prePage();
+    lastindex=false;
+
 	}else{
 		last();
 	}
@@ -602,8 +605,11 @@ function last(){
 
 
 function showfilelist(){
-  var filename_title = $('a.section:first').text()
-  filename_title = filename_title.split('.')[0]
+  // var filename_title = $('a.section:first').text()
+  // filename_title = filename_title.substring(0,filename_title.lastIndexOf('.'))
+  var filename_index = labeltastresult[0].pic_image_field.indexOf("/",70);
+  filename_title = labeltastresult[0].pic_image_field.substring(filename_index + 1);
+  filename_title = filename_title.substring(0,filename_title.indexOf('/'))
   var htmlstr = '';
   // htmlstr += '<div class="ui list">';
   htmlstr += '<div class="item" style="padding:1.2em;border-bottom:0;display: table;width: 100%;">'
@@ -620,6 +626,7 @@ function showfilelist(){
         console.log(tmpIndex)
         if(tmpIndex != -1){
             fname = labeltastresult[i].pic_image_field.substring(tmpIndex + 1);
+            fname = fname.substring(fname.indexOf('/')+1);
         }
     }
     
@@ -666,7 +673,7 @@ function breadFiles(){
   // } 
     var fname_full_path=""
     var filename_title = $('a.section:first').text() 
-    filename_title = filename_title.split('.')[0]
+    filename_title = filename_title.substring(0,filename_title.lastIndexOf('.'))
     var tmp_index = tableData[fileindex].pic_image_field.indexOf("/",70);
     if(tmp_index != -1){
       fname_full_path = tableData[fileindex].pic_image_field.substring(tmp_index + 1);

public/self/labelTaskPage.js

@@ -504,7 +504,10 @@ function getTaskSataus(task_status,task_status_desc){
 		return "标注中：" + task_status_desc;
 	}else if(task_status == 1){
 		return "审核中：" + task_status_desc;
-	}
+  }
+  else if(task_status == -1){
+    return "关联的数据集已经被删除。"
+  }
 }
 
 function getVerify(task_status,id,task_type){
@@ -533,7 +536,7 @@ function display_list(){
             <th></th>\
             <th id=\"labeltask_head\"></th>\
             <th>标注任务名称</th>\
-            <th>关联的任务名称</th>\
+            <th>关联的数据集名称</th>\
             <th>数据类型</th>\
             <th>标注人员</th>\
 			<th>审核人员</th>\