Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/components/rolelist/index.vue

@@ -21,7 +21,7 @@
               </el-checkbox-group>
             </el-row>
           </template>
-          <template v-if="roleType && (roleType == 'account' || roleType == 'onlyRole')">
+          <template v-if="total > 1">
             <p class="center" v-if="loading">加载中...</p>
             <p class="center" v-if="noMore">没有更多数据了~</p>
           </template>
@@ -46,7 +46,7 @@
         </div>
       </template>
       <template v-else>
-        <el-empty description="暂无数据"></el-empty>
+        <el-empty :imageSize="imageSize" description="暂无数据"></el-empty>
       </template>
     </div>
   </div>
@@ -85,6 +85,10 @@ export default {
       type: Number,
       default: 0,
     },
+    imageSize: {
+      type: Number,
+      default: 200,
+    },
     roleType: {
       type: String,
       default: "",

src/views/authorityManagement/components/authorityRoleAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 16:31:31
- * @LastEditTime: 2022-02-08 11:06:26
+ * @LastEditTime: 2022-02-15 15:20:52
  * @LastEditors: Please set LastEditors
  * @Description: 新增/编辑角色
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRoleStatus.vue
@@ -35,8 +35,8 @@
         <Rulesofcompetency @getData="getData" title="权限规则" />
       </div>
       <div class="flex1 part">
-        <Rolelist @checkChange="checkChange" @checkClick="checkClick" :dataList="arrs" :active="true" class="hucRole" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
-        <Permissionlist v-loading="permission" :RoleList="RoleList" :check="true" class="hucPower" style="margin-top: 24px" title="互斥角色已有权限列表" />
+        <Rolelist @checkChange="checkChange" @checkClick="checkClick" :imageSize="80" :dataList="arrs" :active="true" class="hucRole" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
+        <Permissionlist v-loading="permission" :imageSize="80" :RoleList="RoleList" :check="true" class="hucPower" style="margin-top: 24px" title="互斥角色已有权限列表" />
       </div>
     </div>
   </div>

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 16:31:31
- * @LastEditTime: 2022-02-08 14:18:46
+ * @LastEditTime: 2022-02-15 15:19:50
  * @LastEditors: Please set LastEditors
  * @Description: 新增/编辑角色
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRoleStatus.vue
@@ -43,8 +43,8 @@
         <Rulesofcompetency v-loading="loading" element-loading-text="数据加载中" :authList="authList" :authTo="authTo" title="权限规则" />
       </div>
       <div class="flex1 part">
-        <Rolelist v-loading="loading" element-loading-text="数据加载中" @checkChange="checkChange" @checkClick="checkClick" :dataList="arrs" :checkBoxList="radioCheck" :active="true" class="hucRole" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
-        <Permissionlist v-loading="permission" element-loading-text="数据加载中" :check="true" :RoleList="RoleList" class="hucPower" style="margin-top: 24px" title="互斥角色已有权限列表" />
+        <Rolelist v-loading="loading" element-loading-text="数据加载中" @checkChange="checkChange" @checkClick="checkClick" :dataList="arrs" :checkBoxList="radioCheck" :active="true" class="hucRole" :imageSize="80" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
+        <Permissionlist v-loading="permission" element-loading-text="数据加载中" :check="true" :imageSize="80" :RoleList="RoleList" class="hucPower" style="margin-top: 24px" title="互斥角色已有权限列表" />
       </div>
     </div>
   </div>

src/views/authorityManagement/components/authorityRoleHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 14:37:54
- * @LastEditTime: 2022-02-09 10:52:46
+ * @LastEditTime: 2022-02-15 15:53:04
  * @LastEditors: Please set LastEditors
  * @Description: 角色管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRole.vue
@@ -58,8 +58,10 @@
             </div>
           </el-col>
         </el-row>
-        <p class="center" v-if="loading">加载中...</p>
-        <p class="center" v-if="noMore">没有更多数据了~</p>
+        <template v-if="total > 1">
+          <p class="center" v-if="loading">加载中...</p>
+          <p class="center" v-if="noMore">没有更多数据了~</p>
+        </template>
       </template>
       <template v-else>
         <el-empty description="暂无数据"></el-empty>

src/views/jobsManagement/list.vue

@@ -48,8 +48,10 @@
         </div>
       </div>
     </div>
-    <p class="center" v-if="loading">加载中...</p>
-    <p class="center" v-if="noMore">没有更多数据了~</p>
+    <template v-if="total > 1">
+      <p class="center" v-if="loading">加载中...</p>
+      <p class="center" v-if="noMore">没有更多数据了~</p>
+    </template>
     <Dialog :flag="dialogVisible">
       <div class="closeDialog">
         <div class="title">删除岗位</div>

src/views/staffManagement/compontents/staffHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 14:37:54
- * @LastEditTime: 2022-02-09 11:00:18
+ * @LastEditTime: 2022-02-15 15:55:00
  * @LastEditors: Please set LastEditors
  * @Description: 角色管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRole.vue
@@ -54,8 +54,10 @@
             </div>
           </el-col>
         </el-row>
-        <p class="center" v-if="loading">加载中...</p>
-        <p class="center" v-if="noMore">没有更多数据了~</p>
+        <template v-if="total > 1">
+          <p class="center" v-if="loading">加载中...</p>
+          <p class="center" v-if="noMore">没有更多数据了~</p>
+        </template>
       </template>
       <template v-else>
         <el-empty description="暂无数据"></el-empty>

src/views/systemManagement/LoginPolicy/index.vue

@@ -30,8 +30,10 @@
               </div>
             </el-card>
           </div>
-          <p class="center" v-if="loading">加载中...</p>
-          <p class="center" v-if="noMore">没有更多数据了~</p>
+          <template v-if="total > 1">
+            <p class="center" v-if="loading">加载中...</p>
+            <p class="center" v-if="noMore">没有更多数据了~</p>
+          </template>
         </div>
         <el-empty v-else description="没有内容" style="margin:0 auto"></el-empty>
       </div>