From 273059e4675c46dbf1e7f3841727892ffe5a3945 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Wed, 12 Jul 2023 15:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/WxBuilding/index.vue |  2 ++
 ruoyi-ui/src/views/system/area/index.vue       |  6 ++++--
 ruoyi-ui/src/views/system/attachment/index.vue |  6 ++++--
 .../src/views/system/basketBallTeam/index.vue  |  2 ++
 ruoyi-ui/src/views/system/code/index.vue       |  4 +++-
 .../src/views/system/competition/index.vue     |  4 +++-
 .../system/competitionMemberScore/index.vue    |  6 ++++--
 .../views/system/competitionMembers/index.vue  |  6 ++++--
 .../views/system/competitionOfTeam/index.vue   |  6 ++++--
 .../views/system/competitionResult/index.vue   |  6 ++++--
 .../src/views/system/competitionSet/index.vue  | 18 +++++++++---------
 .../system/competitionTeamGroup/index.vue      |  6 ++++--
 .../system/competitionTeamVsTeam/index.vue     |  6 ++++--
 .../src/views/system/teamMembers/index.vue     |  6 ++++--
 ruoyi-ui/src/views/system/vs/index.vue         |  2 ++
 ruoyi-ui/src/views/system/wechat/index.vue     |  6 ++++--
 ruoyi-ui/src/views/system/wxUser/index.vue     | 10 +++++++++-
 17 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/ruoyi-ui/src/views/system/WxBuilding/index.vue b/ruoyi-ui/src/views/system/WxBuilding/index.vue
index 92cc8c7b..ef746fcb 100644
--- a/ruoyi-ui/src/views/system/WxBuilding/index.vue
+++ b/ruoyi-ui/src/views/system/WxBuilding/index.vue
@@ -575,6 +575,8 @@ export default {
         status: null,
         isOpen: null,
         createdId: null,
+        orderByColumn:"id",
+        isAsc:"desc"
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/area/index.vue b/ruoyi-ui/src/views/system/area/index.vue
index ec206ee4..aca7c967 100644
--- a/ruoyi-ui/src/views/system/area/index.vue
+++ b/ruoyi-ui/src/views/system/area/index.vue
@@ -227,7 +227,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -350,7 +350,9 @@ export default {
         createdTime: null,
         createdBy: null,
         modifiedBy: null,
-        lastUpdatedTime: null
+        lastUpdatedTime: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/attachment/index.vue b/ruoyi-ui/src/views/system/attachment/index.vue
index fd9244f2..cf62145c 100644
--- a/ruoyi-ui/src/views/system/attachment/index.vue
+++ b/ruoyi-ui/src/views/system/attachment/index.vue
@@ -159,7 +159,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -257,7 +257,9 @@ export default {
         createdBy: null,
         modifiedBy: null,
         lastUpdatedTime: null,
-        consultType: null
+        consultType: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/basketBallTeam/index.vue b/ruoyi-ui/src/views/system/basketBallTeam/index.vue
index acf5d31b..a13290ed 100644
--- a/ruoyi-ui/src/views/system/basketBallTeam/index.vue
+++ b/ruoyi-ui/src/views/system/basketBallTeam/index.vue
@@ -255,6 +255,8 @@ export default {
         teamDes: null,
         buildId: null,
         createdId: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/code/index.vue b/ruoyi-ui/src/views/system/code/index.vue
index 22bdc2b0..f6550443 100644
--- a/ruoyi-ui/src/views/system/code/index.vue
+++ b/ruoyi-ui/src/views/system/code/index.vue
@@ -296,7 +296,9 @@ export default {
         busType: null,
         page: null,
         width: null,
-        useDesc: null
+        useDesc: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/competition/index.vue b/ruoyi-ui/src/views/system/competition/index.vue
index f4cfb5fe..529ffdb0 100644
--- a/ruoyi-ui/src/views/system/competition/index.vue
+++ b/ruoyi-ui/src/views/system/competition/index.vue
@@ -389,7 +389,9 @@ export default {
         createdId: null,
         auditStatus: null,
         heightHide: null,
-        sponsor: null
+        sponsor: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/competitionMemberScore/index.vue b/ruoyi-ui/src/views/system/competitionMemberScore/index.vue
index d9357250..0d214cd1 100644
--- a/ruoyi-ui/src/views/system/competitionMemberScore/index.vue
+++ b/ruoyi-ui/src/views/system/competitionMemberScore/index.vue
@@ -309,7 +309,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -471,7 +471,9 @@ export default {
         createdBy: null,
         modifiedBy: null,
         isDeleted: null,
-        isFirstLaunch: null
+        isFirstLaunch: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/competitionMembers/index.vue b/ruoyi-ui/src/views/system/competitionMembers/index.vue
index 6731c3af..9a241efc 100644
--- a/ruoyi-ui/src/views/system/competitionMembers/index.vue
+++ b/ruoyi-ui/src/views/system/competitionMembers/index.vue
@@ -320,7 +320,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -486,7 +486,9 @@ export default {
         contacts: null,
         contactsAreaCode: null,
         personalPhoto: null,
-        isFirstLaunch: null
+        isFirstLaunch: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/competitionOfTeam/index.vue b/ruoyi-ui/src/views/system/competitionOfTeam/index.vue
index b34dc105..9e3eb664 100644
--- a/ruoyi-ui/src/views/system/competitionOfTeam/index.vue
+++ b/ruoyi-ui/src/views/system/competitionOfTeam/index.vue
@@ -202,7 +202,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -317,7 +317,9 @@ export default {
         contacts: null,
         contactsTel: null,
         contactsAreaCode: null,
-        serialNumber: null
+        serialNumber: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/competitionResult/index.vue b/ruoyi-ui/src/views/system/competitionResult/index.vue
index dec1a05f..08cb0b44 100644
--- a/ruoyi-ui/src/views/system/competitionResult/index.vue
+++ b/ruoyi-ui/src/views/system/competitionResult/index.vue
@@ -238,7 +238,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -369,7 +369,9 @@ export default {
         fourNodeScore: null,
         fiveNodeScore: null,
         sixNodeScore: null,
-        integral: null
+        integral: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/competitionSet/index.vue b/ruoyi-ui/src/views/system/competitionSet/index.vue
index 0056535d..4bd41351 100644
--- a/ruoyi-ui/src/views/system/competitionSet/index.vue
+++ b/ruoyi-ui/src/views/system/competitionSet/index.vue
@@ -853,7 +853,7 @@ export default {
         this.competitionObj = response.data;
         this.loading = false;
       });
-      listCompetitionOfTeam({"pageNum": 1, "pageSize": 1000,"competitionId":id}).then(response => {
+      listCompetitionOfTeam({"orderByColumn":"t.id","isAsc":"desc","pageNum": 1, "pageSize": 1000,"competitionId":id}).then(response => {
         this.competitionOfTeamList = response.rows;
       });
     }
@@ -987,7 +987,7 @@ export default {
     bindConfirm(id,tage){
       updateCompetitionOfTeam({"id":id,"status":tage}).then(response => {
         this.$modal.msgSuccess("球队审核成功");
-        listCompetitionOfTeam({"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
+        listCompetitionOfTeam({"orderByColumn":"t.id","isAsc":"desc","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
           this.competitionOfTeamList = response.rows;
         });
       });
@@ -1058,7 +1058,7 @@ export default {
     handleTagClick(tab, event){
       console.info(tab.name)
       if(tab.name=='competitionTeamApprove'){
-        listCompetitionOfTeam({"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
+        listCompetitionOfTeam({"orderByColumn":"t.id","isAsc":"desc","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
           this.competitionOfTeamList = response.rows;
         });
       }else if(tab.name=='competitionTeamGroup'){
@@ -1067,7 +1067,7 @@ export default {
           this.competitionTeamGroupList.push({"competitionGroup":"未分","id":null})
         });
       }else if(tab.name=='competitionVsSet'){
-        listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
+        listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isAsc":"desc","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
           this.competitionTeamVsTeamList = response.rows;
         });
       }else if(tab.name=='competitionSpread'){
@@ -1124,7 +1124,7 @@ export default {
         arrangeTeamGroupSchedule(param).then(response => {
           this.$modal.msgSuccess("赛程智能设置成功");
           this.mindVisible = false;
-          listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
+          listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isAsc":"desc","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
             this.competitionTeamVsTeamList = response.rows;
           });
         });
@@ -1190,7 +1190,7 @@ export default {
       this.$modal.confirm('是否确认删除赛会中的赛程数据？').then(function() {
         return delCompetitionTeamVsTeam(ids);
       }).then(() => {
-        listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
+        listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isAsc":"desc","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
           this.competitionTeamVsTeamList = response.rows;
         });
         this.$modal.msgSuccess("删除赛程成功");
@@ -1200,7 +1200,7 @@ export default {
       editDataCompetitionResult(this.competitionRecord).then(response => {
         this.$modal.msgSuccess("比赛结果记录成功");
         this.vsRecordOpen = false;
-        listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
+        listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isAsc":"desc","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
           this.competitionTeamVsTeamList = response.rows;
         });
       });
@@ -1214,7 +1214,7 @@ export default {
             updateCompetitionTeamVsTeam(this.vsform).then(response => {
               this.$modal.msgSuccess("编辑赛程成功");
               this.vsOpen = false;
-              listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
+              listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isAsc":"desc","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
                 this.competitionTeamVsTeamList = response.rows;
               });
             });
@@ -1223,7 +1223,7 @@ export default {
             addCompetitionTeamVsTeam(this.vsform).then(response => {
               this.$modal.msgSuccess("新增赛程成功");
               this.vsOpen = false;
-              listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
+              listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isAsc":"desc","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
                 this.competitionTeamVsTeamList = response.rows;
               });
             });
diff --git a/ruoyi-ui/src/views/system/competitionTeamGroup/index.vue b/ruoyi-ui/src/views/system/competitionTeamGroup/index.vue
index c4e4e209..dbbc1c80 100644
--- a/ruoyi-ui/src/views/system/competitionTeamGroup/index.vue
+++ b/ruoyi-ui/src/views/system/competitionTeamGroup/index.vue
@@ -157,7 +157,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -252,7 +252,9 @@ export default {
         createdBy: null,
         modifiedBy: null,
         isDeleted: null,
-        isCycle: null
+        isCycle: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/competitionTeamVsTeam/index.vue b/ruoyi-ui/src/views/system/competitionTeamVsTeam/index.vue
index 5f35d037..43359652 100644
--- a/ruoyi-ui/src/views/system/competitionTeamVsTeam/index.vue
+++ b/ruoyi-ui/src/views/system/competitionTeamVsTeam/index.vue
@@ -252,7 +252,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -393,7 +393,9 @@ export default {
         mainTeamScore: null,
         guestTeamScore: null,
         vsType: null,
-        batchNumber: null
+        batchNumber: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/teamMembers/index.vue b/ruoyi-ui/src/views/system/teamMembers/index.vue
index 29246070..495a1bb8 100644
--- a/ruoyi-ui/src/views/system/teamMembers/index.vue
+++ b/ruoyi-ui/src/views/system/teamMembers/index.vue
@@ -175,7 +175,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -278,7 +278,9 @@ export default {
         isDeleted: null,
         lastUpdatedTime: null,
         modifiedBy: null,
-        roleName: null
+        roleName: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/vs/index.vue b/ruoyi-ui/src/views/system/vs/index.vue
index 3b401163..bc3bd0c7 100644
--- a/ruoyi-ui/src/views/system/vs/index.vue
+++ b/ruoyi-ui/src/views/system/vs/index.vue
@@ -299,6 +299,8 @@ export default {
         createdId: null,
         auditStatus: null,
         heightHide: null,
+        orderByColumn:"id",
+        isAsc:"desc",
         sponsor: null
       },
       // 表单参数
diff --git a/ruoyi-ui/src/views/system/wechat/index.vue b/ruoyi-ui/src/views/system/wechat/index.vue
index b1a34199..3679ac2a 100644
--- a/ruoyi-ui/src/views/system/wechat/index.vue
+++ b/ruoyi-ui/src/views/system/wechat/index.vue
@@ -200,7 +200,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -311,7 +311,9 @@ export default {
         createdTime: null,
         createdBy: null,
         modifiedBy: null,
-        lastUpdatedTime: null
+        lastUpdatedTime: null,
+        orderByColumn:"id",
+        isAsc:"desc",
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/system/wxUser/index.vue b/ruoyi-ui/src/views/system/wxUser/index.vue
index 7e4c322d..436a16e4 100644
--- a/ruoyi-ui/src/views/system/wxUser/index.vue
+++ b/ruoyi-ui/src/views/system/wxUser/index.vue
@@ -80,7 +80,7 @@
 
     <el-table v-loading="loading" :data="wxUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="主键ID" align="center" prop="id"  />
       <el-table-column label="头像" align="center" prop="avatar" >
         <template slot-scope="scope">
           <el-avatar :src="scope.row.avatar"></el-avatar>
@@ -261,6 +261,8 @@ export default {
         pageSize: 10,
         loginName: null,
         userName: null,
+        orderByColumn:"id",
+        isAsc:"desc"
       },
       // 表单参数
       form: {},
@@ -368,6 +370,12 @@ export default {
         }
       });
     },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;