Browse Source

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

luolei 5 years ago
parent
commit
5841d601e9
3 changed files with 7 additions and 3 deletions
  1. 5 2
      src/css/qcScore.less
  2. 1 0
      src/js/qcScore.js
  3. 1 1
      src/js/utils.js

+ 5 - 2
src/css/qcScore.less

@@ -25,7 +25,7 @@
 }
 .sub-menu{
   position: relative;
-  width: @menuWt+20px;
+  width: @menuWt+15px;
   height: 100%;
   float: left;
   overflow-y: auto;
@@ -163,7 +163,7 @@
   }
 }
 .tab-container{
-  margin-left: @menuWt;
+  margin-left: @menuWt+15px;
   height: 100%;
   .content-box{
     width:78%;
@@ -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();