From fc54a4281e76cbf99e9f91aeb0be57f65b2c500e Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Sep 2021 16:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=87=E6=B3=A8=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/self/js/Director/detection.js | 27 ++++++++++++++++++---------
 public/self/labelTaskPage.js         |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js
index 5f40e73c3..8b63ef854 100644
--- a/public/self/js/Director/detection.js
+++ b/public/self/js/Director/detection.js
@@ -1640,22 +1640,31 @@ function showfilelist(){
     var htmlstr="";
     for (var i=0;i<labeltastresult.length;i++){
        var fname = labeltastresult[i].pic_image_field.substring(labeltastresult[i].pic_image_field.lastIndexOf('/') + 1);
+       if(labeltastresult[i].pic_image_field.length > 70){
+          var tmpIndex = labeltastresult[i].pic_image_field.indexOf("/",70);
+          console.log(tmpIndex)
+          if(tmpIndex != -1){
+              fname = labeltastresult[i].pic_image_field.substring(tmpIndex + 1);
+              fname = fname.substring(fname.indexOf('/')+1);
+          }
+        }
+
        var isfinished = labeltastresult[i].label_status;
-	   if(isVerified()){
-		   isfinished = labeltastresult[i].verify_status - 1;
-	   }
+       if(isVerified()){
+          isfinished = labeltastresult[i].verify_status - 1;
+       }
        var lablebg=" style=\"cursor:pointer\"";
        var classStr = "style=\"color:#FF6200;background: transparent;border: 0;\"";
        var finish="未完成";
        if (isfinished=="0"){finish="已完成";classStr = "style=\"color:#27c24c;background: transparent;border: 0;\"";}
        if (i==fileindex){lablebg=" style=\"color:#fff;cursor:pointer;\"";classStr = "style=\"color:#04B3E5;background: transparent;border: 0;\"";finish="标注中"}
-	   if(isVerified()){
-		   htmlstr = htmlstr+"<tr onclick=\"clickfilelist("+i+");\""+ lablebg+"> <td width=\"70\"" +"style=\"vertical-align:middle\""+ classStr + ">"+"<button"+classStr+" type=\"button\" onclick=\"changeVerifyStatus("+i+");\" style=\"border:none;background:none\">"+finish +"</button>"+"</td><td>"+ fname+ "</td></tr>"; 
-	   }else{
-	       htmlstr = htmlstr+"<tr onclick=\"clickfilelist("+i+");\""+lablebg+"><td>"+fname+"</td><td width=\"110\""+"style=\"vertical-align:middle\">"+"<button onclick=\"changeStatus("+i+");\" "+ classStr +" style=\"border:none;background:none\">"+finish +"</button>"+"</td></tr>";
-	   }
+	     if(isVerified()){
+		       htmlstr = htmlstr+"<tr onclick=\"clickfilelist("+i+");\""+ lablebg+"> <td width=\"70\"" +"style=\"vertical-align:middle\""+ classStr + ">"+"<button"+classStr+" type=\"button\" onclick=\"changeVerifyStatus("+i+");\" style=\"border:none;background:none\">"+finish +"</button>"+"</td><td>"+ fname+ "</td></tr>"; 
+	     }else{
+	         htmlstr = htmlstr+"<tr onclick=\"clickfilelist("+i+");\""+lablebg+"><td>"+fname+"</td><td width=\"110\""+"style=\"vertical-align:middle\">"+"<button onclick=\"changeStatus("+i+");\" "+ classStr +" style=\"border:none;background:none\">"+finish +"</button>"+"</td></tr>";
+	     }
      
-    };
+    }
     document.getElementById("filelist").innerHTML=htmlstr;
 }
 
diff --git a/public/self/labelTaskPage.js b/public/self/labelTaskPage.js
index 98813dd08..4ce48407a 100644
--- a/public/self/labelTaskPage.js
+++ b/public/self/labelTaskPage.js
@@ -318,7 +318,7 @@ function label_task_create(task_name, relate_task_id, taskType,assign_user_id,la
        success:function(res){
 		   console.log(res);
 		   if(res.code == 0){
-			  alert("人工校验任务创建成功!");
+			  alert("人工标注任务创建成功!");
 			  createsucced = true;
 		   }
 		   else{