Преглед изворни кода

Merge branch 'version1.3.7' into test

zhangxc пре 5 година
родитељ
комит
399cc67a26
3 измењених фајлова са 9 додато и 5 уклоњено
  1. 2 2
      src/css/qcScore.less
  2. 6 2
      src/html/qcScore.html
  3. 1 1
      src/js/qcScore.js

+ 2 - 2
src/css/qcScore.less

@@ -863,7 +863,7 @@
 }
 .liExtend{
   position: absolute;
-  right: -3px;
+  left: -3px;
   width: 3px;
-  height: 40px;
+  height: 100%;
 }

+ 6 - 2
src/html/qcScore.html

@@ -22,12 +22,13 @@
     <script type="text/html" id="miniMenuTmpl">
         {{if sonMode.length}}
         <li class="list-1  menu-${id}">
-            <div class="liExtend"></div>
+         
             {{else}}
         <li class="page  menu-${id}" code="${name}">
             {{/if}}
             {{if sonMode.length}}
             <ul> 
+                <div class="liExtend"></div>
                 {{each sonMode}}
                     <li class="page" code="${name.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'')}">${name}</li>
                 {{/each}}
@@ -230,7 +231,7 @@
     <script type="text/html" id="appointBookTmpl">
         <div class="page-item" code="${title}">
             <h2 class="title" code="${title}">${title}</h2>
-            {{if !data || data&&data.length === 0 || JSON.stringify(data) == "{}"}}
+            {{if !data || data&&data.length === 0}}
             <div class="empty">
                 <img src="../images/empty.png" alt="空"/>
                 <p>暂无信息~</p>
@@ -246,6 +247,9 @@
                 </tr>
                 </thead>
                 <tbody>
+                    {{if JSON.stringify(data) == "{}"}}
+                   
+                    {{/if}}
                 {{each(i,val) data}}
                 <tr><td colspan="3" class="slide-up">${i}</td></tr>
                 {{each val}}

+ 1 - 1
src/js/qcScore.js

@@ -646,7 +646,7 @@ function formatFlawKeys(data){
         $.alerModal({"message":`<div class="checkTipsBox"><img class="checkImg" src=${checkOk}><p class="checkTxt">核查成功</p></div>`,type:"tip",time:'1000',isFather: false});
        
       }else{
-        $.alerModal({"message":res.data.msg ||"核查失败",type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
+        $.alerModal({"message":res.data.msg ||"核查失败",type:"tip",time:'1000',isFather: false});
       }
     });
   }