diff --git a/mock/system/index.js b/mock/system/index.js index d080ba6..ee8c231 100644 --- a/mock/system/index.js +++ b/mock/system/index.js @@ -160,7 +160,13 @@ export default [ return true }) const List = mockList.filter((item, index) => index < limit * page && index >= limit * (page - 1)) - return resultSuccess(List) + const data = { + list: List, + page: Number(page), + limit: Number(limit), + total: count + } + return resultSuccess(data) } }, { diff --git a/package.json b/package.json index 4329373..6e263dc 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "@vicons/antd": "^0.10.0", "@vicons/ionicons5": "^0.10.0", "axios": "^0.26.1", + "dayjs": "^1.11.0", "mockjs": "^1.1.0", "pinia": "^2.0.13", "vue": "^3.2.16", diff --git a/src/components/DataTable/index.vue b/src/components/DataTable/index.vue index 1bb5a5c..6a35352 100644 --- a/src/components/DataTable/index.vue +++ b/src/components/DataTable/index.vue @@ -13,26 +13,78 @@
- +
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index e0b6e3e..e0b819e 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -1,19 +1,20 @@