Merge branch 'test' into version1.3.7.3

src/css/console.less

@@ -630,6 +630,7 @@ div.console {
     border-bottom: 10px solid @activeBg;
     background-color: @themeColor;
     box-sizing: border-box;
+    display: none;
     .emptyBoxHome {
       margin-top: 50px;
     }

src/css/qcScore.less

@@ -236,6 +236,7 @@
         position: relative;
         left: 56px;
         top: 4px; 
+        z-index:2;
       }
       ul{
         display: block;
@@ -568,7 +569,7 @@
   margin-top: 120px;
   text-align: center;
   img{
-    width: 86px;
+    width: 140px;
   }
   p{
     margin-top: 15px;
@@ -767,9 +768,9 @@
       line-height: 44px;
       border-bottom: 1px @tableBorderColor solid;
       font-size: 16px;
-      font-weight: normal;
       margin-bottom: 20px;
       text-indent: 20px;
+      font-weight: bold;
     }
   }
   .interval-color{
@@ -894,4 +895,35 @@
   left: -3px;
   width: 3px;
   height: 100%;
+}
+
+
+// 缺陷总览
+.titleSpecial {
+  overflow: hidden;
+  cursor: pointer;
+  text-align: center;
+  span {
+    float: left;
+    width: 77px;
+    height: 28px;
+    line-height: 28px;
+    border: 1px solid #777;
+    color: #777;
+    text-indent: 0;
+    margin-top: 7px;
+    font-weight: normal;
+  }
+  .titlePay {
+    border-radius:4px 0px 0px 4px;
+    margin-left: 20px;
+    background-color: #00A1FF;
+    color: #fff;
+    border-color: #00A1FF;
+    border-right: 0;
+  }
+  .titleNo {
+    border-radius:0px 4px 4px 0px;
+    border-left: 0;
+  }
 }

src/html/qcScore.html

@@ -230,10 +230,18 @@
     </script>-->
     <script type="text/html" id="appointBookTmpl">
         <div class="page-item" code="${title}">
-            <h2 class="title" code="${title}">${title}</h2>
+            <h2 class="title titleSpecial" code="${title}">
+                {{if title==='缺陷总览'}}
+                    <span class="titlePay" data-type="2">缺陷总览</span>
+                    <span class="titleNo" data-type="1">控费缺陷</span>
+                {{/if}}
+                {{if title!=='缺陷总览'}}
+                    ${title}
+                {{/if}}
+            </h2>
             {{if !data || data&&data.length === 0}}
             <div class="empty">
-                <img src="../images/empty.png" alt="空"/>
+                <img src="../images/empty1.png" alt="空"/>
                 <p>暂无信息～</p>
             </div>
             {{else}}

src/js/console.js

@@ -357,7 +357,9 @@ function getHomeData(name){
             if(data.code == 0){
                 let result1 = data.data||[]
                 let data1=result1['合格率'],data2=result1['完整率'],data3=result1['改善率'],tmp1=[],tmp2=[],tmp3=[]
+                console.log("data1",data1)
                 if(data1&&data1.totleNum == 0){
+                   
                     $(".binganshouye").css("display","block")
                     $(".bldjss").css("display","none")
                     picEmptyData(".binganshouyeEmpty")

src/js/qcScore.js

@@ -10,6 +10,7 @@ window.document.title="质控评分-"+getUrlArgObject("name");
 $(function(){
 //本页全局变量
   let global_flawData = {};    //缺陷数据
+  let global_flawDataPay = {};    //缺陷数据
   const global_id=getUrlArgObject("id");
   const global_age = getUrlArgObject("age");
   let global_check;
@@ -103,8 +104,7 @@ function getRecordDetail(){
   post(api.getRecordDetail,{'behospitalCode':global_id}).then(function(res){
     if(res.data.code==='0'){
       const data = res.data.data;
-   
-      const {beHospital,result,msg,checkStatus} = data;
+      const {beHospital,result,msg,checkStatus,drgs} = data;
       global_check = checkStatus
       const info=Object.assign(beHospital,result);
       initMenu(JSON.parse(result.menuData));
@@ -116,11 +116,22 @@ function getRecordDetail(){
       initList(msg);
       initScoreItem(msg);
       global_flawData=msg;
+      global_flawDataPay=drgs;
       setBoxHeight();
+      changePay()
     }
   });
 }
-
+function changePay(){
+  $(document).on('click',".titleSpecial span",function(){
+    let type = $(this).attr("data-type")
+    if(type == 1){
+      initList(global_flawDataPay,type);
+    }else{
+      initList(global_flawData,type);
+    }
+  })
+}
 //填充患者信息
 function initPatientInfo(data){
   let hasCheck = false
@@ -185,7 +196,8 @@ function formatInfoData(k,data){
 }
 
 //知情同意书、谈话告知书
-  function formatSpecPage(data,title){
+  function formatSpecPage(data,title,type){
+    $(".page-item[code='缺陷总览']").children().remove()
     $("#appointBookTmpl").tmpl({title,data}).appendTo(".flaw-table");
     $(".page-anchor").on("click",function(){
       const code=$(this).attr("code");
@@ -206,11 +218,36 @@ function formatInfoData(k,data){
         $('#contentInfo').scrollTop($(anch).offset().top-60);
       }
     });
+    if(type&&type == 1){
+      $(".titleNo").css({
+        'background-color': '#00A1FF',
+        'color': '#fff',
+        'border-color': '#00A1FF'
+      })
+      $(".titlePay").css({
+        'background-color': '#fff',
+        'border': '1px solid #777',
+        'border-right':0,
+        'color': '#777'
+      })
+    }else if(type&&type==2){
+      $(".titleNo").css({
+        'border-left':0,
+        'background-color': '#fff',
+        'border': '1px solid #777',
+        'color': '#777'
+      })
+      $(".titlePay").css({
+        'background-color': '#00A1FF',
+        'color': '#fff',
+        'border-color': '#00A1FF'
+      })
+    }
   }
 
-function initList(data){
+function initList(data,type){
   //$("#flawTotalList").tmpl({title:"缺陷总览",data:data}).appendTo(".flaw-table");
-  formatSpecPage(data,"缺陷总览");
+  formatSpecPage(data,"缺陷总览",type);
   $(".flaw-table").show();
   $(".flaw-table .page-item[code="+global_activeTab+"]").show();
   $(".slide-up").off("click").on("click",function(){

src/js/utils.js

@@ -3,7 +3,7 @@ const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
 require('./scrollBar.js');
-const baseUrl = "http://192.168.2.241:5858"
+const baseUrl = "http://192.168.2.236:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',