zhaoke 3 жил өмнө
parent
commit
0cac15058c

+ 18 - 16
src/components/rolelist/index.vue

@@ -8,18 +8,20 @@
       <template v-if="dataList.length">
         <div :class="active ? 'bgActive' : 'bgActivecheckbox'" class="paren_content">
           <template v-if="!type">
-            <el-row v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled" class="scCont scrollbar" :gutter="16">
-              <el-checkbox-group @change="checkChange" v-model="checkList">
-                <el-col :span="number" v-for="(item, index) in dataList" :key="index">
-                  <div @click="handleBg(item, index)" :class="active && msg === index ? 'bgColor' : ''" class="cide">
-                    <div class="cide_header">
-                      <p :title="item.name">{{ item.name }}</p>
-                      <el-checkbox :label="index"></el-checkbox>
+            <el-scrollbar class="scrollBar" style="height: 100%">
+              <el-row v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled" class="scCont scrollbar" :gutter="16">
+                <el-checkbox-group @change="checkChange" v-model="checkList">
+                  <el-col :span="number" v-for="(item, index) in dataList" :key="index">
+                    <div @click="handleBg(item, index)" :class="active && msg === index ? 'bgColor' : ''" class="cide">
+                      <div class="cide_header">
+                        <p :title="item.name">{{ item.name }}</p>
+                        <el-checkbox :label="index"></el-checkbox>
+                      </div>
                     </div>
-                  </div>
-                </el-col>
-              </el-checkbox-group>
-            </el-row>
+                  </el-col>
+                </el-checkbox-group>
+              </el-row>
+            </el-scrollbar>
           </template>
           <template v-if="total > 1">
             <p class="center" v-if="loading">加载中...</p>
@@ -357,10 +359,10 @@ export default {
   ::v-deep .el-checkbox__label {
     display: none;
   }
-  .scCont {
-    height: 65vh;
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
+  // .scCont {
+  //   height: 65vh;
+  //   overflow-x: hidden;
+  //   overflow-y: auto;
+  // }
 }
 </style>

+ 1 - 1
src/components/rolelist/rolelist.scss

@@ -24,7 +24,7 @@
     }
     ::v-deep .paren_content {
       width: 100%;
-      height: 100%;
+      height: calc(100% - 110px);
       .el-row {
         width: 100%;
       }

+ 1 - 1
src/components/rulesofcompetency/rulesofcompetency.scss

@@ -35,7 +35,7 @@
       align-items: center;
       // margin-bottom: 19px;
       > p {
-        width: 71px;
+        width: 88px;
         display: flex;
         align-items: center;
         justify-content: flex-end;