From effa4606b76a4e053ac43905f593fcf6bb55d84e Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 11 Apr 2024 11:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/customer/customer.vue          |  5 ++--
 src/views/match/list/index.vue           |  4 +--
 src/views/match/manage/matchArchList.vue |  4 +--
 src/views/match/manage/matchRank.vue     | 19 +++++++++-----
 src/views/match/manage/matchSignup.vue   | 32 +++++++++++++-----------
 src/views/serve/projectAdd.vue           | 10 +++++---
 src/views/user/User.vue                  |  4 +--
 7 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index 79634d3..a8d05e8 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <el-card shadow="hover"
              class="mgb20">
       <div>
@@ -85,8 +85,7 @@
                      v-auth>批量删除</el-button>
         </div>
       </div>
-      <el-table v-loading="loading"
-                :data="listData"
+      <el-table :data="listData"
                 class="table"
                 ref="table"
                 stripe
diff --git a/src/views/match/list/index.vue b/src/views/match/list/index.vue
index 97be67c..81916b8 100644
--- a/src/views/match/list/index.vue
+++ b/src/views/match/list/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="page">
+  <div class="page"
+       v-loading="loading">
     <h6 class="p-title">筛选</h6>
     <div class="tool mul">
       <ul class="filter">
@@ -82,7 +83,6 @@
               stripe
               header-align="center"
               @selection-change="handleSelectionChange"
-              v-loading="loading"
               row-key="id">
       <el-table-column type="selection"
                        width="55"
diff --git a/src/views/match/manage/matchArchList.vue b/src/views/match/manage/matchArchList.vue
index a584fd1..64326e2 100644
--- a/src/views/match/manage/matchArchList.vue
+++ b/src/views/match/manage/matchArchList.vue
@@ -387,12 +387,12 @@ export default {
           stageId: this.stageId,
           isNakadai: 1
         })
+        this.loading = false
         this.total = page.total
         this.list = page.records
         this.statData = data
         this.avgScore = (+data.avgScore).toFixed(2)
