合并bug,密码校验bug--

src/css/console.less

@@ -683,6 +683,7 @@ div.console {
   position: absolute;
   right: 10px;
   top: 6px;
+  z-index: 1;
   p {
     width: 100px;
     height: 26px;

src/js/api.js

@@ -152,6 +152,15 @@ const api = {
   medicalCheckTitleKs: '/consoleByDept/medicalCheckTitleKs',
   medicalCheckExportByDept: '/print/export/medicalCheckExportByDept',
 
+  getmedCheckPage: '/qc/medPacsInfo/getCheckPage', //检查信息
+  getExaminePage: '/qc/medLisInfo/getExaminePage', //检验信息
+  getExamineSonPage: '/qc/medLisInfo/getExamineSonPage', //检验信息detail
+
+  exportQcresultByPerson: '/qc/behospitalInfo/exportQcresultByPerson', //个人质控导出
+
+    beHosCountByDept:'/consoleByDept/beHosCountByDept',//入院记录（科室首页,运行）
+    casesEntryStatisticsByDept:'/consoleByDept/casesEntryStatisticsByDept',//24h（科室首页,运行）
+    homePageOrGoodLevelByDept:'/consoleByDept/homePageOrGoodLevelByDept',//（科室病案首页,终末）
     homePageLevelExportByDept:'/print/export/homePageLevelExportByDept',//（科室病案首页合格率导出,终末）
     entryGroupExportByDeptEntry:'/print/export/entryGroupExportByDeptEntry',//（科室病案首页合格率/缺陷列表导出,终末）
     qcResultShortExportByDeptPage:'/print/export/qcResultShortExportByDeptPage',//（科室病案首页合格率/缺陷列表导出/病历列表,终末）
@@ -159,12 +168,14 @@ const api = {
     entryStatisticsByDept:'/consoleByDept/entryStatisticsByDept',//（关键条目缺陷占比,终末）
     entryStatisticsExportByDept:'/print/export/entryStatisticsExportByDept',//（关键条目缺陷占比导出,终末）
     levelExportByDept:'/print/export/levelExportByDept',//（科室缺陷占比导出,终末）
+    entryGroupExportByDeptPage:'/print/export/entryGroupExportByDeptPage',//（科室缺陷占比/缺陷列表导出,终末）
     leaveHosMRPageByDept:'/consoleByDept/leaveHosMRPageByDept',//出院人数,终末）
     leaveHosMrPageExportByDept:'/print/export/leaveHosMrPageExportByDept',//出院人数导出,终末）
     homePageOrLevelExportByDept:'/print/export/homePageOrLevelExportByDept',//控制台(科室) / 病案首页合格率占比 / 病历列表导出,终末）
     
     getMedQualityCoList:'/qc/behospitalInfo/getMedQualityCoList',//病案指标列表
     medicalRecordIndicator:'/console/medicalRecordIndicator',//病案指标
+    getListDoctor:'/bas/doctor/getList',//（科室医生列表）
 
 }
 const ywCheckApi = {

src/js/console.js

@@ -31,16 +31,6 @@ $(function(){
         $("body").html('')
     }
 
-    /*const firstM = $(".menu .page",parent.document).eq(0);
-    $('.page',parent.document).removeClass("active")
-    firstM.addClass("active");
-    if(firstM.is(".YH-KZT")||firstM.is(".YH-KZTKS")){
-        $(".container",parent.document).addClass("console-cont");
-        $('.qiehuan',parent.document).css("display","inline-block")
-    }else{
-        $('.qiehuan',parent.document).css("display","none")
-    }*/
-
     $(".partTitle p span").html(hospital)
     resizeBox()
     initConsole()//质控列表
@@ -55,12 +45,12 @@ $(function(){
         $(".part02 .toggleSlide ul").css("display","block")
     })
     let sildeIS = true
-    if(!hasData('FUNC000045')&&!hasData('FUNC000046')){
+    /*if(!hasData('FUNC000045')&&!hasData('FUNC000046')){
         $(".part02 .toggleSlide").css("opacity","0.5")
         sildeIS = false
-    }
+    }*/
     $(".toggleSlide p").click(function(e){
-        if(!sildeIS)return
+        //if(!sildeIS)return
         e.stopPropagation()
         $(this).next().slideToggle()
     })
@@ -168,13 +158,6 @@ function getDetails(dateType){
         }
     })
     $(".paymoney.pubEchart .title").click(function(){
-        // if($(this).text().indexOf("花费")!==-1){
-        //     focusMenuItem("YH-ZKK-KSPJZYHF_XQ");
-        //     $(parent.document).find("#contentIframe").attr("src","./payDetail.html?from=1&dateType="+dateType)
-        // }else{
-        //     focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
-        //     $(parent.document).find("#contentIframe").attr("src","./dayDetail.html?from=1&dateType="+dateType)
-        // }
         focusMenuItem("YH-ZKK-GKSQXZB_XQ");
         $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
@@ -1259,109 +1242,6 @@ function barChartPay(dataX,dataY,dataY2){
     };
     myCharts.setOption(option);
 }
-// function barChartPay(dataX,dataY){
-//     if(dataX.length==0&&dataY.length==0){
-//         $("#barChartPay,.innerOuter").css("display","none")
-//         picEmptyData('.barChartPayEmptys')
-//         return
-//     }else{
-//         if(getCookie("hospital") == "台州市立"){
-//             $(".innerOuter").css("display","block")
-//         }else{
-//             $(".innerOuter").css("display","none")
-//         }
-//         $("#barChartPay").css("display","block")
-//         $(".barChartPayEmptys").css("display","none")
-//     }
-//     var myCharts = echarts.init(document.getElementById('barChartPay'));
-//     $(window).resize(function(){
-//         myCharts.resize()
-//     });
-//     option = {
-//         color: ['#37C4FC'],
-//         tooltip: {
-//             trigger: 'axis',
-//             position: 'right',
-//             axisPointer: {            // 坐标轴指示器，坐标轴触发有效
-//                 type: 'line'        // 默认为直线，可选为：'line' | 'shadow'
-//             }
-//         },
-//         grid: {
-//             left: '3%',
-//             right: '4%',
-//             bottom: '3%',
-//             containLabel: true
-//         },
-//         xAxis: [
-//             {
-//                 type: 'category',
-//                 data: dataX,
-//                 axisTick: {
-//                     alignWithLabel: true
-//                 },
-//                 axisLabel: {//x轴刻度
-//                     textStyle: {
-//                         color: '#E9EBEF'
-//                     },
-//                     rotate:45,
-//                     formatter: function (value) {
-//                         //x轴的文字改为竖版显示
-//                         if(value.length>7){
-//                             return value.slice(0,7)+'...'
-//                         }
-//                         return value;
-//                      }
-//                 },
-//                 axisLine: {//x轴
-//                     lineStyle:{
-//                         color:'#4A5D8E'
-//                     }
-//                 }
-//             }
-//         ],
-//         yAxis: [
-//             {
-//                 type: 'value',
-//                 axisLine: {//y轴
-//                     show: false
-//                 },
-//                 axisTick: {
-//                     show: false
-//                 },
-//                 axisLabel: {//y轴刻度
-//                     textStyle: {
-//                         color: '#E9EBEF'
-//                     }
-//                 },
-//                 splitLine:{//分割线
-//                     lineStyle:{
-//                         color:'#344876'
-//                     }
-//                 }
-//             }
-            
-//         ],
-//         title:[{
-//             text: dataX.length>0?'分数':'',
-//             top: 15,
-//             left: 10,
-//             textStyle: {
-//                 fontSize: 14,
-//                 color:'#E9EBEF',
-//                 fontWeight: 400
-//             }
-//         }],
-//         series: [
-//             {
-//                 name: '质控平均分',
-//                 type: 'bar',
-//                 barWidth: '23%',
-//                 data: dataY
-//             }
-//         ]
-//     };
-//     myCharts.setOption(option);
-// }
 //柱状图住院日期
 function barChartLevel(dataX,dataY){
     // console.log(dataX,dataY,7887878787)
@@ -1965,13 +1845,6 @@ function panDetailB(data){
     $(".explainPan").css({
         marginTop:-($(".explainPan").height()/2-20)+'px'
     })
-    // new CusScrollBar({
-    //     contentSelector: '.explainPanB_scroll_cont' , //滚动内容区
-    //     barSelector: '.explainPanB_scroll_bar', //滚动条
-    //     sliderSelector: '.explainPanB_scroll_slider', //滚动滑块
-    //     sliderMode:2   
-    // });
-    // initScroll("explainPanB","Y",2,"20px")
 }
 //时间获取
 function getTimeDetail(){
@@ -2123,19 +1996,4 @@ window.onload = function(){console.log(444)
     $('.iconCalen').on("click", function(e){
         $(this).parent().find("input").focus()
     })
-    // new CusScrollBar({
-    //     contentSelector: '.console_scroll_cont', //滚动内容区
-    //     barSelector: '.console_scroll_bar', //滚动条
-    //     sliderSelector: '.console_scroll_slider', //滚动滑块
-    //     sliderMode:2   
-    // });
-    // new CusScrollBar({
-    //     contentSelector: '.console_wrapper_scroll_cont', //滚动内容区
-    //     barSelector: '.console_wrapper_scroll_bar', //滚动条
-    //     sliderSelector: '.console_wrapper_scroll_slider', //滚动滑块
-    //     scrollDir:'X',
-    //     sliderMode:2    
-    // });
-    // initScroll("partWrap","Y",2)
-    // initScroll("console","X",2)
 };

src/js/index.js

@@ -155,6 +155,8 @@ function bindModalEvent(){
         let psdsOk=false;
         if(psdOk){
             $("#sureWord").attr("disabled",false);
+        }else{
+            return false;
         }
         psdsOk = verifyPsdPart();
         if(psdsOk&&psdOk&$("#sureWord").val().trim()){
@@ -209,9 +211,11 @@ function verifyPsd(text){console.log(text)
       $(".eight-str").removeClass("active");
   }
   if(text.length>12){
-    $(".newword b").text("密码最多12位");
-    $(".newword").show();
+    $(".newword.warning b").text("密码最多12位");
+    $(".newword.warning").show();
     return false;
+  }else{
+      $(".newword.warning").hide();
   }
   const regex = new RegExp('^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@~·$、，,\.!#%*?&])[A-Za-z\\d$@#$\.~、,，·!%*?&]{8,12}');
   if(regex.test(text)){
@@ -225,16 +229,15 @@ function verifyPsdPart(){   //验证各密码关系规则
   const newP = $("#newWord").val();
   const confirmP = $("#sureWord").val()
   if(oldP.trim()===newP.trim()){
-    $(".newword b").text("原密码和新密码不能相同");
-      $(".newword").show();
+    $(".newword.warning b").text("原密码和新密码不能相同");
+      $(".newword.warning").show();
     return false
   }
   if(confirmP.trim()&&newP.trim()!==confirmP.trim()){
-      $(".sureword b").text("两次密码输入不一致");
-      $(".sureword").show();
+      $(".sureword.warning b").text("两次密码输入不一致");
+      $(".sureword.warning").show();
       return false
   }
-  $(".newword.warning,.sureword.warning").hide();
   return true;
 }