diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 16f6a75..7321547 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -174,6 +174,13 @@ +
+
+ + 出院浏览 + +
+
diff --git a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp index 915d195..6111610 100644 --- a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp +++ b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp @@ -3,7 +3,7 @@ - 缺陷类别列表 + 字典列表 <%@include file="../../jspf/comm.jspf" %> <%@ include file="../../jspf/ztreeCommom.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 6f5c12b..c2ea39a 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -52,6 +52,13 @@ +
+
+ + 缺陷列表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp b/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp index c479efa..55e69eb 100644 --- a/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp @@ -43,6 +43,13 @@ +
+
+ + 审核流程明细 + +
+
diff --git a/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp b/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp index 3257b13..5b3b5b2 100644 --- a/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp +++ b/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp @@ -42,6 +42,13 @@ +
+
+ + 节假日设置 + +
+
diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 059a1e2..5953f53 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -144,6 +144,13 @@ +
+
+ + 在院浏览 + +
+
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index bc4145b..e20dee1 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -23,7 +23,11 @@ height: 59px!important; } .indexSelected{ - background-color: #42515F; + background-color: #1E2D3B; + } + .modleSelected { + font-weight: bold; + font-size: 16px; } .navbar-custom-menu{ padding-right:17px; @@ -35,14 +39,6 @@ #indexTreeMenu::-webkit-scrollbar{ display: none; } - .pageTab{ - font-weight: bold; - font-size: 14px; - padding-left: 15px; - } - .content{ - padding-top:0px; - } @@ -63,6 +59,8 @@ } return temp; } + //定义是否有默认选中菜单 + var faultModleSelected = false; $(function () { function ajaxJsonFun() { //拥有的功能 @@ -115,7 +113,13 @@ if (list[0].deptId == list[i].deptId) { if (list[i].methodParent != 0 && (list[i].menuUrl == "#" || list[i].menuUrl == "" || list[i].menuUrl == null)) { var mulLi = newLiFun(); - var mulA = newAFun(list[i].menuName, list[i].menuIcon); + var mulA = ''; + //是第一个默认选中 + if(i == 1){ + mulA = newAFun(list[i].menuName, list[i].menuIcon,true); + }else{ + mulA = newAFun(list[i].menuName, list[i].menuIcon,false); + } mulLi.append(mulA); var menuAUL = newUlFun(); //sysUL = liFun(list[i].menuName,list[i].menuIcon); @@ -139,7 +143,13 @@ count = list[j].methodSort; sysUL = "/emr_medical_record" + list[j].menuUrl + "?num=" + str + "&depts=" + depts; } - var menuALi = newAliFun(list[j].menuName, list[j].menuIcon, "/emr_medical_record" + list[j].menuUrl + "?num=" + str + "&depts=" + depts); + var menuALi = ''; + if(i == 1 && !faultModleSelected){ + menuALi = newAliFun(list[j].menuName, list[j].menuIcon, "/emr_medical_record" + list[j].menuUrl + "?num=" + str + "&depts=" + depts,true); + faultModleSelected = true; + }else{ + menuALi = newAliFun(list[j].menuName, list[j].menuIcon, "/emr_medical_record" + list[j].menuUrl + "?num=" + str + "&depts=" + depts,false); + } menuAUL.append(menuALi); mulLi.append(menuAUL); } @@ -318,7 +328,6 @@
- 归档列表/病案室终审
@@ -383,7 +392,7 @@ var headerHeight = $(".main-header").height() || 0; var footerHeight = ($(".main-footer").height() || 0) + 31; var windowHeight = $(window).height(); - $("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 36); + $("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 32); $("#indexTreeMenu").css("height",windowHeight - headerHeight); }) diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index ac79447..fa07267 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -175,6 +175,13 @@ +
+
+ + 病案室终审 + +
+
diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp index db3ab44..4944eaa 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp @@ -50,6 +50,13 @@ +
+
+ + 病案终审退回日志 + +
+
diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp index de3bba8..60005dd 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -57,6 +57,13 @@ var path = "${path}"; +
+
+ + 病案终审退回 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/finalStatistics.jsp b/src/main/webapp/WEB-INF/views/statistics/finalStatistics.jsp index 297895a..b043f85 100644 --- a/src/main/webapp/WEB-INF/views/statistics/finalStatistics.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/finalStatistics.jsp @@ -44,6 +44,13 @@ +
+
+ + 终审记录统计报表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp b/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp index 34b90b2..add6530 100644 --- a/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp @@ -40,6 +40,13 @@ +
+
+ + 终审记录明细报表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/firstStatistics.jsp b/src/main/webapp/WEB-INF/views/statistics/firstStatistics.jsp index 612979f..ba80ab9 100644 --- a/src/main/webapp/WEB-INF/views/statistics/firstStatistics.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/firstStatistics.jsp @@ -31,6 +31,13 @@ +
+
+ + 病案室审核记录统计表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/printCount.jsp b/src/main/webapp/WEB-INF/views/statistics/printCount.jsp index e7eed85..1e34915 100644 --- a/src/main/webapp/WEB-INF/views/statistics/printCount.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/printCount.jsp @@ -3,7 +3,7 @@ - 打印记录报表 + 复印记录报表 @@ -31,6 +31,13 @@ +
+
+ + 复印记录报表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp b/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp index 9cf101b..ddefe0f 100644 --- a/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp @@ -3,7 +3,7 @@ - 打印记录明细 + 复印记录明细 @@ -31,6 +31,13 @@ +
+
+ + 复印记录明细 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp b/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp index cfdcf9b..d6e6564 100644 --- a/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp @@ -48,6 +48,13 @@ +
+
+ + 病案统计报表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp b/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp index c79ac89..ba2a1ff 100644 --- a/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp @@ -3,7 +3,7 @@ - 扫描记录报表 + 扫描上传记录报表 @@ -31,6 +31,13 @@ +
+
+ + 扫描上传记录报表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp b/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp index 1ca9368..64044b7 100644 --- a/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp @@ -3,7 +3,7 @@ - 扫描记录明细 + 扫描上传明细 @@ -31,6 +31,13 @@ +
+
+ + 扫描上传明细 + +
+
diff --git a/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp b/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp index 0ebc3e6..bdfde47 100644 --- a/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp @@ -40,6 +40,13 @@ +
+
+ + 病案室审核记录明细报表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index d316c51..a9ca641 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -164,6 +164,13 @@ +
+
+ + 未终审病历列表 + +
+
diff --git a/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp index 5f76e24..b330266 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp @@ -48,6 +48,13 @@ +
+
+ + 医师归档统计 + +
+
diff --git a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp index b94be8f..866ee17 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp @@ -53,6 +53,13 @@ +
+
+ + 统计列表 + +
+
    diff --git a/src/main/webapp/static/css/comm.css b/src/main/webapp/static/css/comm.css index bac004e..3982731 100644 --- a/src/main/webapp/static/css/comm.css +++ b/src/main/webapp/static/css/comm.css @@ -8,6 +8,27 @@ body { margin-left:15px; margin-right:15px; } +/* +*页头div +*/ +.headDiv{ + height:30px; + background-color: #1D9ED7; +} +/* +*页头标题div +*/ +.headSpanDiv{ + padding:5px 15px; +} +/* +*页头标题 +*/ +.headspan{ + color: #fff; + font-size: 1.2em; + font-weight: bold; +} .table th, .table td { /*text-align: center;*/ height: 38px; diff --git a/src/main/webapp/static/js/menu.js b/src/main/webapp/static/js/menu.js index fbba44d..49d84db 100644 --- a/src/main/webapp/static/js/menu.js +++ b/src/main/webapp/static/js/menu.js @@ -1,116 +1,10 @@ function indexSelected(_this){ $("ul.treeview-menu").find("a").removeClass("indexSelected"); + $("#indexTreeMenu .treeview").find("a").removeClass("modleSelected"); $(_this).addClass("indexSelected"); + $(_this).parent().parent().siblings().addClass('modleSelected'); } /*========================menu========================*/ -function menuRoleFun(menuArr) { - var muluArr=[]; - var mulu=null; - var menuLiArr=[]; - /*菜单*/ - if(menuArr!=null){ - /*系统目录menuArr.length*/ - for (var i = 0; i < menuArr.length; i++) { - if ( menuArr[i].menuUrl == null || menuArr[i].menuUrl == '') { - mulu = liFun(menuArr[i].menuName, menuArr[i].menuIcon); - /*链接跳转*/ - for (var j = 0; j < menuArr.length; j++) { - if ((menuArr[j].menuUrl != null || menuArr[j].menuUrl != '')&&menuArr[i].menuId==menuArr[j].parentId) { - menuLiArr.push(menuArr[j]); - } - } - if (menuLiArr != null) { - if (menuLiArr.length > 0) { - var liMenu = ulSysMenuFun(menuLiArr); - menuLiArr=[]; - mulu.append(liMenu); - } - } - muluArr.push(mulu); - } - } - } - return muluArr; -} - -function listPowerFun(menuArr){ - var hosp = newLiFun(); - var hospArr = []; - if (menuArr != null && menuArr.length > 0) { - /*医院*/ - for (var i = 0; i < menuArr.length; i++) { - if(hospArr.indexOf(menuArr[i].hospitalName) == -1 && menuArr[i].hospitalName!=null) { - hospArr.push(menuArr[i].hospitalName); - var hospA = newAFun(menuArr[i].hospitalName, menuArr[i].menuIcon); - hosp.append(hospA); - //console.log(menuArr[i]); - /*权限系统*/ - var sysUL = newUlFun(); - var sysArr = []; - for (var j = 0; j < menuArr.length; j++) { - if (sysArr.indexOf(menuArr[j].sysFlag) == -1 && menuArr[j].sysFlag== "power") { - sysArr.push(menuArr[j].sysFlag); - //console.log(menuArr[j]); - var sysA = newAFun(menuArr[j].sysName, menuArr[j].menuIcon); - var sysLi = newLiFun(); - sysLi.append(sysA); - /*目录*/ - var muluArr = []; - var muluUL = newUlFun(); - for (var y = 0; y < menuArr.length; y++) { - if (muluArr.indexOf(menuArr[y].menuId) == -1 && menuArr[y].menuUrl == null && menuArr[y].parentId==0 ) { - muluArr.push(menuArr[y].menuId); - var muluA = newAFun(menuArr[y].menuName, menuArr[y].menuIcon); - var muluLi = newLiFun(); - muluLi.append(muluA); - //console.log(menuArr[y]); - /*菜单目录*/ - var mulArr = []; - var mulUL = newUlFun(); - for (var x = 0; x < menuArr.length; x++) { - if (mulArr.indexOf(menuArr[x].menuId) == -1 && menuArr[x].menuUrl == null && menuArr[x].parentId != 0 && menuArr[x].menuId!=null) { - muluArr.push(menuArr[x].menuId); - //console.log(menuArr[x]); - var mulA = newAFun(menuArr[x].menuName, menuArr[x].menuIcon); - var mulLi = newLiFun(); - mulLi.append(mulA); - - /*菜单*/ - var menuAr = []; - var menuAUL = newUlFun(); - for (var z = 0; z < menuArr.length; z++) { - if (menuAr.indexOf(menuArr[z].menuId) == -1 && menuArr[z].menuUrl!=null && menuArr[z].menuUrl != '') { - menuAr.push(menuArr[z].menuId); - - var menuAA = newAFun(menuArr[z].menuName, menuArr[z].menuIcon); - var menuALi = newAliFun(menuArr[z].menuName, menuArr[z].menuIcon, menuArr[z].menuUrl); - menuAUL.append(menuALi); - } - } - mulLi.append(menuAUL); - - mulUL.append(mulLi); - } - } - muluLi.append(mulUL); - muluUL.append(muluLi); - } - - } - sysLi.append(muluUL); - sysUL.append(sysLi); - sysUL.append(sysLi) - } - - } - hosp.append(sysUL); - - } - } - } - return hosp; -} - function newUlFun(){ var newUl = $("
      "); return newUl; @@ -119,16 +13,13 @@ function newLiFun(){ var newLi=$("
    • "); return newLi; } -function newAFun(aName, iconCss){ - /* - - Multilevel - - - - - */ - var newA = $(""); +function newAFun(aName, iconCss,defaultModleSelected){ + var newA = ''; + if(defaultModleSelected){ + newA = $(""); + }else{ + newA = $(""); + } var subIcon = $(""); subIcon.addClass(iconCss); var subSpan = $(""); @@ -138,11 +29,17 @@ function newAFun(aName, iconCss){ return newA; } -function newAliFun(aName,iconCss,menuUrl){ +function newAliFun(aName,iconCss,menuUrl,defaultMenuSelected){ /*
    • Level Three
      • */ var newli = $("
    • "); var newicon=$(""); - var newA=$(""); + var newA = ''; + if(defaultMenuSelected){ + newA=$(""); + }else{ + newA=$(""); + } + newicon.addClass(iconCss); newA.append(newicon); newA.append(aName); @@ -150,132 +47,3 @@ function newAliFun(aName,iconCss,menuUrl){ return newli; } -function menuFun(menuArr){ - console.log(menuArr); - var menuUl=$("
        "); - var arr=[]; - var hospital=null; - if(menuArr.length>0){ - for(var i=0;i< menuArr.length;i++){ - if(menuArr[i].menuIcon==null){ - menuArr[i].menuIcon="fa fa-circle-o"; - } - if(menuArr[i].hospitalName!=null){ - /* - li-->a-->ul-->li-->a--ul-->li-->a-->ul-->li - */ - /*医院li*/ - if (arr.indexOf(menuArr[i].hospitalName) == -1) { - arr.push(menuArr[i].hospitalName); - hospital = lihospFun(menuArr[i].hospitalName, menuArr[i].menuIcon); - hospital.addClass("tree"); - - /*科室*/ - var dept = null; - var deptArr = []; - if (deptArr.indexOf(menuArr[i].deptId) == -1) { - deptArr.push(menuArr[i].deptId); - if (menuArr[i].deptId != null) { - dept = ulFun(menuArr[i].deptName, menuArr[i].menuIcon); - /*系统*/ - var sysUl = null; - var sysArr = []; - var menuLiFun = []; - for (var j = 0; j < menuArr.length; j++) { - if (menuArr[i].dictId == menuArr[j].dictId) { - /*菜单*/ - var menArr = []; - for (var k = 0; k < menuArr.length; k++) { - if (menuArr[k].menuId == menuArr[j].menuId) { - if (menArr.indexOf(menuArr[k].menuId) == -1 && menuArr[k].menuName!="菜单列表") { - menArr.push(menuArr[k].menuId); - menuLiFun.push(menuArr[k]); - } - } - } - /*系统-菜单*/ - if(menuLiFun.length>0) { - if (sysArr.indexOf(menuArr[j].sysFlag) == -1) { - sysArr.push(menuArr[j].sysFlag); - sysUl = ulFun(menuArr[j].sysName, menuArr[j].menuIcon); - /*菜单sysMenuLiFun*/ - var xLiFun = ulSysMenuFun(menuLiFun); - sysUl.find('li').append(xLiFun); - //sysUl.append(menuLiFun); - dept.find('li').append(sysUl); - } - } - } - } - sysArr = null; - hospital.append(dept); - - } - } - menuUl.append(hospital); - } - } - } - deptArr=null; - } - return menuUl; -} - -function lihospFun(liName, iconCss) { - var subLi = $("
      • "); - subLi.append(aFun(liName, iconCss)); - return subLi; -} - -function roleSysFun(menuArr) { - var subLi = $("
      • "); - subUl.append(liSysMenuFun(menuArr)); - return subLi; -} - -function ulFun(liName, iconCss) { - var subUl = $("
          "); - subUl.append(liFun(liName, iconCss)); - return subUl; -} - -function liFun(liName,iconCss) { - var subLi = $("
        • "); - subLi.append(aFun(liName, iconCss)); - return subLi; -} - -function aFun(aName, iconCss) { - /** 基本功能 - - - - */ - var subA = $(""); - var subIcon = $(""); - subIcon.addClass(iconCss); - var subSpan = $(""); - subA.append(subIcon); - subA.append(aName); - subA.append(subSpan); - return subA; -} - -function ulSysMenuFun(menuArr) { - var subUl = $("
            "); - for (var i = 0; i < menuArr.length; i++) { - var subLi = $("
          • "); - var subA = $(""); - var subIcon = $(""); - if (menuArr[i].menuIcon != undefined || menuArr[i].menuIcon != null || menuArr[i].menuIcon != '') { - subIcon.addClass(menuArr[i].menuIcon); - subA.append(subIcon); - } - subA.append(menuArr[i].menuName); - subLi.append(subA); - subUl.append(subLi); - } - return subUl; -} - -