-        this.getChart()
-        this.loading = false
+        this.method != 2 && this.getChart()
       }
     },
     initData () {
diff --git a/src/views/match/manage/matchRank.vue b/src/views/match/manage/matchRank.vue
index d465cf7..4131f44 100644
--- a/src/views/match/manage/matchRank.vue
+++ b/src/views/match/manage/matchRank.vue
@@ -11,6 +11,7 @@
     </el-card>
 
     <el-card shadow="hover"
+             v-loading="loading"
              class="m-b-20">
       <div class="tabs">
         <template v-for="(item, i) in grades">
@@ -60,7 +61,6 @@
                 ref="table"
                 stripe
                 row-key="scoreId"
-                v-loading="loading"
                 @selection-change="handleSelectionChange"
                 header-align="center">
         <el-table-column type="selection"
@@ -372,6 +372,7 @@ export default {
     },
     // 查询排名
     getRank () {
+      this.loading = true
       // 手动上传的排名接口
       if (this.type) {
         this.$post(this.api.manuallyUploadedRankings, {
@@ -389,7 +390,9 @@ export default {
           this.total = message.total
           this.getPublishTime()
           this.loading = false
-        }).catch(res => { })
+        }).catch(res => {
+          this.loading = false
+        })
       } else { // 默认排名接口
         if (!this.active) {
           // 总分排名
@@ -408,7 +411,9 @@ export default {
             this.total = total
             this.getPublishTime()
             this.loading = false
-          }).catch(res => { })
+          }).catch(res => {
+            this.loading = false
+          })
         } else {
           // 阶段排名
           this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}&publicationType=${this.type}&keyword=${this.keyword}`).then(({ page, total, publishStatus }) => {
@@ -417,7 +422,9 @@ export default {
             this.total = total
             this.getPublishTime()
             this.loading = false
-          }).catch(res => { })
+          }).catch(res => {
+            this.loading = false
+          })
         }
       }
     },
@@ -443,8 +450,8 @@ export default {
       }
     },
     // 排序类型切换回调
-    typeChange (val) {
-      this.$post(`${this.api.toggleTheSortingMode}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => { }).catch(res => { })
+    async typeChange (val) {
+      await this.$post(`${this.api.toggleTheSortingMode}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`)
       this.getRank()
     },
     initData () {
diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue
index e9f1677..50d019c 100644
--- a/src/views/match/manage/matchSignup.vue
+++ b/src/views/match/manage/matchSignup.vue
@@ -54,6 +54,7 @@
               header-align="center"
               @selection-change="handleSelectionChange"
               row-key="id"
+              v-loading="loading"
               @sort-change="sortChange">
       <el-table-column type="selection"
                        width="80"
@@ -437,7 +438,8 @@ export default {
       },
       uploading: false,
       isBackstage: 0,
-      exporting: false
+      exporting: false,
+      loading: false,
     };
   },
   watch: {
@@ -459,8 +461,9 @@ export default {
       this.getTeam()
       this.getClient()
     },
-    getData () {
-      this.$post(this.api.queryRegistrationByCondition, {
+    async getData () {
+      this.loading = true
+      const { data } = await this.$post(this.api.queryRegistrationByCondition, {
         pageNum: this.page,
         pageSize: this.pageSize,
         competitionId: this.id,
@@ -468,18 +471,17 @@ export default {
         isDisable: this.isDisable,
         schoolOrder: this.schoolOrder,
         teamOrder: this.teamOrder,
-      }).then(({ data }) => {
-        const list = data.records;
-        list.map(e => {
-          if (e.teacherDetails) {
-            e.teachers = JSON.parse(e.teacherDetails)
-          }
-        })
-        this.listData = list
-        this.total = data.total;
-        this.$refs.table.clearSelection();
-      }).catch(res => {
-      });
+      })
+      const list = data.records;
+      list.map(e => {
+        if (e.teacherDetails) {
+          e.teachers = JSON.parse(e.teacherDetails)
+        }
+      })
+      this.listData = list
+      this.total = data.total;
+      this.$refs.table.clearSelection();
+      this.loading = false
     },
     // 获取赛事信息
     getInfo () {
diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue
index 4b60aba..fa88c52 100644
--- a/src/views/serve/projectAdd.vue
+++ b/src/views/serve/projectAdd.vue
@@ -1,6 +1,7 @@
 <template>
   <div ref="main"
-       class="main">
+       class="main"
+       v-loading="loading">
     <el-row :gutter="20">
       <el-col :span="24">
         <el-card shadow="hover"
@@ -389,7 +390,8 @@ export default {
       listLoading: false,// 列表加载
       submiting: false, // 新增编辑防抖标识
       updateTime: 0,
-      savingJud: false
+      savingJud: false,
+      loading: false,
     };
   },
   computed: {
@@ -463,6 +465,7 @@ export default {
     },
     getInfoData () { // 获取详情数据
       if (!this.isToPoint) {
+        this.loading = true
         this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
           let { projectManage, projectJudgmentVos } = res;
           if (!projectManage.remark) projectManage.remark = projectManage.projectName // 如果没有备注，则直接显示项目名称
@@ -475,12 +478,13 @@ export default {
           this.projectJudgmentData.forEach((e, i) => {
             e.sort = i + 1;
           });
+          this.loading = false
           this.$nextTick(() => {
             this.updateTime = 0
             this.$refs.main.scrollTop = 0;
           });
         }).catch(err => {
-          console.log(err);
+          this.loading = false
         });
       }
     },
diff --git a/src/views/user/User.vue b/src/views/user/User.vue
index d28454b..3f9ba32 100644
--- a/src/views/user/User.vue
+++ b/src/views/user/User.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="wrap">
+  <div class="wrap"
+       v-loading="loading">
     <el-card shadow="hover"
              class="mgb20">
       <div>
@@ -141,7 +142,6 @@
                 stripe
                 header-align="center"
                 @selection-change="handleSelectionChange"
-                v-loading="loading"
                 row-key="userId">
         <el-table-column type="selection"
                          width="55"