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

# Conflicts:
#	src/css/qcList.less
#	src/css/qcListDept.less
#	src/css/qcListPerson.less

src/css/index.less

@@ -99,6 +99,8 @@
     width: @menuWt;
     height: 100%;
     background: @themeColor;
+    border-right: 1px @themeBorderClr solid;
+    box-sizing: border-box;
     overflow-y: auto;
     padding-top: 15px;
     position: relative;
@@ -113,58 +115,44 @@
       z-index: 1;
     }
     &>ul>li{
-      padding-left: 28px;
+      text-indent: 42px;
       background: url("../images/module.png") 16px 12px no-repeat;
+      margin-bottom: 10px;
     }
     .YH-KZT,.YH-KZTKS{
       background: url("../images/home.png") 16px 10px no-repeat;
       &.active{
-        background: url("../images/home_a.png") 16px 10px no-repeat;
+        background: url("../images/home_a.png") @activeBg 16px 10px no-repeat;
       }
     }
     .YH-ZKK,.YH-KSZR{
       background: url("../images/data.png") 16px 10px no-repeat;
-      &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/data_a.png") 16px 10px no-repeat;
+      &.active{
+        background: url("../images/data_a.png") @activeBg 16px 10px no-repeat;
       }
     }
     .YH-JCSJWH{
       background: url("../images/item.png") 16px 13px no-repeat;
-      &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/item_a.png") 16px 13px no-repeat;
+      &.active{
+        background: url("../images/item_a.png") @activeBg 16px 13px no-repeat;
       }
     }
     .YH-BLZK{
       background: url("../images/ba.png") 16px 10px no-repeat;
-      &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/ba_a.png") 16px 10px no-repeat;
+      &.active{
+        background: url("../images/ba_a.png") @activeBg 16px 10px no-repeat;
       }
     }
     .YH-QXGL{
       background: url("../images/qxgl.png") 16px 11px no-repeat;
-      &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/qxgl_a.png") 16px 11px no-repeat;
+      &.active{
+        background: url("../images/qxgl_a.png") @activeBg 16px 11px no-repeat;
       }
     }
     .YH-YCSJJK{
       background: url("../images/un.png") 16px 11px no-repeat;
       &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/un_a.png") 16px 11px no-repeat;
+        background: url("../images/un_a.png") @activeBg 16px 11px no-repeat;
       }
     }
     .slide-btn{
@@ -192,6 +180,7 @@
       }
       p{
         color: #fff;
+        opacity: .9;
       }
       p:hover {
         color: @activeColor;
@@ -203,10 +192,12 @@
       ul{
         display: none;
         li.page{
-          text-indent: 24px;
+          text-indent: 52px;
           color: #fff;
+          opacity: .6;
           &.active{
             color: @activeColor;
+            opacity: 1;
           }
         }
       }
@@ -214,7 +205,8 @@
     .list-1-show{
       background-color: @activeBg;
       &:after{
-        background: url("../images/icon_up.png") no-repeat;
+        transform: rotate(180deg);
+        -webkit-transform: rotate(180deg);
       }
     }
     li{
@@ -228,12 +220,15 @@
       bottom: 0px;
       width: @menuWt;
       text-align: center;
-      font-size:12px;
-      color: #F0F0F0;
       height: 50px;
       line-height: 50px;
       background: @themeColor;
       border-top: 1px @themeBorderClr solid;
+      p{
+        font-size:12px;
+        opacity: .3;
+        color: #fff;
+      }
     }
   }
   .menu-mini{

src/css/qcList.less

@@ -81,6 +81,7 @@ table{
     cursor: pointer;
     img{
         margin: 0 10px 0 0;
+        vertical-align: middle;
     }
 }
 

src/css/qcListDept.less

@@ -81,6 +81,7 @@ table{
     cursor: pointer;
     img{
         margin: 0 10px 0 0;
+        vertical-align: middle;
     }
 }
 

src/css/qcListPerson.less

@@ -81,6 +81,7 @@ table{
     cursor: pointer;
     img{
         margin: 0 10px 0 0;
+        vertical-align: middle;
     }
 }
 

src/css/qcScore.less

@@ -96,11 +96,14 @@
     bottom: 0px;
     width: @menuWt;
     text-align: center;
-    font-size:12px;
-    color: #F0F0F0;
     background: @themeColor;
     padding: 10px 0 20px;
     border-top: 1px @themeBorderClr solid;
+    p{
+      font-size:12px;
+      color: #fff;
+      opacity: .3;
+    }
   }
 }
 .menu-mini{

src/css/reset.less

@@ -96,7 +96,7 @@ textarea {
 @menuWt:205px;   /*菜单宽度*/
 @themeColor:#203463;    //主题背景色
 @themeFontClr:#fff;   //主题字体色
-@themeBorderClr:#4A5D8E;    //主题边框色
+@themeBorderClr:rgba(74, 93, 142, 0.5);    //主题边框色
 @activeColor:#00A1FF;   /*菜单项选中颜色*/
 @activeBg:#142753;   /*菜单项选中背景*/
 @borderColor:#E2E5EF; /**边框颜色**/

src/html/index.html

@@ -45,7 +45,7 @@
                   <img src="../images/down.png" alt="">
               </a>-->
               <ul></ul>
-              <div class="copy-right">©杭州朗通信息技术有限公司</div>
+              <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
           </div>
           <div class="menu-mini fl">
               <!--<a href="javescript:void(0);" class="slide-show">

src/html/qcList.html

@@ -24,8 +24,8 @@
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
                     <span>科室：</span>
-                    <span class="selectDept unSelect"> 
-                        选择科室
+                    <span class="selectDept">
+                        全部
                     </span>
                    
                     <ul class="deptList filterDropList"></ul>
@@ -38,7 +38,7 @@
                     <span>医生工号：</span>
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
-                <span class="filterItem typeFilter clearfix">
+                <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
                     <span class="fl">出院日期：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>
@@ -46,8 +46,9 @@
                 </span>
                 <span class="filterItem">
                     <span>病历等级：</span>
-                    <span class="selectLevel unSelect">选择病历等级</span>
+                    <span class="selectLevel">全部</span>
                     <ul class="levelList filterDropList">
+                        <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
                         <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
                         <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
                         <li class="levelItem" data-name="乙" data-id=乙>乙</li>

src/html/qcListDept.html

@@ -24,8 +24,8 @@
                 </span>
                 <span class="filterItem typeFilter">
                     <span>科室：</span>
-                    <span class="selectDept unSelect"> 
-                        选择科室
+                    <span class="selectDept">
+                        全部
                     </span>
                    
                     <ul class="deptList filterDropList"></ul>
@@ -38,7 +38,7 @@
                     <span>医生工号：</span>
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
-                <span class="filterItem typeFilter clearfix">
+                <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
                     <span class="fl">出院日期：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>
@@ -46,8 +46,9 @@
                 </span>
                 <span class="filterItem">
                     <span>病历等级：</span>
-                    <span class="selectLevel unSelect">选择病历等级</span>
+                    <span class="selectLevel">全部</span>
                     <ul class="levelList filterDropList">
+                        <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
                         <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
                         <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
                         <li class="levelItem" data-name="乙" data-id=乙>乙</li>

src/html/qcListPerson.html

@@ -24,8 +24,8 @@
                 </span>
                 <span class="filterItem typeFilter">
                     <span>科室：</span>
-                    <span class="selectDept unSelect"> 
-                        选择科室
+                    <span class="selectDept">
+                        全部
                     </span>
                    
                     <ul class="deptList filterDropList"></ul>
@@ -38,7 +38,7 @@
                     <!-- <input class="doctorInp" type="text" placeholder="请输入医生姓名"> -->
                 </span>
                
-                <span class="filterItem typeFilter clearfix">
+                <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
                     <span class="fl">出院日期：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>
@@ -46,8 +46,9 @@
                 </span>
                 <span class="filterItem">
                     <span>病历等级：</span>
-                    <span class="selectLevel unSelect">选择病历等级</span>
+                    <span class="selectLevel">全部</span>
                     <ul class="levelList filterDropList">
+                        <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
                         <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
                         <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
                         <li class="levelItem" data-name="乙" data-id=乙>乙</li>

src/html/qcScore.html

@@ -637,7 +637,7 @@
                 <img src="../images/up.png" alt="">
             </a>-->
             <ul id="subMenu"></ul>
-            <div class="copy-right">©杭州朗通信息技术有限公司</div>
+            <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
         </div>
         <div class="menu-mini fl">
            <!-- <a href="javescript:void(0);" class="slide-show">

src/js/index.js

@@ -52,17 +52,18 @@ function initMenu(data,userInfo){
   }
   //菜单收起展开
   $(".list-1").on("click",function(){
-    // $(".list-1 .slide-up").removeClass('slide-up');
-    // $(this).toggleClass('slide-up');
+    if($(this).is(".list-1-show")){
+      $(this).removeClass("list-1-show")
+      $(this).find("ul").slideToggle();
+      return;
+    }
+
     $(".list-1-show ul").slideUp();
     $(".list-1").removeClass("list-1-show");
     const ulShow =  $(this).find("ul").css("display")
     if(ulShow == "none"){
-      //$(this).removeClass("list-1-show")
       $(this).addClass("list-1-show")
-    }/*else{
-      $(this).removeClass("list-1-show")
-    }*/
+    }
     $(this).find("ul").slideToggle();
   });
 //收起菜单

src/js/qcList.js

@@ -102,7 +102,7 @@ $(".filter").on("click", function(e){
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
-    level = levelTemp
+    level = levelTemp==="全部"?"":levelTemp
     deptId = deptIdTemp
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
@@ -309,7 +309,7 @@ function getDeptList(){
 
 
 function rendeDeptList(deptList){
-    let str = ``
+    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
@@ -361,7 +361,7 @@ $('.recordScoreBtn').on("click",function(e){
     } else{
         loading()
         for(let j = 0; j < scoreList.length; j++){
-            recordScore(scoreList[j],scoreList.length)
+            recordScore(scoreList[j],scoreList.length,true)
         }
     }
 })
@@ -394,9 +394,9 @@ function recordScore(behospitalCode,totalNum,hasToast){
                 const activePage = $(".activePage").attr('data-page') || 1
 
                 getTabData(activePage)
-            }
-            if(hasToast){
-                $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                if(hasToast){
+                  $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                }
             }
             
         }else{

src/js/qcListDept.js

@@ -100,7 +100,7 @@ $(".filter").on("click", function(e){
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
-    level = levelTemp
+    level = levelTemp==="全部"?"":levelTemp
     deptId = deptIdTemp
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
@@ -324,7 +324,7 @@ function getDeptList(){
 
 
 function rendeDeptList(deptList){
-    let str = ``
+    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }

src/js/qcListPerson.js

@@ -102,7 +102,7 @@ $(".filter").on("click", function(e){
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
-    level = levelTemp
+    level = levelTemp==="全部"?"":levelTemp
     deptId = deptIdTemp
     doctorName = doctorNameTemp
     getTabData(1)
@@ -324,7 +324,7 @@ function getDeptList(){
 
 
 function rendeDeptList(deptList){
-    let str = ``
+    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }