From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/views/performance/class/index.vue |   22 ++++++----------------
 1 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/views/performance/class/index.vue b/src/views/performance/class/index.vue
index d5a7a4a..ff3a4f1 100644
--- a/src/views/performance/class/index.vue
+++ b/src/views/performance/class/index.vue
@@ -22,8 +22,8 @@
         </div>
       </div>
       <div class="search_thing" style="padding-left: 30px">
-        <el-button size="small" @click="refresh()">閲� 缃�</el-button>
-        <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+        <el-button size="mini" type="primary" @click="refreshTable()"> 璇�</el-button>
+        <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
       </div>
       <div class="search_thing btns" style="padding-left: 30px">
         <el-button size="small" type="primary" v-if="checkPermi(['performance:class:time'])"
@@ -444,7 +444,6 @@
       this.monthList.push(i);
     }
     this.monthList.reverse();
-    // this.getPower();
   },
   methods: {
     refresh() {
@@ -530,7 +529,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 +549,9 @@
           };
           this.weeks.push(obj);
         });
-      });
+      }).catch(() => {
+        this.pageLoading = false;
+      })
     },
     initYear() {
       this.pageLoading = true;
@@ -564,7 +564,6 @@
         laboratory: this.query.laboratory,
       }).then((res) => {
         this.pageLoading = false;
-        if (res.code == 201) return;
         this.total = res.data.total;
         this.yearList = res.data.records.map((item) => {
           for (let key in item.year) {
@@ -624,7 +623,6 @@
       })
         .then((res) => {
           this.loading = false;
-          if (res.code == 201) return;
           this.$message.success("鎿嶄綔鎴愬姛");
           this.schedulingVisible = false;
           this.schedulingQuery = {
@@ -649,7 +647,6 @@
       this.configTimeVisibleLoading = true;
       list()
         .then((res) => {
-          if (res.code == 201) return;
           if (res.data.length > 0) {
             res.data.forEach((item) => {
               item.isEdit = false;
@@ -701,14 +698,12 @@
         // 缂栬緫
         newObj.id = item.id;
         shiftUpdate(newObj).then((res) => {
-          if (res.code == 201) return;
           this.$message.success("鎿嶄綔鎴愬姛");
           this.getTimeList();
         });
       } else {
         // 鏂板
         shiftAdd(newObj).then((res) => {
-          if (res.code == 201) return;
           this.$message.success("鎿嶄綔鎴愬姛");
           this.getTimeList();
         });
@@ -719,7 +714,6 @@
         shiftRemove({
           id: item.id,
         }).then((res) => {
-          if (res.code == 201) return;
           this.$message.success("鎿嶄綔鎴愬姛");
           this.getTimeList();
         });
@@ -801,17 +795,13 @@
           id: m.id,
           shift: e,
         }).then((res) => {
-          if (res.code == 201) return;
           this.$message.success("鎿嶄綔鎴愬姛");
           m.shift = e;
         });
       }
     },
     getUsers() {
-      selectUserCondition().then((res) => {
-        if (res.code === 201) {
-          return;
-        }
+      selectUserCondition({ type: 1 }).then((res) => {
         let arr = res.data;
         this.personList = arr;
       });

--
Gitblit v1.9.3