add fiel

2026-01-22 13:38:10 +08:00
parent b350322626
commit 313fe64475
151 changed files with 13060 additions and 4411 deletions
--- a/src/views/stuwork/classroomhygienedailyanalysis/index.vue
+++ b/src/views/stuwork/classroomhygienedailyanalysis/index.vue
@@ -56,9 +56,26 @@
        <div class="mb8" style="width: 100%">
          <right-toolbar  
            v-model:showSearch="showSearch" 
-            class="ml10 mr20" 
+            class="ml10" 
            style="float: right;"
            @queryTable="getDataList">
+            <TableColumnControl
+              ref="columnControlRef"
+              :columns="tableColumns"
+              v-model="visibleColumns"
+              trigger-type="default"
+              trigger-circle
+              @change="handleColumnChange"
+              @order-change="handleColumnOrderChange"
+            >
+              <template #trigger>
+                <el-tooltip class="item" effect="dark" content="列设置" placement="top">
+                  <el-button circle style="margin-left: 0;">
+                    <el-icon><Menu /></el-icon>
+                  </el-button>
+                </el-tooltip>
+              </template>
+            </TableColumnControl>
          </right-toolbar>
        </div>
      </el-row>
@@ -76,37 +93,34 @@
            <el-icon><List /></el-icon>
          </template>
        </el-table-column>
-        <el-table-column prop="totalScore" label="总分" show-overflow-tooltip align="center">
-          <template #header>
-            <el-icon><DataAnalysis /></el-icon>
-            <span style="margin-left: 4px">总分</span>
-          </template>
-          <template #default="scope">
-            <el-tag v-if="scope.row.totalScore !== undefined && scope.row.totalScore !== null" size="small" type="success" effect="plain">
-              {{ scope.row.totalScore }}
-            </el-tag>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="rank" label="排名" show-overflow-tooltip align="center">
-          <template #header>
-            <el-icon><Trophy /></el-icon>
-            <span style="margin-left: 4px">排名</span>
-          </template>
-          <template #default="scope">
-            <el-tag v-if="scope.row.rank" size="small" :type="scope.row.rank <= 3 ? 'warning' : 'info'" effect="plain">
-              {{ scope.row.rank }}
-            </el-tag>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="classNo" label="班级" show-overflow-tooltip>
-          <template #header>
-            <el-icon><Grid /></el-icon>
-            <span style="margin-left: 4px">班级</span>
-          </template>
-        </el-table-column>
-        <!-- 动态日期列 -->
+        <template v-for="col in sortedTableColumns" :key="col.prop || col.label">
+          <el-table-column 
+            v-if="checkColumnVisible(col.prop || '') && col.prop !== '操作' && !col.prop?.startsWith('day')"
+            :prop="col.prop" 
+            :label="col.label" 
+            show-overflow-tooltip
+            align="center">
+            <template #header>
+              <el-icon><component :is="columnConfigMap[col.prop]?.icon || Calendar" /></el-icon>
+              <span style="margin-left: 4px">{{ col.label }}</span>
+            </template>
+            <!-- 总分列特殊模板 -->
+            <template v-if="col.prop === 'totalScore'" #default="scope">
+              <el-tag v-if="scope.row.totalScore !== undefined && scope.row.totalScore !== null" size="small" type="success" effect="plain">
+                {{ scope.row.totalScore }}
+              </el-tag>
+              <span v-else>-</span>
+            </template>
+            <!-- 排名列特殊模板 -->
+            <template v-else-if="col.prop === 'rank'" #default="scope">
+              <el-tag v-if="scope.row.rank" size="small" :type="scope.row.rank <= 3 ? 'warning' : 'info'" effect="plain">
+                {{ scope.row.rank }}
+              </el-tag>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+        </template>
+        <!-- 动态日期列（不受列控制影响，始终显示） -->
        <el-table-column 
          v-for="day in dayColumns" 
          :key="day"
@@ -202,16 +216,20 @@
 </template>

 <script setup lang="ts" name="ClassRoomHygieneDailyAnalysis">
-import { ref, reactive, defineAsyncComponent, onMounted, computed } from 'vue'
+import { ref, reactive, defineAsyncComponent, onMounted, computed, nextTick } from 'vue'
+import { useRoute } from 'vue-router'
 import { BasicTableProps, useTable } from "/@/hooks/table";
 import { fetchList } from "/@/api/stuwork/classroomhygienedailyanalysis";
 import { useMessage } from "/@/hooks/message";
 import { getBuildingList } from '/@/api/stuwork/teachbuilding'
 import { getClassListByRole } from '/@/api/basic/basicclass'
