Merge branch 'V20210927' into del-dataset

public/self/js/Director/detection.js

@@ -712,7 +712,17 @@ function loadimg(){
   reset_var();
   var picturePath = labeltastresult[fileindex].pic_image_field;
   img.src = ip + "/getgiteaimage?filename=" + picturePath;
-  var html = picturePath.substring(picturePath.lastIndexOf("/") + 1) + "  "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")"
+  
+  var picIndex = picturePath.indexOf("/",70);
+          
+  if(picIndex != -1){
+      float_text_name = picturePath.substring(picIndex + 1);
+      float_text_name = float_text_name.substring(float_text_name.indexOf('/')+1);
+  }else{
+    float_text_name = picturePath.substring(picturePath.lastIndexOf("/") + 1)
+  }
+  
+  var html = float_text_name + "    "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")"
   document.getElementById("float_text").innerHTML = html;
 }
 function save(){
@@ -2843,8 +2853,8 @@ function isJSON(str) {
   img.onload = function(){
     loadFinished = false;
     // 初始设置画布大小，最大值宽和高
-    canvas.width = maxWidth;//document.getElementById("tool0").offsetWidth;
-    canvas.height = maxHeight;//document.getElementById("tool0").offsetWidth/1280*720;
+    canvas.width = img.width;// maxWidth document.getElementById("tool0").offsetWidth;
+    canvas.height =img.height;//maxHeight document.getElementById("tool0").offsetWidth/1280*720;
     //调整画布大小
     if ((img.width/img.height)<(canvas.width/canvas.height)){
       canvas.width=canvas.height * img.width / img.height;

templates/repo/cloudbrain/show.tmpl

@@ -24,22 +24,6 @@
                   <td class="four wide"> 状态 </td>
                   <td> {{.State}} </td>
                 </tr>
-                <tr>
-                  <td> 开始时间 </td>
-                  <td>{{.StartTime}}</td>
-                </tr>
-                <tr>
-                  <td> 结束时间 </td>
-                  <td>{{.FinishedTime}}</td>
-                </tr>
-                <tr>
-                  <td> ExitCode </td>
-                  <td>{{.ExitCode}}</td>
-                </tr>
-                <tr>
-                  <td> 退出信息 </td>
-                  <td>{{.ExitDiagnostics| nl2br}}</td>
-                </tr>
               </tbody>
             </table>
                 {{end}}
@@ -73,7 +57,7 @@
               </thead>
               <tbody>
                 <tr>
-                  <td class="four wide"> 状态 </td>
+                  <td class="four wide"> 平台 </td>
                   <td> {{.Platform}} </td>
                 </tr>
                 <tr>