فهرست منبع

重构预防检查

chauncey 10 ماه پیش
والد
کامیت
5256fbaef4
24فایلهای تغییر یافته به همراه135 افزوده شده و 153 حذف شده
  1. 4 8
      src/components/BasicTable.vue
  2. 1 1
      src/constant/pagination.ts
  3. 29 0
      src/store/usePaginationStore.ts
  4. 7 10
      src/views/disaster/disaster-precaution/PageTaskExecution.vue
  5. 12 34
      src/views/disaster/disaster-precaution/PageTaskExecutionDetail.vue
  6. 8 13
      src/views/disaster/disaster-precaution/PageTaskItem.vue
  7. 9 12
      src/views/disaster/disaster-precaution/PageTaskManagement.vue
  8. 5 5
      src/views/disaster/disaster-precaution/PageTaskTemplate.vue
  9. 9 19
      src/views/disaster/disaster-precaution/PageTaskTemplateDetail.vue
  10. 1 2
      src/views/disaster/disaster-precaution/src/components/CreateTaskItem.vue
  11. 1 2
      src/views/disaster/disaster-precaution/src/components/EditTaskItem.vue
  12. 0 4
      src/views/disaster/disaster-precaution/src/components/TemplateTableMerge.vue
  13. 5 22
      src/views/disaster/disaster-precaution/src/components/ViewTaskItem.vue
  14. 1 1
      src/views/disaster/disaster-precaution/src/config/table.ts
  15. 8 0
      src/views/disaster/disaster-precaution/src/style/common.scss
  16. 5 0
      src/views/disaster/disaster-precaution/src/style/task-item.scss
  17. 19 0
      src/views/disaster/disaster-precaution/src/style/task-template.scss
  18. 1 5
      src/views/disaster/disaster-warning/PageDefenseNotice.vue
  19. 1 5
      src/views/disaster/disaster-warning/PageWarningInfo.vue
  20. 2 2
      src/views/system/dictionary/dictionary.vue
  21. 2 2
      src/views/system/person-group/PersonGroup.vue
  22. 2 2
      src/views/system/role/role.vue
  23. 2 2
      src/views/system/user/user.vue
  24. 1 2
      vite.config.ts

+ 4 - 8
src/components/BasicTable.vue

@@ -26,11 +26,11 @@
       </el-table-column>
     </el-table>
     <el-pagination
-      v-if="props.tableConfig.pagination && props.tableData.length > 0"
+      v-if="props.tableConfig.pagination && props.tableConfig.pagination.total > 0"
       :current-page="props.tableConfig.pagination.pageNumber"
       :page-size="props.tableConfig.pagination.pageSize"
       :page-sizes="props.pageSizeConfig || PAGE_SIZE_CONFIG"
-      layout="prev, pager, next, jumper, sizes, total"
+      :layout="DEFAULT_PAGINATION_LAYOUT"
       background
       :total="props.tableConfig.pagination.total"
       @size-change="handleSizeChange"
@@ -43,7 +43,7 @@
   import { ref } from 'vue';
   import type { ElTable } from 'element-plus';
   import type { BasicTableProps } from '@/types/basic-table';
-  import { PAGE_SIZE_CONFIG } from '@/constant/pagination';
+  import { PAGE_SIZE_CONFIG, DEFAULT_PAGINATION_LAYOUT } from '@/constant/pagination';
   import EmptyImg from 'assets/images/empty@1X.png';
 
   const selectedIds = ref<number[]>([]);
@@ -104,10 +104,6 @@
     background-color: rgba(0, 0, 0, 0.05);
   }
 
-  :deep(.el-table--fit .el-table__inner-wrapper:before) {
-    height: 0 !important;
-  }
-
   :deep(.el-table__empty-text) {
     @include flex-center;
     flex-direction: column;
@@ -117,6 +113,6 @@
     }
   }
   :deep(.el-table__empty-block) {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+    height: calc(100vh - 450px) !important;
   }
 </style>

+ 1 - 1
src/constant/pagination.ts

@@ -1,3 +1,3 @@
 export const PAGE_SIZE_CONFIG = [20, 50, 100];
 export const DEFAULT_PAGE_SIZE = 20;
-export const DEFAULT_LAYOUT = 'prev, pager, next, jumper, sizes, total';
+export const DEFAULT_PAGINATION_LAYOUT = 'prev, pager, next, jumper, sizes, total';

+ 29 - 0
src/store/usePaginationStore.ts

