From 8314c2943734770c6a38e67147e6367f683df8d1 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 11:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/performance/class/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/performance/class/index.vue b/src/views/performance/class/index.vue
index d5a7a4a..4a318ef 100644
--- a/src/views/performance/class/index.vue
+++ b/src/views/performance/class/index.vue
@@ -530,7 +530,6 @@
laboratory: this.query.laboratory,
}).then((res) => {
this.pageLoading = false;
- if (res.code == 201) return;
this.total = res.data.page.total;
this.list = res.data.page.records.map((item) => {
for (let key in item.monthlyAttendance) {
@@ -551,7 +550,9 @@
};
this.weeks.push(obj);
});
- });
+ }).catch(() => {
+ this.pageLoading = false;
+ })
},
initYear() {
this.pageLoading = true;
@@ -808,7 +809,7 @@
}
},
getUsers() {
- selectUserCondition().then((res) => {
+ selectUserCondition({ type: 1 }).then((res) => {
if (res.code === 201) {
return;
}
--
Gitblit v1.9.3