From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 11:31:04 +0800
Subject: [PATCH] Merge branch 'dev'

---
 src/components/VisibilityToolbar/index.vue |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/components/VisibilityToolbar/index.vue b/src/components/VisibilityToolbar/index.vue
index 871a291..9f875e7 100644
--- a/src/components/VisibilityToolbar/index.vue
+++ b/src/components/VisibilityToolbar/index.vue
@@ -23,10 +23,10 @@
         <span>淇℃伅鏄鹃殣绛涢��</span>
       </div>
       <div slot="default" style="margin-left: 20px;margin-top: 20px">
-        <el-table :data="getPage" style="width: 95%; height: 80%;;margin-bottom: 40px;">
+        <el-table :row-key="row => { return row.id }" :data="getPage" style="width: 95%; height: 80%;;margin-bottom: 40px;" >
           <el-table-column prop="index" label="搴忓彿" width="80"></el-table-column>
           <el-table-column prop="label" label="鏁版嵁鍚嶇О"></el-table-column>
-          <el-table-column prop="visible" label="鏄惁鏄剧ず">
+          <el-table-column prop="visible" label="鏄惁鏄剧ず" >
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.visible"
@@ -37,9 +37,10 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column prop="date" label="鎺掑簭">
+          <el-table-column prop="sort" label="鎺掑簭">
             <template slot-scope="scope">
-              <el-input-number v-model="scope.row.serialNumber" :min="0" style="width: 120px" @change="sortChange(scope.row, $event)"></el-input-number>
+              <el-input-number v-model="scope.row.sort" :min="0" style="width: 120px"
+                               @change="sortChange(scope.row, $event)"></el-input-number>
             </template>
           </el-table-column>
         </el-table>
@@ -129,7 +130,6 @@
       this.table = true;
     },
     switchChange(row) {
-      row.sort = row.serialNumber;
       if (row.visible === true){
         row.display = "1"
       }else {
@@ -139,17 +139,17 @@
         this.saveList.push(row)
       }else {
         let have = true;
-        this.saveList.forEach((item ,index)=>{
-          if (item.id === row.id){
-              item[index] =item;
+        let index = this.saveList.findIndex(item => item.id === row.id);
+        if (index !== -1){
+            this.saveList[index] = row;
             have =false;
-          }
-        })
+        }
+
         if (have){
           this.saveList.push(row)
         }
       }
-      console.log(this.saveList)
+      console
       this.$emit('update:columns', row);
     },
     handlePageChange(page) {
@@ -185,11 +185,12 @@
       if (this.saveList.length !== 0){
         saveHiddenList(CircularJSON.stringify(this.saveList)).then(res =>{
           this.$modal.msgSuccess("淇濆瓨鎴愬姛");
+          //鍒锋柊椤甸潰
+          this.$emit('update:resetSort');
         });
       }
     },
     sortChange(row, val) {
-      row.sort = row.serialNumber;
       if (row.visible === true){
         row.display = "1"
       }else {
@@ -199,12 +200,11 @@
         this.saveList.push(row)
       }else {
         let have = true;
-        this.saveList.forEach((item ,index)=>{
-          if (item.id === row.id){
-            item[index] =item;
-            have =false;
-          }
-        })
+        let index = this.saveList.findIndex(item => item.id === row.id);
+        if (index !== -1){
+          this.saveList[index] = row;
+          have =false;
+        }
         if (have){
           this.saveList.push(row)
         }
@@ -221,7 +221,6 @@
       //
       // // 鏍规嵁serialNumber瀵筺ewColumns杩涜鎺掑簭
       // this.cpList = this.cpList.sort((a, b) => a.serialNumber - b.serialNumber);
-      //
       // // 瑙﹀彂浜嬩欢閫氱煡鐖剁粍浠禼olumns宸叉洿鏂帮紙濡傛灉鐖剁粍浠堕渶瑕佺煡閬撹繖涓彉鍖栵級
       // this.$emit('update:sort', this.cpList);
       this.$emit('update:sort', row);

--
Gitblit v1.8.0