Browse Source

Merge remote-tracking branch 'origin/qc_zn' into test

zhouna 5 years atrás
parent
commit
739177c656
3 changed files with 5 additions and 1 deletions
  1. 3 0
      src/css/qcScore.less
  2. 1 0
      src/js/qcScore.js
  3. 1 1
      src/js/utils.js

+ 3 - 0
src/css/qcScore.less

@@ -386,6 +386,9 @@
   /*display: none;*/
   margin-top: 120px;
   text-align: center;
+  img{
+    width: 86px;
+  }
   p{
     margin-top: 15px;
     font-size: 12px;

+ 1 - 0
src/js/qcScore.js

@@ -273,6 +273,7 @@ function editScore(info){
 function showModal(flag,code,i){
   $("#delModal .modal-body").html("");
   $("#delModal").show();
+  $(".info-item .cont,.flaw-item .title").removeClass("active");
   //事件解绑
   $("#delModal .confirm").off("click");
   $("#qcScore,#qcMsg").off("input");

+ 1 - 1
src/js/utils.js

@@ -169,7 +169,7 @@ $(".modal .close").click(function(){
 //计算容器高度
 function setBoxHeight(){
   const ht=window.innerHeight;
-  $(".content-box").height((ht-75)+'px');
+  $(".content-box,.flaw-table").height((ht-75)+'px');
   $(".content-ht").height((ht-126)+"px");
 }
 setBoxHeight();