merge code

2026-01-27 00:27:46 +08:00
parent 302581289f
commit 8ebb8949d8
69 changed files with 9859 additions and 12987 deletions
--- a/src/views/stuwork/dormbuilding/index.vue
+++ b/src/views/stuwork/dormbuilding/index.vue
@@ -1,21 +1,24 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-
-      <!-- 操作按钮 -->
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button 
-            icon="FolderAdd" 
-            type="primary" 
-            class="ml10" 
-            @click="formDialogRef.openDialog()">
-            新 增
-          </el-button>
-          <right-toolbar  
-            class="ml10"
-            style="float: right;"
-            @queryTable="getDataList">
+  <div class="modern-page-container">
+    <div class="page-wrapper">
+      <!-- 内容卡片 -->
+      <el-card class="content-card" shadow="never">
+        <template #header>
+          <div class="card-header">
+            <span class="card-title">
+              <el-icon class="title-icon"><Document /></el-icon>
+              宿舍楼列表
+            </span>
+            <div class="header-actions">
+              <el-button 
+                icon="FolderAdd" 
+                type="primary" 
+                @click="formDialogRef.openDialog()">
+                新 增
+              </el-button>
+              <right-toolbar  
+                class="ml10"
+                @queryTable="getDataList">
            <TableColumnControl
              ref="columnControlRef"
              :columns="tableColumns"
@@ -34,35 +37,42 @@
              </template>
            </TableColumnControl>
          </right-toolbar>
-        </div>
-      </el-row>
+            </div>
+          </div>
+        </template>

-      <!-- 表格 -->
-      <el-table 
-        :data="state.dataList" 
-        v-loading="state.loading" 
-        border 
-        :cell-style="tableStyle.cellStyle" 
-        :header-cell-style="tableStyle.headerCellStyle"
-        @sort-change="sortChangeHandle"
-        show-summary
-        :summary-method="getSummaries">
-        <el-table-column type="index" label="序号" width="60" align="center">
-          <template #header>
-            <el-icon><List /></el-icon>
-          </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 !== '操作'"
-            :prop="col.prop" 
-            :label="col.label" 
-            show-overflow-tooltip
-            align="center">
+        <!-- 表格 -->
+        <el-table 
+          :data="state.dataList" 
+          v-loading="state.loading" 
+          stripe
+          :cell-style="tableStyle.cellStyle" 
+          :header-cell-style="tableStyle.headerCellStyle"
+          class="modern-table"
+          @sort-change="sortChangeHandle"
+          show-summary
+          :summary-method="getSummaries">
+          <el-table-column type="index" label="序号" width="70" align="center">
            <template #header>
-              <el-icon><component :is="columnConfigMap[col.prop]?.icon || Calendar" /></el-icon>
-              <span style="margin-left: 4px">{{ col.label }}</span>
+              <el-icon><List /></el-icon>
            </template>
+            <template #default="{ $index }">
+              {{ $index + 1 }}
+            </template>
+          </el-table-column>
+          <template v-for="col in visibleColumnsSorted" :key="col.prop || col.label">
+            <el-table-column 
+              v-if="checkColumnVisible(col.prop || '') && col.prop !== '操作'"
+              :prop="col.prop" 
+              :label="col.label" 
+              :width="col.width"
+              :min-width="col.minWidth"
+              :show-overflow-tooltip="col.showOverflowTooltip !== false"
+              :align="col.align || 'center'">
+              <template #header>
+                <el-icon v-if="col.icon"><component :is="col.icon" /></el-icon>
+                <span :style="{ marginLeft: col.icon ? '4px' : '0' }">{{ col.label }}</span>
+              </template>
            <!-- 层数列特殊模板 -->
            <template v-if="col.prop === 'layers'" #default="scope">
              <el-tag v-if="scope.row.layers" size="small" type="info" effect="plain">
@@ -159,35 +169,41 @@
            </template>
          </el-table-column>
        </template>
