From bb35ebd742592d3d0bd47509f715ee38d3d44c3b Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 25 May 2023 11:04:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BF=BB=E9=A1=B5=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dict/index.ts               | 12 ++++++++++--
 src/components/Pagination/index.vue |  8 ++++----
 src/types/global.d.ts               |  4 ++--
 src/views/system/dict/DictData.vue  | 10 +++++-----
 src/views/system/dict/index.vue     | 10 +++++-----
 src/views/system/role/index.vue     | 10 +++++-----
 src/views/system/user/index.vue     | 10 +++++-----
 7 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/api/dict/index.ts b/src/api/dict/index.ts
index ab67b20..6f8eed8 100644
--- a/src/api/dict/index.ts
+++ b/src/api/dict/index.ts
@@ -14,7 +14,7 @@ import {
  *
  * @param queryParams
  */
-export function getDictTypePage(
+export function getDictTypePageOld(
   queryParams: DictTypeQuery
 ): AxiosPromise<DictTypePageResult> {
   return request({
@@ -23,7 +23,15 @@ export function getDictTypePage(
     params: queryParams
   });
 }
-
+export function getDictTypePage(
+  queryParams: DictTypeQuery
+): AxiosPromise<DictTypePageResult> {
+  return request({
+    url: '/systemapi/dict/dict_type_list',
+    method: 'post',
+    data: queryParams
+  });
+}
 /**
  * 字典类型表单数据
  *
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 2953fab..a0422b8 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -2,10 +2,10 @@
   <div :class="'pagination ' + { hidden: hidden }">
     <el-pagination
       v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
+      v-model:page-size="pagesize"
       :background="background"
       :layout="layout"
-      :page-sizes="pageSizes"
+      :page-sizes="pagesizes"
       :total="total"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -31,7 +31,7 @@ const props = defineProps({
     type: Number,
     default: 20,
   },
-  pageSizes: {
+  pagesizes: {
     type: Array as PropType<number[]>,
     default() {
       return [10, 20, 30, 50];
@@ -59,7 +59,7 @@ const emit = defineEmits(["pagination"]);
 
 const currentPage = useVModel(props, "page", emit);
 
-const pageSize = useVModel(props, "limit", emit);
+const pagesize = useVModel(props, "limit", emit);
 
 function handleSizeChange(val: number) {
   emit("pagination", { page: currentPage, limit: val });
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index ad7b72b..8ed06e5 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -3,8 +3,8 @@ declare global {
    * 分页查询参数
    */
   interface PageQuery {
-    pageNum: number;
-    pageSize: number;
+    page: number;
+    pagesize: number;
   }
 
   /**
diff --git a/src/views/system/dict/DictData.vue b/src/views/system/dict/DictData.vue
index 0d6efbd..ec40afc 100644
--- a/src/views/system/dict/DictData.vue
+++ b/src/views/system/dict/DictData.vue
@@ -45,8 +45,8 @@ const ids = ref<number[]>([]);
 const total = ref(0);
 
 const queryParams = reactive<DictQuery>({
-  pageNum: 1,
-  pageSize: 10,
+  page: 1,
+  pagesize: 10,
   typeCode: props.typeCode,
 });
 
@@ -87,7 +87,7 @@ function handleQuery() {
  */
 function resetQuery() {
   queryFormRef.value.resetFields();
-  queryParams.pageNum = 1;
+  queryParams.page = 1;
   handleQuery();
 }
 
@@ -261,8 +261,8 @@ onMounted(() => {
       <pagination
         v-if="total > 0"
         v-model:total="total"
-        v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.page"
+        v-model:limit="queryParams.pagesize"
         @pagination="handleQuery"
       />
     </el-card>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 403f2ba..f7eaee6 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -25,8 +25,8 @@ const ids = ref<number[]>([]);
 const total = ref(0);
 
 const queryParams = reactive<DictTypeQuery>({
-  pageNum: 1,
-  pageSize: 10,
+  page: 1,
+  pagesize: 10,
 });
 
 const dictTypeList = ref<DictTypePageVO[]>();
@@ -64,7 +64,7 @@ function handleQuery() {
  */
 function resetQuery() {
   queryFormRef.value.resetFields();
-  queryParams.pageNum = 1;
+  queryParams.page = 1;
   handleQuery();
 }
 
@@ -272,8 +272,8 @@ onMounted(() => {
       <pagination
         v-if="total > 0"
         v-model:total="total"
-        v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.page"
+        v-model:limit="queryParams.pagesize"
         @pagination="handleQuery"
       />
     </el-card>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b3235e6..2995d65 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -26,8 +26,8 @@ const ids = ref<number[]>([]);
 const total = ref(0);
 
 const queryParams = reactive<RoleQuery>({
-  pageNum: 1,
-  pageSize: 10,
+  page: 1,
+  pagesize: 10,
 });
 
 const roleList = ref<RolePageVO[]>();
@@ -79,7 +79,7 @@ function handleQuery() {
  */
 function resetQuery() {
   queryFormRef.value.resetFields();
-  queryParams.pageNum = 1;
+  queryParams.page = 1;
   handleQuery();
 }
 
@@ -330,8 +330,8 @@ onMounted(() => {
       <pagination
         v-if="total > 0"
         v-model:total="total"
-        v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.page"
+        v-model:limit="queryParams.pagesize"
         @pagination="handleQuery"
       />
     </el-card>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ec72d52..a5d2811 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -36,8 +36,8 @@ const dialog = reactive<DialogOption>({
 });
 
 const queryParams = reactive<UserQuery>({
-  pageNum: 1,
-  pageSize: 10,
+  page: 1,
+  pagesize: 10,
 });
 const userList = ref<UserPageVO[]>();
 
@@ -154,7 +154,7 @@ function handleQuery() {
  */
 function resetQuery() {
   queryFormRef.value.resetFields();
-  queryParams.pageNum = 1;
+  queryParams.page = 1;
   queryParams.deptId = undefined;
   handleQuery();
 }
@@ -581,8 +581,8 @@ onMounted(() => {
           <pagination
             v-if="total > 0"
             v-model:total="total"
-            v-model:page="queryParams.pageNum"
-            v-model:limit="queryParams.pageSize"
+            v-model:page="queryParams.page"
+            v-model:limit="queryParams.pagesize"
             @pagination="handleQuery"
           />
         </el-card>