-import { List, DataAnalysis, Trophy, Grid, Calendar, Setting } from '@element-plus/icons-vue'
+import TableColumnControl from '/@/components/TableColumnControl/index.vue'
+import { List, DataAnalysis, Trophy, Grid, Calendar, Setting, Menu } from '@element-plus/icons-vue'

 // 定义变量内容
+const route = useRoute()
 const searchFormRef = ref()
+const columnControlRef = ref<any>()
 const scoreFormRef = ref()
 // 搜索变量
 const showSearch = ref(true)
@@ -221,6 +239,124 @@ const scoreDialogVisible = ref(false)
 const scoreDialogTitle = ref('加分')
 const isAddScore = ref(true) // true: 加分, false: 减分

+// 表格列配置（只包含固定列，动态日期列不包含在内）
+const tableColumns = [
+  { prop: 'totalScore', label: '总分' },
+  { prop: 'rank', label: '排名' },
+  { prop: 'classNo', label: '班级' }
+]
+
+// 列配置映射（用于图标）
+const columnConfigMap: Record<string, { icon: any }> = {
+  totalScore: { icon: DataAnalysis },
+  rank: { icon: Trophy },
+  classNo: { icon: Grid }
+}
+
+// 当前显示的列
+const visibleColumns = ref<string[]>([])
+// 列排序顺序
+const columnOrder = ref<string[]>([])
+
+// 立即从 localStorage 加载配置
+const loadSavedConfig = () => {
+  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.map(col => col.prop || col.label)
+      const filteredSaved = savedColumns.filter((col: string) => validColumns.includes(col))
+      visibleColumns.value = filteredSaved.length > 0 ? filteredSaved : validColumns
+    } catch (e) {
+      visibleColumns.value = tableColumns.map(col => col.prop || col.label)
+    }
+  } else {
+    visibleColumns.value = tableColumns.map(col => col.prop || col.label)
+  }
+  
+  const orderKey = `${storageKey}-order`
+  const savedOrder = localStorage.getItem(orderKey)
+  if (savedOrder) {
+    try {
+      const parsedOrder = JSON.parse(savedOrder)
+      const validColumns = tableColumns.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.map(col => col.prop || col.label)
+    }
+  } else {
+    columnOrder.value = tableColumns.map(col => col.prop || col.label)
+  }
+}
+
+loadSavedConfig()
+
+// 排序后的表格列
+const sortedTableColumns = computed(() => {
+  const columns = tableColumns.filter(col => {
+    const key = col.prop || col.label
+    return visibleColumns.value.includes(key)
+  })
+  
+  if (columnOrder.value.length > 0) {
+    const orderedColumns: typeof tableColumns = []
+    const unorderedColumns: typeof tableColumns = []
+    
+    columnOrder.value.forEach(key => {
+      const col = columns.find(c => (c.prop || c.label) === key)
+      if (col) {
+        orderedColumns.push(col)
+      }
+    })
+    
+    columns.forEach(col => {
+      const key = col.prop || col.label
+      if (!columnOrder.value.includes(key)) {
+        unorderedColumns.push(col)
+      }
+    })
+    
+    return [...orderedColumns, ...unorderedColumns]
+  }
+  
+  return columns
+})
+
+// 列显示控制函数
+const checkColumnVisible = (prop: string): boolean => {
+  if (visibleColumns.value.length === 0) {
+    return true
+  }
+  return visibleColumns.value.includes(prop)
+}
+
+// 监听列变化
+const handleColumnChange = (columns: string[]) => {
+  visibleColumns.value = columns
+  const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
+  const storageKey = `table-columns-${routePath}`
+  const selectableColumns = columns.filter(col => {
+    const column = tableColumns.find(c => (c.prop || c.label) === col)
+    return column && !column.alwaysShow && !column.fixed
+  })
+  localStorage.setItem(storageKey, JSON.stringify(selectableColumns))
+}
+
+// 监听列排序变化
+const handleColumnOrderChange = (order: string[]) => {
+  columnOrder.value = order
+  const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
+  const storageKey = `table-columns-${routePath}-order`
+  localStorage.setItem(storageKey, JSON.stringify(order))
+}
+
 // 加分/减分表单
 const scoreForm = reactive({
  classCode: '',
@@ -422,7 +558,6 @@ const getBuildingListData = async () => {
      }
    }
  } catch (err) {
-    console.error('获取楼号列表失败', err)
    buildingList.value = []
  }
 }
@@ -443,7 +578,6 @@ const getClassListData = async () => {
      classList.value = []
    }
  } catch (err) {
-    console.error('获取班级列表失败', err)
    classList.value = []
  }
 }
@@ -452,6 +586,11 @@ const getClassListData = async () => {
 onMounted(() => {
  getBuildingListData()
  getClassListData()
+  nextTick(() => {
+    if (visibleColumns.value.length === 0) {
+      loadSavedConfig()
+    }
+  })
 })
 </script>