-        <el-table-column label="操作" width="150" align="center" fixed="right">
-          <template #header>
-            <el-icon><Setting /></el-icon>
-            <span style="margin-left: 4px">操作</span>
+          <el-table-column label="操作" width="150" align="center" fixed="right">
+            <template #header>
+              <el-icon><Setting /></el-icon>
+              <span style="margin-left: 4px">操作</span>
+            </template>
+            <template #default="scope">
+              <el-button 
+                icon="Edit" 
+                link
+                type="primary" 
+                @click="handleEdit(scope.row)">
+                编辑
+              </el-button>
+              <el-button 
+                icon="Delete" 
+                link
+                type="danger" 
+                @click="handleDelete(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+          <template #empty>
+            <el-empty description="暂无数据" :image-size="120" />
          </template>
-          <template #default="scope">
-            <el-button 
-              icon="Edit" 
-              text 
-              type="primary" 
-              @click="handleEdit(scope.row)">
-              编辑
-            </el-button>
-            <el-button 
-              icon="Delete" 
-              text 
-              type="danger" 
-              @click="handleDelete(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+        </el-table>

-      <!-- 分页 -->
-      <pagination 
-        @size-change="sizeChangeHandle" 
-        @current-change="currentChangeHandle" 
-        v-bind="state.pagination" />
+        <!-- 分页 -->
+        <div class="pagination-wrapper">
+          <pagination 
+            @size-change="sizeChangeHandle" 
+            @current-change="currentChangeHandle" 
+            v-bind="state.pagination" />
+        </div>
+      </el-card>
    </div>

    <!-- 编辑、新增  -->
@@ -199,8 +215,7 @@
 </template>

 <script setup lang="ts" name="DormBuilding">
-import { ref, reactive, defineAsyncComponent, computed, onMounted, nextTick } from 'vue'
-import { useRoute } from 'vue-router'
+import { ref, reactive, defineAsyncComponent, onMounted } from 'vue'
 import { BasicTableProps, useTable } from "/@/hooks/table";
 import { fetchList, delObjs } from "/@/api/stuwork/dormbuilding";
 import { useMessage, useMessageBox } from "/@/hooks/message";
@@ -209,145 +224,38 @@ import TableColumnControl from '/@/components/TableColumnControl/index.vue'
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 const EmptyRoomDialog = defineAsyncComponent(() => import('./emptyRoomDialog.vue'));
-import { List, OfficeBuilding, Grid, UserFilled, Setting, Menu, Calendar } from '@element-plus/icons-vue'
-import { getTableConfigFromLocal, saveTableConfigToLocal, updateUserTableConfig } from '/@/api/admin/usertable'
+import { List, OfficeBuilding, Grid, UserFilled, Setting, Menu, Calendar, Document } from '@element-plus/icons-vue'
+import { useTableColumnControl } from '/@/hooks/tableColumn'

 // 定义变量内容
-const route = useRoute()
 const formDialogRef = ref()
 const emptyRoomDialogRef = ref()
 const columnControlRef = ref<any>()

 // 表格列配置
 const tableColumns = [
-  { prop: 'buildingNo', label: '楼号' },
-  { prop: 'layers', label: '层数' },
-  { prop: 'allAlreadyNum', label: '已住人数' },
-  { prop: 'nowNum', label: '现住人数' },
-  { prop: 'surplusNum', label: '剩余可住人数' },
-  { prop: 'roomEmptyNum', label: '空宿舍数' },
-  { prop: 'roomEmptyNum5', label: '空5人宿舍数' },
-  { prop: 'roomEmptyNum4', label: '空4人宿舍数' },
-  { prop: 'roomEmptyNum3', label: '空3人宿舍数' },
-  { prop: 'roomEmptyNum2', label: '空2人宿舍数' },
-  { prop: 'roomEmptyNum1', label: '空1人宿舍数' },
-  { prop: 'phone', label: '电话' }
+  { prop: 'buildingNo', label: '楼号', icon: OfficeBuilding },
+  { prop: 'layers', label: '层数', icon: Grid },
+  { prop: 'allAlreadyNum', label: '已住人数', icon: UserFilled },
+  { prop: 'nowNum', label: '现住人数', icon: UserFilled },
+  { prop: 'surplusNum', label: '剩余可住人数', icon: UserFilled },
+  { prop: 'roomEmptyNum', label: '空宿舍数', icon: UserFilled },
+  { prop: 'roomEmptyNum5', label: '空5人宿舍数', icon: UserFilled },
+  { prop: 'roomEmptyNum4', label: '空4人宿舍数', icon: UserFilled },
+  { prop: 'roomEmptyNum3', label: '空3人宿舍数', icon: UserFilled },
+  { prop: 'roomEmptyNum2', label: '空2人宿舍数', icon: UserFilled },
+  { prop: 'roomEmptyNum1', label: '空1人宿舍数', icon: UserFilled },
+  { prop: 'phone', label: '电话', icon: Calendar }
 ]