@@ -0,0 +1,29 @@
+/**
+ * 存储分页信息
+ */
+import { reactive } from 'vue';
+import { defineStore } from 'pinia';
+import { DEFAULT_PAGE_SIZE } from '@/constant/pagination';
+
+export const usePaginationStore = defineStore('pagination', () => {
+  const pagination = reactive({
+    page: 1,
+    pageSize: DEFAULT_PAGE_SIZE,
+  });
+  const setPage = (page: number) => {
+    pagination.page = page;
+  };
+  const setPageSize = (pageSize: number) => {
+    pagination.pageSize = pageSize;
+  };
+  const resetPagination = () => {
+    pagination.page = 1;
+    pagination.pageSize = DEFAULT_PAGE_SIZE;
+  };
+  return {
+    pagination,
+    setPage,
+    setPageSize,
+    resetPagination,
+  };
+});

+ 7 - 10
src/views/disaster/disaster-precaution/PageTaskExecution.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="disaster-precaution-container">
-    <header class="disaster-precaution-container__header">
-      <span class="disaster-precaution-container__title">灾害预防检查任务</span>
+  <div class="safety-platform-container">
+    <header class="safety-platform-container__header">
+      <span class="breadcrumb-title">灾害预防检查任务</span>
     </header>
-    <main class="disaster-precaution-container__main">
-      <div class="disaster-precaution">
+    <main class="safety-platform-container__main">
+      <div class="search-table-container">
         <header class="disaster-precaution__header">
           <Search
             :searchConfig="TASK_EXECUTION_SEARCH_CONFIG"
@@ -151,10 +151,6 @@
     if (searchData.taskState !== '') {
       taskManagementListQuery.queryParam.taskState = searchData.taskState;
     }
-    if (Object.keys(taskManagementListQuery.queryParam).length > 0) {
-      pagination.pageNumber = 1;
-      taskManagementListQuery.pageNumber = 1;
-    }
     getTableData();
   };
   const handleSizeChange = (value: number) => {
@@ -250,6 +246,7 @@
 </script>
 
 <style scoped lang="scss">
-  @use '../style/disaster.scss' as *;
+  @use '@/styles/page-details-layout.scss' as *;
+  @use '@/styles/page-main-layout.scss' as *;
   @use './src/style/task-execution.scss' as *;
 </style>

+ 12 - 34
src/views/disaster/disaster-precaution/PageTaskExecutionDetail.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="disaster-precaution-container">
-    <header class="disaster-precaution-container__header">
-      <img :src="BackIcon" alt="back" class="back-icon" @click="router.back()" />
-      <span class="disaster-precaution-container__title">{{ headTitle }}</span>
+  <div class="safety-platform-container">
+    <header class="safety-platform-container__header">
+      <BreadcrumbBack />
+      <span class="breadcrumb-title">{{ headTitle }}</span>
     </header>
-    <main class="disaster-precaution-container__main">
-      <div class="disaster-precaution">
+    <main class="safety-platform-container__main">
+      <div class="search-table-container">
         <div
           class="export-file"
           @click="exportTaskDetailToPDF(id, taskExecutionDetailList?.name || '')"
@@ -24,7 +24,7 @@
         <p class="title">
           被检查自查单位:<span class="content">{{ taskExecutionDetailList?.deptName }}</span>
         </p>
-        <div class="info-container">
+        <div class="template-table-merge-container">
           <TemplateTableMerge
             ref="templateTableMergeRef"
             :operation-type="operationType"
@@ -54,7 +54,7 @@
         </el-form>
       </div>
     </main>
-    <footer class="disaster-precaution-container__footer" v-if="operationType !== 'view'">
+    <footer class="safety-platform-container__footer" v-if="operationType !== 'view'">
       <el-button @click="router.back()">取消</el-button>
       <el-button type="primary" @click="handleSubmit" :disabled="submitDisabled"> 提交 </el-button>
     </footer>
@@ -75,7 +75,6 @@
     SaveTaskDetailRequest,
   } from '@/types/disaster-precaution';
   import { getTaskExecutionDetail, saveTaskDetail, saveTaskApproval } from '@/api/disaster-precaution';
-  import BackIcon from 'assets/svg/back.svg';
   import ExportIcon from 'assets/svg/export.svg';
 
   const { getUserFirstLevelTreeList, treeData, id: userId } = useUserInfoHook();
@@ -161,29 +160,8 @@
 </script>
 
 <style lang="scss" scoped>
