merge code pull

src/views/stuwork/classroomhygienemonthly/index.vue

@@ -263,6 +263,7 @@ import type { TableInstance } from 'element-plus'
 // 引入组件
 const UploadExcel = defineAsyncComponent(() => import('/@/components/Upload/Excel.vue'));
 import { List, Calendar, Clock, OfficeBuilding, Grid, UserFilled, Location, DataAnalysis, Document, Setting, Menu } from '@element-plus/icons-vue'
+import { getTableConfigFromLocal, saveTableConfigToLocal, updateUserTableConfig } from '/@/api/admin/usertable'
 
 // 定义变量内容
 const route = useRoute()
@@ -301,64 +302,32 @@ const visibleColumns = ref<string[]>([])
 // 列排序顺序
 const columnOrder = ref<string[]>([])
 
-// 立即从 localStorage 加载配置（在组件创建时）
+// 从本地统一存储加载配置
 const loadSavedConfig = () => {
-  // 根据路由生成 storageKey
   const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
   const storageKey = `table-columns-${routePath}`
-  const saved = localStorage.getItem(storageKey)
-  if (saved) {
-    try {
-      const savedColumns = JSON.parse(saved)
-      const validColumns = tableColumns
-        .filter(col => !col.alwaysShow && !col.fixed)
-        .map(col => col.prop || col.label)
-      const filteredSaved = savedColumns.filter((col: string) => validColumns.includes(col))
-      
-      // 使用保存的列配置（即使数量少于所有列，也使用保存的配置）
-      if (filteredSaved.length > 0) {
-        visibleColumns.value = filteredSaved
-      } else {
-        // 如果保存的配置为空或无效，使用所有列
-        visibleColumns.value = validColumns
-      }
-    } catch (e) {
-      visibleColumns.value = tableColumns
-        .filter(col => !col.alwaysShow && !col.fixed)
-        .map(col => col.prop || col.label)
-    }
+  const savedConfig = getTableConfigFromLocal(storageKey)
+  
+  const validColumns = tableColumns
+    .filter(col => !col.alwaysShow && !col.fixed)
+    .map(col => col.prop || col.label)
+  
+  if (savedConfig && savedConfig.visibleColumns) {
+    const filteredSaved = savedConfig.visibleColumns.filter((col: string) => validColumns.includes(col))
+    visibleColumns.value = filteredSaved.length > 0 ? filteredSaved : validColumns
   } else {
-    visibleColumns.value = tableColumns
-      .filter(col => !col.alwaysShow && !col.fixed)
-      .map(col => col.prop || col.label)
+    visibleColumns.value = validColumns
   }
   
-  // 加载列排序配置
-  const orderKey = `${storageKey}-order`
-  const savedOrder = localStorage.getItem(orderKey)
-  if (savedOrder) {
-    try {
-      const parsedOrder = JSON.parse(savedOrder)
-      const validColumns = tableColumns
-        .filter(col => !col.alwaysShow && !col.fixed)
-        .map(col => col.prop || col.label)
-      columnOrder.value = parsedOrder.filter((key: string) => validColumns.includes(key))
-      
-      // 添加新列到排序列表末尾
-      validColumns.forEach(key => {
-        if (!columnOrder.value.includes(key)) {
-          columnOrder.value.push(key)
-        }
-      })
-    } catch (e) {
-      columnOrder.value = tableColumns
-        .filter(col => !col.alwaysShow && !col.fixed)
-        .map(col => col.prop || col.label)
-    }
+  if (savedConfig && savedConfig.columnOrder) {
+    columnOrder.value = savedConfig.columnOrder.filter((key: string) => validColumns.includes(key))
+    validColumns.forEach(key => {
+      if (!columnOrder.value.includes(key)) {
+        columnOrder.value.push(key)
+      }
+    })
   } else {
-    columnOrder.value = tableColumns
-      .filter(col => !col.alwaysShow && !col.fixed)
-      .map(col => col.prop || col.label)
+    columnOrder.value = validColumns
   }
 }
 
@@ -386,26 +355,27 @@ const checkColumnVisible = (prop: string): boolean => {
 // 监听列变化
 const handleColumnChange = (columns: string[]) => {
   visibleColumns.value = columns
-  // 根据路由生成 storageKey
   const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
   const storageKey = `table-columns-${routePath}`
-  // 只保存可选择的列（排除固定列和 alwaysShow 列）
   const selectableColumns = columns.filter(col => {
     const column = tableColumns.find(c => (c.prop || c.label) === col)
     return column && !column.alwaysShow && !column.fixed
   })
-  // 保存到 localStorage
-  localStorage.setItem(storageKey, JSON.stringify(selectableColumns))
+  // 保存到本地统一存储
+  saveTableConfigToLocal(storageKey, { visibleColumns: selectableColumns })
+  // 异步保存到后端
+  updateUserTableConfig(storageKey, { visibleColumns: selectableColumns }).catch(() => {})
 }
 
 // 监听列排序变化
 const handleColumnOrderChange = (order: string[]) => {
   columnOrder.value = order
-  // 根据路由生成 storageKey
   const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
-  const storageKey = `table-columns-${routePath}-order`
-  // 保存排序顺序到 localStorage
-  localStorage.setItem(storageKey, JSON.stringify(order))
+  const storageKey = `table-columns-${routePath}`
+  // 保存到本地统一存储
+  saveTableConfigToLocal(storageKey, { columnOrder: order })
+  // 异步保存到后端
+  updateUserTableConfig(storageKey, { columnOrder: order }).catch(() => {})
 }
 
 // 初始化列排序顺序（已废弃，使用 loadSavedConfig 代替）