From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-ui/src/views/demo/demo/index.vue | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/views/demo/demo/index.vue b/ruoyi-ui/src/views/demo/demo/index.vue
index a6679f3..c2ef2e0 100644
--- a/ruoyi-ui/src/views/demo/demo/index.vue
+++ b/ruoyi-ui/src/views/demo/demo/index.vue
@@ -33,6 +33,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handlePage">鎼滅储(鑷畾涔夊垎椤垫帴鍙�)</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -168,7 +169,7 @@
</template>
<script>
-import { listDemo, getDemo, delDemo, addDemo, updateDemo, exportDemo } from "@/api/demo/demo";
+import { listDemo, pageDemo, getDemo, delDemo, addDemo, updateDemo, exportDemo } from "@/api/demo/demo";
export default {
name: "Demo",
@@ -239,6 +240,20 @@
this.loading = false;
});
},
+ /** 鑷畾涔夊垎椤垫煡璇� */
+ getPage() {
+ this.loading = true;
+ this.queryParams.params = {};
+ if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+ this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+ this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+ }
+ pageDemo(this.queryParams).then(response => {
+ this.demoList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -267,6 +282,11 @@
this.queryParams.pageNum = 1;
this.getList();
},
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handlePage() {
+ this.queryParams.pageNum = 1;
+ this.getPage();
+ },
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.daterangeCreateTime = [];
--
Gitblit v1.9.3