-  @use '../style/disaster.scss' as *;
-  @use '@/views/disaster/style/info-container.scss' as *;
-  .disaster-precaution-container__header {
-    flex-direction: row !important;
-    justify-content: flex-start !important;
-    gap: 8px !important;
-  }
-  .title,
-  .content {
-    font-size: 14px;
-  }
-  .title {
-    color: rgba($text-color, 0.85);
-  }
-  .content {
-    color: rgba($text-color, 0.65);
-  }
-  .disaster-precaution {
-    position: relative;
-  }
-  .export-file {
-    position: absolute;
-    right: 0;
-    top: 0;
-  }
+  @use '@/styles/page-details-layout.scss' as *;
+  @use '@/styles/page-main-layout.scss' as *;
+  @use './src/style/common.scss' as *;
+  @use './src/style/task-template.scss' as *;
 </style>

+ 8 - 13
src/views/disaster/disaster-precaution/PageTaskItem.vue

@@ -1,13 +1,13 @@
 <template>
-  <div class="disaster-precaution-container">
-    <header class="disaster-precaution-container__header">
-      <img :src="BackIcon" alt="back" class="back-icon" @click="router.back()" />
-      <span class="disaster-precaution-container__title">{{ headerTitle }}</span>
+  <div class="safety-platform-container">
+    <header class="safety-platform-container__header">
+      <BreadcrumbBack />
+      <span class="breadcrumb-title">{{ headerTitle }}</span>
     </header>
-    <main class="disaster-precaution-container__main">
+    <main class="safety-platform-container__main">
       <component :is="dynamicComponent" :id="id" ref="dynamicComponentRef" />
     </main>
-    <footer class="disaster-precaution-container__footer" v-if="operate">
+    <footer class="safety-platform-container__footer" v-if="operate">
       <el-button @click="router.back()">取消</el-button>
       <el-button type="primary" @click="submit">提交</el-button>
     </footer>
@@ -22,7 +22,6 @@
   import UploadLoading from '@/components/UploadLoading.vue';
   import type { TaskManagementRuleForm } from './src/type';
   import { createTaskManagementItem, editTaskManagementItem } from '@/api/disaster-precaution';
-  import BackIcon from 'assets/svg/back.svg';
 
   const router = useRouter();
   const route = useRoute();
@@ -100,10 +99,6 @@
 </script>
 
 <style lang="scss" scoped>
-  @use '../style/disaster.scss' as *;
-  .disaster-precaution-container__header {
-    flex-direction: row !important;
-    justify-content: flex-start !important;
-    gap: 8px !important;
-  }
+  @use '@/styles/page-details-layout.scss' as *;
+  @use './src/style/common.scss' as *;
 </style>

+ 9 - 12
src/views/disaster/disaster-precaution/PageTaskManagement.vue

@@ -1,14 +1,14 @@
 <template>
-  <div class="disaster-precaution-container">
-    <header class="disaster-precaution-container__header">
-      <span class="disaster-precaution-container__title">检查任务管理</span>
+  <div class="safety-platform-container">
+    <header class="safety-platform-container__header">
+      <span class="breadcrumb-title">检查任务管理</span>
     </header>
-    <main class="disaster-precaution-container__main">
-      <div class="disaster-precaution">
+    <main class="safety-platform-container__main">
+      <div class="search-table-container">
         <header class="disaster-precaution__header">
           <el-button
             type="primary"
-            class="disaster-precaution__header--button"
+            class="search-table-container--button"
             :icon="Plus"
             @click="handleCreateTask"
             v-if="taskManagementPermissions"
@@ -194,10 +194,6 @@
     if (searchData.taskState) {
       taskManagementListQuery.queryParam.taskState = searchData.taskState;
     }
-    if (Object.keys(taskManagementListQuery.queryParam).length > 0) {
-      pagination.pageNumber = 1;
-      taskManagementListQuery.pageNumber = 1;
-    }
     getTableData();
   };
   const selectionItems = ref<any[]>([]);
@@ -314,14 +310,15 @@
     taskManagementPermissions.value = Boolean(
       permissions.find((item: { code: string }) => item.code === DISASTER_PERMISSIONS.TASK_MANAGEMENT),
     );
-    tableConfig.height = taskManagementPermissions.value
+    tableConfig.maxHeight = taskManagementPermissions.value
       ? TABLE_MANAGEMENT_HEIGHT_DEFAULT
       : TABLE_MANAGEMENT_HEIGHT_NOT_PERMISSION;
   });
 </script>
 
 <style scoped lang="scss">
