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

src/css/console.less

@@ -464,7 +464,7 @@ body.console {
     width: 100px;
     height: 26px;
     line-height: 28px;
-    border: 1px solid #E2E5EF;
+    border: 1px solid #506597;
     padding-right: 20px;
     padding-left: 10px;
     position: relative;

src/css/qcScore.less

@@ -25,7 +25,7 @@
 }
 .sub-menu{
   position: relative;
-  width: @menuWt;
+  width: @menuWt+20px;
   height: 100%;
   float: left;
   overflow-y: auto;
@@ -44,6 +44,36 @@
   }
   &>ul>li{
     color: @themeFontClr;
+    &.menu-0{
+      background: url("../images/total.png") 20px 9px no-repeat;
+      &.active{
+        background: url("../images/total_a.png") 20px 9px no-repeat;
+      }
+    }
+    &.menu-6{
+       background: url("../images/index.png") 20px 11px no-repeat;
+      &.active{
+        background: url("../images/index_a.png") 20px 11px no-repeat;
+      }
+     }
+    &.menu-1{
+      background: url("../images/inhis.png") 19px 11px no-repeat;
+      &.active{
+        background: url("../images/inhis_a.png") 19px 11px no-repeat;
+      }
+    }
+    &.menu-37{
+      background: url("../images/prod.png") 20px 10px no-repeat;
+      &.active{
+        background: url("../images/prod_a.png") 20px 10px no-repeat;
+      }
+    }
+    &.menu-5{
+      background: url("../images/out.png") 20px 11px no-repeat;
+      &.active{
+        background: url("../images/out_a.png") 20px 11px no-repeat;
+      }
+    }
   }
   .active{
     color: @activeColor;
@@ -78,7 +108,7 @@
     ul{
       display: none;
       li.page{
-        text-indent: 30px;
+        text-indent: 55px;
         color: @themeFontClr;
         &.active{
           color: @activeColor;
@@ -88,7 +118,7 @@
   }
   li{
     line-height: @menuLiHt;
-    text-indent: 15px;
+    text-indent: 45px;
     cursor: pointer;
   }
   .copy-right{

src/html/qcScore.html

@@ -7,10 +7,10 @@
     <title>质控评分</title>
     <script type="text/html" id="subMenuTmpl">
         {{if sonMode.length}}
-        <li class="list-1">
+        <li class="list-1 menu-${id}">
             <p>${name}</p>
             {{else}}
-        <li class="page" code="${name}">${name}
+        <li class="page menu-${id}" code="${name}">${name}
             {{/if}}
             <ul>
                 {{each sonMode}}

src/js/console.js

@@ -7,7 +7,7 @@ require("../images/arrow_down.png")
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
-const {post,setCookie,delCookie,getCookie} = require('../js/utils.js');
+const {post,setCookie,delCookie,getCookie,focusMenuItem} = require('../js/utils.js');
 let payMoney = [],dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital");
 $(function(){
     if(!hasData('YH-KZT')){
@@ -63,26 +63,22 @@ $(function(){
 })
 function getDetails(){
     $(".part02 .bingli,.part02 .bingliLis,.part03 .circle .title,.pubEchartB.paymoney .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","deptScoreDetailControl.html")
-        $(".container",parent.document).removeClass("console-cont");
+      focusMenuItem("YH-ZKK-GKSQXZB_XQ");
     })
     $(".part03 .partTitlePub").click(function(){
-        $(parent.document).find("#contentIframe").attr("src",hospital=="台州市立"?"jiaji.html":"partDetailControl.html")
-        $(".container",parent.document).removeClass("console-cont");
+        focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
     })
     $(".paymoney.pubEchart .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","dayDetail.html")
-        $(".container",parent.document).removeClass("console-cont");
+        focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
     })
     $(".defect .partTitlePub").click(function(){//from 1 console / 2  deptConsole
-        $(parent.document).find("#contentIframe").attr("src","mukuaiControl.html?from=1&dateType="+dateType)
-        $(".container",parent.document).removeClass("console-cont");
+        focusMenuItem("YH-ZKK-GMKQXZB_XQ");
     })
     $(".circleB .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","tiaomuControl.html?from=1&dateType="+dateType)
-        $(".container",parent.document).removeClass("console-cont");
+      focusMenuItem("YH-ZKK-TMQXZB_XQ");
     })
 }
+
 //判断有无某一权限
 function hasData(data){
     let lis = JSON.parse(getCookie("codeLis"))

src/js/deptConsole.js

@@ -7,7 +7,7 @@ require("../images/arrow_down.png")
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
-const {post,setCookie,delCookie,getCookie} = require('../js/utils.js');
+const {post,setCookie,delCookie,getCookie,focusMenuItem} = require('../js/utils.js');
 let payMoney = [],dayLis = [],dateType = 2,curDept = '',datafst=[],datasec=[],datatrd=[],datafour=[],hospital=getCookie("hospital");
 $(function(){
     if(!hasData('YH-KZT')&&!hasData('YH-KZTKS')){
@@ -42,17 +42,19 @@ $(function(){
 })
 function tiaomu(){
     $(".defect .partTitlePub").click(function(){
+        focusMenuItem("YH-KSZR-GMKQXZB_XQ");
         $(parent.document).find("#contentIframe").attr("src","mukuai.html?from=2&deptName="+curDept+"&dateType="+dateType)
-    })
+    });
     $(".circleBSingle .title,.homePageNo .title").click(function(){
+        focusMenuItem("YH-KSZR-TMQXZB_XQ");
         $(parent.document).find("#contentIframe").attr("src","tiaomu.html?from=2&deptName="+curDept+"&dateType="+dateType)
-    })
+    });
     $(".homePage .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","partDetail.html")
-    })
+        focusMenuItem("YH-KSZR-BASYHGLZB_XQ")
+    });
     $(".part02 .bingli,.part02 .bingliLis").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","deptScoreDetail.html")
-    })
+        focusMenuItem("YH-KSZR-KSQXZB_XQ");
+    });
 }
 //判断有无某一权限
 function hasData(data){

src/js/index.js

@@ -89,6 +89,7 @@ function initMenu(data,userInfo){
   $(".page").on("click",function(){
     $(".menu .active").removeClass('active');
     $(this).addClass("active");
+    $(this).parents(".list-1-show").addClass("active");
     const code = $(this).attr("code");
     let url = './'+pageMap[code];
     if(code === 'YH-BLZK-ZKPFGR'){

src/js/qcScore.js

@@ -57,6 +57,7 @@ function initMenu(data){
 
     //选中样式
     $(".sub-menu .active").removeClass('active');
+    $(this).parents(".list-1").addClass("active");
     $(this).addClass("active");
     //显示对应内容
     const code=$(this).attr("code");

src/js/utils.js

@@ -185,7 +185,16 @@ function hasData(data){
   }
   return false;
 }
-
+//定位对应明细菜单
+function focusMenuItem(code){
+  const ele = $(parent.document).find(".menu .page[code="+code+"]");
+  const parEle = ele.parents(".list-1");
+  if(!parEle.is(".list-1-show")){
+    parEle.click();
+  }
+  //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
+  ele.click();
+}
 module.exports = {
   pageMap,
   post,
@@ -196,5 +205,6 @@ module.exports = {
   getCookie,
   delCookie,
   setBoxHeight,
-  hasData
+  hasData,
+  focusMenuItem
 };