Merge branch 'version1.4.1'

src/css/qcScore.less

@@ -744,6 +744,7 @@
   height: 97%;
   background: #fff;
   margin: 0 10px 10px;
+  overflow-y: auto;
   /*overflow-y: auto;
   margin: 0 30px 0 20px;*/
   .slide-up{

src/html/index.html

@@ -58,20 +58,21 @@
               <div class="logo">
                   <img src="../images/lantone.png" alt="">
               </div>
-              <a href="javescript:void(0);" class="slide-hide">
+              <ul class="menuList"></ul>
+              <a href="javascript:void(0);" class="slide-hide">
                   <img src="../images/down.png" alt="">
               </a>
-              <ul class="menuList"></ul>
               <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
           </div>
           <div class="menu-mini fl">
               <div class="logo">
                   朗通
               </div>
-              <a href="javescript:void(0);" class="slide-show">
+              <ul></ul>
+              <a href="javascript:void(0);" class="slide-show">
                   <img src="../images/up.png" alt="">
               </a>
-              <ul></ul>
+          
           </div>
           <div class="main" id="mainBox">
               <div class="header clearfix">

src/html/qcScore.html

@@ -302,20 +302,21 @@
             <div class="logo">
                 <img src="../images/lantone.png" alt="" style="width: 150px;">
             </div>
-            <a href="javescript:void(0);" class="slide-show">
+            <ul id="subMenu" class="subMenu"></ul>
+            <a href="javascript:void(0);" class="slide-show">
                 <img src="../images/down.png" alt="">
             </a>
-            <ul id="subMenu" class="subMenu"></ul>
             <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
         </div>
         <div class="menu-mini fl">
             <div class="logo">
                 朗通
             </div>
-            <a href="javescript:void(0);" class="slide-hide">
+            <ul></ul>
+            <a href="javascript:void(0);" class="slide-hide">
                 <img src="../images/up.png" alt="">
             </a>
-            <ul></ul>
+           
         </div>
         <div class="tab-container clearfix">
             <div class="patient-info" id="patientInfo"></div>

src/js/itemManager.js

@@ -3,7 +3,7 @@ require("../css/itemManager.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie, initScroll} = require('./utils.js')
+const {post,getCookie,emptyBox,initScroll} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -54,7 +54,9 @@ function getTabData(activePage){
                 $('.pagination').html("")
             }
 
-        }else{}
+        }else{
+            $('.tbody').html(emptyBox())
+        }
     }).catch((e) =>{
     
     })
@@ -118,6 +120,10 @@ bindUsedSelect()
 getTabData(1)
 getmoduleTypeList()
 function renderTab(data,activePage){
+    if(data.length === 0){
+        $('.tbody').html(emptyBox())
+        return
+    }
     let str = ``;
     const cls = hasData("FUNC000007")?"editItem":"editItemDis";
     for(let i = 0; i < data.length; i++){