-  @use '../style/disaster.scss' as *;
+  @use '@/styles/page-details-layout.scss' as *;
+  @use '@/styles/page-main-layout.scss' as *;
   @use './src/style/task-execution.scss' as *;
   .batch-table {
     position: relative;

+ 5 - 5
src/views/disaster/disaster-precaution/PageTaskTemplate.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="disaster-precaution-container">
-    <header class="disaster-precaution-container__header">
-      <span class="disaster-precaution-container__title">灾害预防检查任务模板</span>
+  <div class="safety-platform-container">
+    <header class="safety-platform-container__header">
+      <span class="breadcrumb-title">灾害预防检查任务模板</span>
     </header>
-    <main class="disaster-precaution-container__main">
+    <main class="safety-platform-container__main">
       <div class="template-card-list">
         <div
           class="template-card-item"
@@ -37,7 +37,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @use '../style/disaster.scss' as *;
+  @use '@/styles/page-details-layout.scss' as *;
   .template-card-list {
     display: flex;
     gap: 32px;

+ 9 - 19
src/views/disaster/disaster-precaution/PageTaskTemplateDetail.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="disaster-precaution-container">
-    <header class="disaster-precaution-container__header">
-      <img :src="BackIcon" alt="back" class="back-icon" @click="router.back()" />
-      <span class="disaster-precaution-container__title">{{ name }}</span>
+  <div class="safety-platform-container">
+    <header class="safety-platform-container__header">
+      <BreadcrumbBack />
+      <span class="breadcrumb-title">{{ name }}</span>
     </header>
-    <main class="disaster-precaution-container__main">
-      <div class="info-container">
+    <main class="safety-platform-container__main">
+      <div class="template-table-merge-container">
         <TemplateTableMerge
           :operation-type="'template'"
           :main-table="templateDetail"
@@ -18,20 +18,18 @@
 </template>
 
 <script lang="ts" setup>
-  import { useRoute, useRouter } from 'vue-router';
+  import { useRoute } from 'vue-router';
   import { ref, computed, onMounted } from 'vue';
   import TemplateTableMerge from './src/components/TemplateTableMerge.vue';
   import type { SpanTableData } from '@/views/disaster/disaster-precaution/src/type';
   import type { ContentItem } from '@/types/disaster-precaution';
   import { getTaskTemplateDetail } from '@/api/disaster-precaution';
   import { TASK_TEMPLATE_LIST } from './src/constants/template-detail';
-  import BackIcon from 'assets/svg/back.svg';
 
   const resultData = ref<ContentItem>({} as ContentItem);
   const opinionData = ref<ContentItem>({} as ContentItem);
 
   const route = useRoute();
-  const router = useRouter();
   const id = Number(route.params.id);
   const name = computed(() => {
     return TASK_TEMPLATE_LIST.find((item) => item.id === Number(id))?.name;
@@ -44,14 +42,6 @@
 </script>
 
 <style lang="scss" scoped>
-  @use '../style/disaster.scss' as *;
-  @use '@/views/disaster/style/info-container.scss' as *;
-  .disaster-precaution-container__header {
-    flex-direction: row !important;
-    justify-content: flex-start !important;
-    gap: 8px !important;
-  }
-  .disaster-precaution-container__main {
-    width: calc(100vw - 300px);
-  }
+  @use '@/styles/page-details-layout.scss' as *;
+  @use './src/style/common.scss' as *;
 </style>

+ 1 - 2
src/views/disaster/disaster-precaution/src/components/CreateTaskItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="info-container">
+  <div class="task-item-container">
     <BasicForm ref="basicFormRef" :formData="ruleFormData" :formRules="formRules" :formConfig="ruleFormConfig">
       <template #deptName>
         <el-select
@@ -88,7 +88,6 @@
 </script>
 
 <style scoped lang="scss">
-  @use '@/views/disaster/style/info-container.scss' as *;
   @use '../style/task-item.scss' as *;
   .custom-select {
     :deep(.el-select__selection) {

+ 1 - 2
src/views/disaster/disaster-precaution/src/components/EditTaskItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="info-container">
+  <div class="task-item-container">
     <BasicForm ref="basicFormRef" :formData="ruleFormData" :formRules="formRules" :formConfig="ruleFormConfig">
       <template #inspectType>
         <div class="task-type-container">
@@ -90,6 +90,5 @@
 </script>
 
 <style scoped lang="scss">
-  @use '@/views/disaster/style/info-container.scss' as *;
   @use '../style/task-item.scss' as *;
 </style>

+ 0 - 4
src/views/disaster/disaster-precaution/src/components/TemplateTableMerge.vue

@@ -428,10 +428,6 @@
     color: $text-color;
   }
 
-  :deep(.custom-table .el-table__inner-wrapper:after) {
-    height: 0;
-  }
-
   :deep(.custom-table th) {
     background-color: $white-color !important;
     font-weight: 400 !important;

+ 5 - 22
src/views/disaster/disaster-precaution/src/components/ViewTaskItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="disaster-precaution">
+  <div class="search-table-container">
     <p class="title">
       任务名称:<span class="content">{{ taskName }}</span>
     </p>
@@ -14,7 +14,7 @@
         导出预防检查任务单
       </el-button>
     </div>
-    <div class="info-container">
+    <div class="template-table-merge-container">
       <TemplateTableMerge
         :operation-type="operateType"
         :main-table="templateDetail"
@@ -75,24 +75,7 @@
 </script>
 
 <style scoped lang="scss">
-  @use '@/views/disaster/style/disaster.scss' as *;
-  @use '@/views/disaster/style/info-container.scss' as *;
-  .title,
-  .content {
-    font-size: 14px;
-  }
-  .title {
-    color: rgba($text-color, 0.85);
-  }
-  .content {
-    color: rgba($text-color, 0.65);
-  }
-  .disaster-precaution {
-    position: relative;
-  }
-  .export-file {
-    position: absolute;
-    right: 0;
-    top: 0;
-  }
+  @use '@/styles/page-main-layout.scss' as *;
+  @use '../style/common.scss' as *;
+  @use '../style/task-template.scss' as *;
 </style>

+ 1 - 1
src/views/disaster/disaster-precaution/src/config/table.ts

@@ -18,7 +18,7 @@ export const TABLE_OPTIONS_MANAGEMENT = {
 // 任务执行表格样式配置
 export const TABLE_OPTIONS_EXECUTION = {
   ...TABLE_OPTIONS_DEFAULT,
-  height: TABLE_MANAGEMENT_HEIGHT_NOT_PERMISSION,
+  maxHeight: TABLE_MANAGEMENT_HEIGHT_NOT_PERMISSION,
 };
 
 // 基础表格列配置

+ 8 - 0
src/views/disaster/disaster-precaution/src/style/common.scss

@@ -0,0 +1,8 @@
+.safety-platform-container__header {
+  flex-direction: row !important;
+  justify-content: flex-start !important;
+  gap: 8px !important;
+}
+.template-table-merge-container {
+  overflow-y: auto;
+}

+ 5 - 0
src/views/disaster/disaster-precaution/src/style/task-item.scss

@@ -1,6 +1,11 @@
 :deep(.el-date-editor) {
   --el-date-editor-width: 100%;
 }
+
+.task-item-container {
+  overflow-y: auto;
+}
+
 .task-type-container {
   display: flex;
   justify-content: space-between;

+ 19 - 0
src/views/disaster/disaster-precaution/src/style/task-template.scss

@@ -0,0 +1,19 @@
+@use '@/styles/variables.scss' as *;
+.title,
+.content {
+  font-size: 14px;
+}
+.title {
+  color: rgba($text-color, 0.85);
+}
+.content {
+  color: rgba($text-color, 0.65);
+}
+.search-table-container {
+  position: relative;
+}
+.export-file {
+  position: absolute;
+  right: 0;
+  top: 0;
+}

+ 1 - 5
src/views/disaster/disaster-warning/PageDefenseNotice.vue

@@ -203,10 +203,6 @@
     if (searchData.disasterType) {
       defenseNoticeListQuery.queryParam.disasterType = searchData.disasterType;
     }
-    if (Object.keys(defenseNoticeListQuery.queryParam).length > 0) {
-      pagination.pageNumber = 1;
-      defenseNoticeListQuery.pageNumber = 1;
-    }
     getTableData();
   };
   const handleSizeChange = (value: number) => {
@@ -233,7 +229,7 @@
     defenseNoticePermissions.value = Boolean(
       permissions.find((item: { code: string }) => item.code === DISASTER_PERMISSIONS.DEFENSE_NOTICE),
     );
-    tableConfig.height = defenseNoticePermissions.value ? TABLE_HEIGHT_PREMISSION : TABLE_HEIGHT_DEFAULT;
+    tableConfig.maxHeight = defenseNoticePermissions.value ? TABLE_HEIGHT_PREMISSION : TABLE_HEIGHT_DEFAULT;
     if (defenseNoticePermissions.value) {
       tableConfig.columns = DEFENSE_NOTICE_TABLE_COLUMNS_PERMISSION;
     }

+ 1 - 5
src/views/disaster/disaster-warning/PageWarningInfo.vue

@@ -218,10 +218,6 @@
     if (searchData.effectState) {
       wanrningInfoListQuery.queryParam.effectState = searchData.effectState;
     }
-    if (Object.keys(wanrningInfoListQuery.queryParam).length > 0) {
-      pagination.pageNumber = 1;
-      wanrningInfoListQuery.pageNumber = 1;
-    }
     getTableData();
   };
   const handleSizeChange = (value: number) => {
@@ -257,7 +253,7 @@
     warningInfoPermissions.value = Boolean(
       permissions.find((item: { code: string }) => item.code === DISASTER_PERMISSIONS.WARNING_INFO),
     );
-    tableConfig.height = warningInfoPermissions.value ? TABLE_HEIGHT_PREMISSION : TABLE_HEIGHT_DEFAULT;
+    tableConfig.maxHeight = warningInfoPermissions.value ? TABLE_HEIGHT_PREMISSION : TABLE_HEIGHT_DEFAULT;
     if (warningInfoPermissions.value) {
       tableConfig.columns = WARNING_INFO_TABLE_COLUMNS_PERMISSION;
     }

+ 2 - 2
src/views/system/dictionary/dictionary.vue

@@ -37,7 +37,7 @@
           :page-sizes="PAGE_SIZE_CONFIG"
           :total="totalRow"
           background
-          :layout="DEFAULT_LAYOUT"
+          :layout="DEFAULT_PAGINATION_LAYOUT"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         />
@@ -56,7 +56,7 @@
 <script lang="ts" setup>
   import { ref, onMounted, computed } from 'vue';
   import { ElMessage, ElMessageBox } from 'element-plus';
-  import { DEFAULT_LAYOUT, PAGE_SIZE_CONFIG } from '@/constant/pagination';
+  import { DEFAULT_PAGINATION_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';

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

@@ -38,7 +38,7 @@
         <section class="paginationPosition">
           <el-pagination
             background
-            :layout="DEFAULT_LAYOUT"
+            :layout="DEFAULT_PAGINATION_LAYOUT"
             :page-sizes="PAGE_SIZE_CONFIG"
             :total="total"
             v-model:page-size="personGroupListRequestParams.pageSize"
@@ -62,7 +62,7 @@
   import { onMounted, ref } from 'vue';
   import PersonGroupExhibitionDrawer from './components/PersonGroupExhibitionDrawer.vue';
   import { ElMessage } from 'element-plus';
-  import { DEFAULT_LAYOUT, PAGE_SIZE_CONFIG } from '@/constant/pagination';
+  import { DEFAULT_PAGINATION_LAYOUT, PAGE_SIZE_CONFIG } from '@/constant/pagination';
   import { msgConfirm } from '@/utils/element-plus/messageBox';
 
   import { PERM_NOTICE } from '@/types/permission/constants';

+ 2 - 2
src/views/system/role/role.vue

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

+ 2 - 2
src/views/system/user/user.vue

@@ -122,7 +122,7 @@
         <section class="paginationPosition">
           <el-pagination
             background
-            :layout="DEFAULT_LAYOUT"
+            :layout="DEFAULT_PAGINATION_LAYOUT"
             :page-sizes="PAGE_SIZE_CONFIG"
             :total="total"
             v-model:page-size="params.pageSize"
@@ -157,7 +157,7 @@
   import { reactive, ref, onMounted } from 'vue';
   import { storeToRefs } from 'pinia';
   import { ElMessage } from 'element-plus';
-  import { DEFAULT_LAYOUT, PAGE_SIZE_CONFIG, DEFAULT_PAGE_SIZE } from '@/constant/pagination';
+  import { DEFAULT_PAGINATION_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';

+ 1 - 2
vite.config.ts

@@ -50,8 +50,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       createVitePlugins(viteEnv, isBuild, prodMock),
       svg,
       codeInspectorPlugin({
-        bundler: 'vite',
-        openIn: 'reuse',
+        bundler: 'vite'
       }),
     ],
     define: {