-// 列配置映射（用于图标）
-const columnConfigMap: Record<string, { icon: any }> = {
-  buildingNo: { icon: OfficeBuilding },
-  layers: { icon: Grid },
-  allAlreadyNum: { icon: UserFilled },
-  nowNum: { icon: UserFilled },
-  surplusNum: { icon: UserFilled },
-  roomEmptyNum: { icon: UserFilled },
-  roomEmptyNum5: { icon: UserFilled },
-  roomEmptyNum4: { icon: UserFilled },
-  roomEmptyNum3: { icon: UserFilled },
-  roomEmptyNum2: { icon: UserFilled },
-  roomEmptyNum1: { icon: UserFilled },
-  phone: { icon: Calendar }
-}
-
-// 当前显示的列
-const visibleColumns = ref<string[]>([])
-// 列排序顺序
-const columnOrder = ref<string[]>([])
-
-// 从本地统一存储加载配置
-const loadSavedConfig = () => {
-  const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
-  const storageKey = `table-columns-${routePath}`
-  const savedConfig = getTableConfigFromLocal(storageKey)
-  
-  if (savedConfig && savedConfig.visibleColumns) {
-    const validColumns = tableColumns.map(col => col.prop || col.label)
-    const filteredSaved = savedConfig.visibleColumns.filter((col: string) => validColumns.includes(col))
-    visibleColumns.value = filteredSaved.length > 0 ? filteredSaved : validColumns
-  } else {
-    visibleColumns.value = tableColumns.map(col => col.prop || col.label)
-  }
-  
-  if (savedConfig && savedConfig.columnOrder) {
-    const validColumns = tableColumns.map(col => col.prop || col.label)
-    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.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
-  })
-  // 保存到本地统一存储
-  saveTableConfigToLocal(storageKey, { visibleColumns: selectableColumns })
-  // 异步保存到后端
-  updateUserTableConfig(storageKey, { visibleColumns: selectableColumns }).catch(() => {})
-}
-
-// 监听列排序变化
-const handleColumnOrderChange = (order: string[]) => {
-  columnOrder.value = order
-  const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
-  const storageKey = `table-columns-${routePath}`
-  // 保存到本地统一存储
-  saveTableConfigToLocal(storageKey, { columnOrder: order })
-  // 异步保存到后端
-  updateUserTableConfig(storageKey, { columnOrder: order }).catch(() => {})
-}
+// 使用表格列控制 Hook
+const {
+  visibleColumns,
+  visibleColumnsSorted,
+  checkColumnVisible,
+  handleColumnChange,
+  handleColumnOrderChange
+} = useTableColumnControl(tableColumns)

 // 搜索表单
 const searchForm = reactive({
@@ -442,10 +350,10 @@ const handleViewEmptyRoom = (row: any, roomType: string) => {

 // 初始化
 onMounted(() => {
-  nextTick(() => {
-    if (visibleColumns.value.length === 0) {
-      loadSavedConfig()
-    }
-  })
+  // Hook 会自动加载配置
 })
 </script>
+
+<style scoped lang="scss">
+@import '/@/assets/styles/modern-page.scss';
+</style>