Merge branch 'lkh' into 'dev'

Lkh

See merge request product-group-fe/sfy-safety-group/sfy-safety!109

src/views/exception/stay-tune.vue

@@ -4,7 +4,7 @@
       <img src="~@/assets/images/exception/stay-tune.png" alt="" />
     </div>
     <div class="text-center" style="margin-top: -100px; margin-bottom: 30px">
-      <h1>敬请期待!</h1>
+      <!-- <h1>敬请期待!</h1> -->
     </div>
     <div>
       <el-button type="primary" @click="goHome">回到首页</el-button>

src/views/system/dictionary/dictionary.vue

@@ -34,7 +34,7 @@
         <el-pagination
           v-model:current-page="currentPage"
           v-model:page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="PAGE_SIZE_CONFIG"
           :total="totalRow"
           background
           :layout="DEFAULT_LAYOUT"
@@ -56,7 +56,7 @@
 <script lang="ts" setup>
   import { ref, onMounted, computed } from 'vue';
   import { ElMessage, ElMessageBox } from 'element-plus';
-  import { DEFAULT_LAYOUT } from '@/constant/pagination';
+  import { DEFAULT_LAYOUT, PAGE_SIZE_CONFIG } from '@/constant/pagination';
   import { Plus } from '@element-plus/icons-vue';
   import AddDict from './components/AddDict.vue';
   import { createDictApi, SaveDictParams, updateDict, deleteDict } from '@/api/dict';

src/views/system/dictionary/useDataSource.ts

@@ -1,10 +1,11 @@
 import { queryDictPageApi } from '@/api/dict';
 import { onMounted, ref } from 'vue';
