From fe37beed44df3d9f98aad764f3977b18ef557784 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期五, 26 五月 2023 20:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/pet/petInfo.vue | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index cef38a2..7a4f7f2 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -414,17 +414,11 @@
this.loading = true;
// this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
// this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
- // console.log(this.queryParams)
this.queryParams.pid = this.pid;
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- listPetnote(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- console.log(response.data)
- this.PetNoteList = response.data.data;
-
- this.total = response.data.total;
+ getPetnoteList(this.pid).then(response => {
+ this.PetNoteList = response.data;
+ this.total = response.data.length;
this.loading = false;
}
);
--
Gitblit v1.9.1