Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

src/js/qcScore.js

@@ -409,12 +409,14 @@ function showModal(flag,code,i){
       addScore(obj);
     });
   }else{
-    $("#delModal .title").text("删除评分");
-    $("#delModal .cancel").show();
+    $("#delModal .title").text("删除提示");
     $("#delModal .modal-body").html('<p>确定要删除该评分记录吗？</p>');
-    $("#delModal .confirm").text("确定").click(function(){
+    $("#delModal .confirm").text("删除").click(function(){
       delScore(code,info);
     });
+    $("#delModal .cancel").show().text("取消").click(function(){
+      $("#delModal .divModal",parent.document).remove()
+    });
   }
 }
 //缺陷列表key值去掉特殊符号