+import { DEFAULT_PAGE_SIZE } from '@/constant/pagination';
 
 export const useDataSource = () => {
   const dataSource = ref<Record<string, any>[]>([]);
   const currentPage = ref<number>(1);
-  const pageSize = ref<number>(10);
+  const pageSize = ref<number>(DEFAULT_PAGE_SIZE);
   const totalRow = ref<number>(0);
   const loading = ref<boolean>(false);
 

src/views/system/menu/menu.vue

@@ -238,7 +238,7 @@
 <style lang="scss" scoped>
   .main_page {
     width: 100%;
-    height: calc(100vh - 172px);
+    height: calc(100vh - 160px);
     position: relative;
     display: flex;
     flex-direction: row;
@@ -251,7 +251,9 @@
       border-right: 1px solid #eaeaea;
       .left_top {
         width: 100%;
-        height: 69px;
+        // height: 69px;
+        padding-top: 18px;
+        padding-bottom: 18px;
         position: relative;
         display: flex;
         flex-direction: row;

src/views/system/permission/PagePermission.vue

@@ -249,7 +249,7 @@
 <style lang="scss" scoped>
   .main_page {
     width: 100%;
-    height: calc(100vh - 172px);
+    height: calc(100vh - 160px);
     position: relative;
     display: flex;
     flex-direction: row;
@@ -262,7 +262,9 @@
       border-right: 1px solid #eaeaea;
       .left_top {
         width: 100%;
-        height: 69px;
+        // height: 69px;
+        padding-top: 18px;
+        padding-bottom: 18px;
         position: relative;
         display: flex;
         flex-direction: row;

src/views/system/person-group/PersonGroup.vue

@@ -39,7 +39,7 @@
           <el-pagination
             background
             :layout="DEFAULT_LAYOUT"
-            :page-sizes="[10, 30, 50]"
+            :page-sizes="PAGE_SIZE_CONFIG"
             :total="total"
             v-model:page-size="personGroupListRequestParams.pageSize"
             v-model:current-page="personGroupListRequestParams.pageNumber"
@@ -62,7 +62,7 @@
   import { onMounted, ref } from 'vue';
   import PersonGroupExhibitionDrawer from './components/PersonGroupExhibitionDrawer.vue';
   import { ElMessage } from 'element-plus';
-  import { DEFAULT_LAYOUT } from '@/constant/pagination';
+  import { DEFAULT_LAYOUT, PAGE_SIZE_CONFIG } from '@/constant/pagination';
   import { msgConfirm } from '@/utils/element-plus/messageBox';
 
   import { PERM_NOTICE } from '@/types/permission/constants';

src/views/system/person-group/hooks/usePersonGroupListQuery.ts

@@ -1,4 +1,5 @@
-import { DEFAULT_PAGE_SIZE } from '@/types/common/constants';
+// import { DEFAULT_PAGE_SIZE } from '@/types/common/constants';
+import { DEFAULT_PAGE_SIZE } from '@/constant/pagination';
 import { QueryPersonGroupPageParams, PersonGroupListItem } from '@/types/person-group/type';
 import { queryUserGroupPage } from '@/api/system/person-group';
 import { ref } from 'vue';

src/views/system/role/hooks/useRolesQuery.ts

@@ -1,5 +1,6 @@
 import { reactive, shallowRef, toRaw, ref } from 'vue';
-import { DEFAULT_PAGE_SIZE } from '@/types/common/constants';
+// import { DEFAULT_PAGE_SIZE } from '@/types/common/constants';
+import { DEFAULT_PAGE_SIZE } from '@/constant/pagination';
 import { Role, RolePageRequest } from '@/types/role/type';
 import { cloneDeep } from 'lodash-es';
 import { getRolesPage, getRoles } from '@/api/system/role';
@@ -12,8 +13,8 @@ const defaultRolePageRequest: RolePageRequest = {
   pageSize: DEFAULT_PAGE_SIZE,
   queryParam: {
     roleName: '',
-  }
-}
+  },
+};
 
 export default function useRolesQuery() {
   const requestParams = reactive<RolePageRequest>(cloneDeep(defaultRolePageRequest));
@@ -23,12 +24,11 @@ export default function useRolesQuery() {
 
   const setRequestParams = (params: Partial<RolePageRequest>) => {
     Object.assign(requestParams, params);
-  }
+  };
 
   const resetRequestParams = () => {
-    Object.assign(requestParams, defaultRolePageRequest)
-  }
-
+    Object.assign(requestParams, defaultRolePageRequest);
+  };
 
   const queryRolesPage = async () => {
     try {
@@ -70,4 +70,4 @@ export default function useRolesQuery() {
     queryRolesPage,
     queryRoles,
   };
-}
+}

src/views/system/role/role.vue

@@ -43,7 +43,7 @@
         <el-pagination
           background
           :layout="DEFAULT_LAYOUT"
-          :page-sizes="[10, 30, 50]"
+          :page-sizes="PAGE_SIZE_CONFIG"
           :total="total"
           v-model:page-size="requestParams.pageSize"
           v-model:current-page="requestParams.pageNumber"
@@ -59,7 +59,7 @@
 <script lang="ts" setup>
   import { ref, onMounted } from 'vue';
   import { Search } from '@element-plus/icons-vue';
-  import { DEFAULT_LAYOUT } from '@/constant/pagination';
+  import { DEFAULT_LAYOUT, PAGE_SIZE_CONFIG } from '@/constant/pagination';
   import RoleDrawer from './components/RoleDrawer.vue';
   import useRolesQuery from './hooks/useRolesQuery';
   import { Role } from '@/types/role/type';

src/views/system/user/user.vue

@@ -123,7 +123,7 @@
           <el-pagination
             background
             :layout="DEFAULT_LAYOUT"
-            :page-sizes="[10, 30, 50]"
+            :page-sizes="PAGE_SIZE_CONFIG"
             :total="total"
             v-model:page-size="params.pageSize"
             v-model:current-page="params.pageNumber"
@@ -157,7 +157,7 @@
   import { reactive, ref, onMounted } from 'vue';
   import { storeToRefs } from 'pinia';
   import { ElMessage } from 'element-plus';
-  import { DEFAULT_LAYOUT } from '@/constant/pagination';
+  import { DEFAULT_LAYOUT, PAGE_SIZE_CONFIG, DEFAULT_PAGE_SIZE } from '@/constant/pagination';
   import { Plus, DocumentAdd, Stamp } from '@element-plus/icons-vue';
   import { OptionsProps, SearchParamsProps } from './types';
   import { RoleTypeEnum } from '@/types/role/constants';
@@ -279,7 +279,7 @@
   // 基本参数
   const params = reactive<SearchParamsProps>({
     pageNumber: 1,
-    pageSize: 10,
+    pageSize: DEFAULT_PAGE_SIZE,
     queryParam: {},
   });