4212/4211

src/css/roleManager.less

@@ -10,10 +10,12 @@
         padding: 0 10px;
         height: 50px;
         line-height: 50px;
-        cursor: pointer;
         &:hover {
             background-color: #F0F5FF;
         }
+        span {
+            cursor: pointer;
+        }
     }
     // .editRole {
     //     float: right;
@@ -35,13 +37,22 @@
     top: 64px;
     right: 40px;
     border: 1px solid #ccc;
-    overflow: auto;
+    // overflow: auto;
     .toptools {
         height: 56px;
         line-height: 56px;
         border-bottom: 1px solid #E2E5EF;
-        padding: 0 20px;
         border-radius: 4px;
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+    }
+    .toptoolsStatic {
+        height: 56px;
+        line-height: 56px;
+        border-bottom: 1px solid #E2E5EF;
+        padding: 0 20px;
     }
     .saveRoleSet {
         width: 60px;
@@ -52,11 +63,13 @@
         color: #fff;
         float: right;
         margin-top: 10px;
+        margin-right: 10px;
         border-radius: 4px;
         cursor: pointer;
     }
     .mainSysWrap {
         padding: 0 15px;
+        overflow: auto;
     }
     .mainSys {
         border-bottom: 1px solid #E2E5EF;
@@ -68,7 +81,9 @@
         }
         .parentSet {
             padding-bottom: 15px;
-            cursor: pointer;
+            span {
+                cursor: pointer;
+            }
         }
         .sysWrap {
             margin-left: 30px;

src/html/console.html

@@ -123,7 +123,7 @@
         </div>
         
         <div class="pubEchartB paymoney">
-          <p class="title">各科室质控评分柱状图</p>
+          <p class="title">各科室质控平均分柱状图</p>
           <div id="barChartPay" class="barChartPay"></div>
         </div>
       </div>

src/html/roleManager.html

@@ -22,6 +22,7 @@
                     <div class="toptools">
                         <span class="saveRoleSet">保存</span>
                     </div>
+                    <div class="toptoolsStatic"></div>
                     <div class="mainSysWrap">
                         
                     </div>

src/js/roleManager.js

@@ -16,7 +16,9 @@ $(function(){
     $(window).resize(function(){
         $(".role .leftMenu").css("height",$(window).height()-128+'px')
         $(".role .rightMenu").css({"height":$(window).height()-88+'px',"width":$(".filterBox").width()-400+'px'})
+        $(".role .mainSysWrap").css({"height":$(window).height()-145+'px'})
     })
+    $(".role .mainSysWrap").css({"height":$(window).height()-145+'px'})
     $(".role .leftMenu").css("height",$(window).height()-128+'px')
     $(".role .rightMenu").css({"height":$(window).height()-88+'px',"width":$(".filterBox").width()-400+'px'})
     $(".saveRoleSet").click(function(){//保存角色设置
@@ -79,7 +81,9 @@ $(function(){
             let tmp = data[i]
             str += `
                 <div class="mainSys" data-index="${i}" data-menuId="${data[i].menuId}">
-                    <div data-menuId="${data[i].menuId}" data-haveMenu="${data[i].haveMenu}" data-parentId="${data[i].parentId}" class="parentSet selectToggle"><img src="${data[i].haveMenu == 1?require('../images/icon_check.png'):require('../images/icon_unchecked.png')}" alt=""> ${data[i].menuName}</div>
+                    <div class="parentSet">
+                    <span data-menuId="${data[i].menuId}" data-haveMenu="${data[i].haveMenu}" data-parentId="${data[i].parentId}" class="selectToggle"><img src="${data[i].haveMenu == 1?require('../images/icon_check.png'):require('../images/icon_unchecked.png')}" alt=""> ${data[i].menuName}</span>
+                    </div>
                     ${
                         (function(tmp){
                             if(tmp.sonMenuDTOList&&tmp.sonMenuDTOList.length>0){
@@ -131,11 +135,11 @@ $(function(){
                                 ++num
                             }
                         }
-                        // if(num == tmpPer.length){//内层全部都取消了，父级取消选中
-                        //     tmpDataLis[i].haveMenu = '0'
-                        // }else{
-                        //     tmpDataLis[i].haveMenu = '1'
-                        // }
+                        if(num == tmpPer.length){//内层全部都取消了，父级取消选中
+                            // tmpDataLis[i].haveMenu = '0'
+                        }else{
+                            tmpDataLis[i].haveMenu = '1'
+                        }
                         //二层否有选中，有则第一层选中，否则第一层不选中
                         if(tmpDataLis[i].haveMenu == 0){
                             ++tmpNum
@@ -264,7 +268,9 @@ $(function(){
         let tmpstr = ''
         for(let i = 0;i <data.length;i++){
             tmpstr += `
-                <li data-permissionId="${data[i].permissionId}" data-haveMenu="${data[i].havePermission}" data-parentId="${data[i].parentId}" class="selectToggle"><img src="${data[i].havePermission==1?require('../images/icon_check.png'):require('../images/icon_unchecked.png')}" alt=""> ${data[i].permissionName}</li>
+                <li>
+                <span data-permissionId="${data[i].permissionId}" data-haveMenu="${data[i].havePermission}" data-parentId="${data[i].parentId}" class="selectToggle"><img src="${data[i].havePermission==1?require('../images/icon_check.png'):require('../images/icon_unchecked.png')}" alt=""> ${data[i].permissionName}</span>
+                </li>
             `
         }
         return '<ul class="sonSet clearfix">'+tmpstr+'</ul>'
@@ -275,7 +281,9 @@ $(function(){
         for(let i = 0;i <data.length;i++){
             tmpstr += `
                 <div class="sysWrap">
-                    <div data-menuId="${data[i].menuId}" data-haveMenu="${data[i].haveMenu}" data-parentId="${data[i].parentId}" class="parentSet selectToggle"><img src="${data[i].haveMenu == 1?require('../images/icon_check.png'):require('../images/icon_unchecked.png')}" alt=""> ${data[i].menuName}</div>
+                    <div class="parentSet">
+                        <span data-menuId="${data[i].menuId}" data-haveMenu="${data[i].haveMenu}" data-parentId="${data[i].parentId}" class="selectToggle"><img src="${data[i].haveMenu == 1?require('../images/icon_check.png'):require('../images/icon_unchecked.png')}" alt=""> ${data[i].menuName}</span>
+                    </div>
                     <ul class="sonSet clearfix">
                         ${getTreeLis(data[i].sysPermissionDTOList,data[i].menuId)}
                     </ul>
@@ -288,7 +296,9 @@ $(function(){
         let tmpstr = ''
         for(let i = 0;i <data.length;i++){
             tmpstr += `
-                <li data-permissionId="${data[i].permissionId}" data-haveMenu="${data[i].havePermission}" data-parentId="${data[i].parentId}" class="selectToggle"><img src="${data[i].havePermission==1?require('../images/icon_check.png'):require('../images/icon_unchecked.png')}" alt=""> ${data[i].permissionName}</li>
+                <li>
+                    <span data-permissionId="${data[i].permissionId}" data-haveMenu="${data[i].havePermission}" data-parentId="${data[i].parentId}" class="selectToggle"><img src="${data[i].havePermission==1?require('../images/icon_check.png'):require('../images/icon_unchecked.png')}" alt=""> ${data[i].permissionName}</span>
+                </li>
             `
         }
         return tmpstr