add fiel
This commit is contained in:
@@ -99,6 +99,23 @@
|
||||
class="ml10 mr20"
|
||||
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>
|
||||
@@ -115,167 +132,91 @@
|
||||
<el-icon><List /></el-icon>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="schoolYear" label="学年" show-overflow-tooltip align="center">
|
||||
<el-table-column
|
||||
v-for="col in visibleColumnsSorted"
|
||||
:key="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><Calendar /></el-icon>
|
||||
<span style="margin-left: 4px">学年</span>
|
||||
<el-icon v-if="col.icon"><component :is="col.icon" /></el-icon>
|
||||
<span :style="{ marginLeft: col.icon ? '4px' : '0' }">{{ col.label }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="schoolTerm" label="学期" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><Clock /></el-icon>
|
||||
<span style="margin-left: 4px">学期</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-if="col.prop === 'schoolTerm'">
|
||||
<el-tag size="small" type="primary" effect="plain">
|
||||
{{ formatSchoolTerm(scope.row.schoolTerm) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="classNo" label="班号" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><Grid /></el-icon>
|
||||
<span style="margin-left: 4px">班号</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalCnt" label="总人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><UserFilled /></el-icon>
|
||||
<span style="margin-left: 4px">总人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'totalCnt'">
|
||||
<el-tag v-if="scope.row.totalCnt" size="small" type="success" effect="plain">
|
||||
{{ scope.row.totalCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="boyCnt" label="男生人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><Male /></el-icon>
|
||||
<span style="margin-left: 4px">男生人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'boyCnt'">
|
||||
<el-tag v-if="scope.row.boyCnt" size="small" type="primary" effect="plain">
|
||||
{{ scope.row.boyCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="girlCnt" label="女生人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><Female /></el-icon>
|
||||
<span style="margin-left: 4px">女生人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'girlCnt'">
|
||||
<el-tag v-if="scope.row.girlCnt" size="small" type="danger" effect="plain">
|
||||
{{ scope.row.girlCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="boyDormCnt" label="男(住宿)" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><House /></el-icon>
|
||||
<span style="margin-left: 4px">男(住宿)</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'boyDormCnt'">
|
||||
<el-tag v-if="scope.row.boyDormCnt" size="small" type="info" effect="plain">
|
||||
{{ scope.row.boyDormCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="girlDormCnt" label="女(住宿)" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><House /></el-icon>
|
||||
<span style="margin-left: 4px">女(住宿)</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'girlDormCnt'">
|
||||
<el-tag v-if="scope.row.girlDormCnt" size="small" type="info" effect="plain">
|
||||
{{ scope.row.girlDormCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="keepSchoolCnt" label="留校察看人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><Warning /></el-icon>
|
||||
<span style="margin-left: 4px">留校察看人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'keepSchoolCnt'">
|
||||
<el-tag v-if="scope.row.keepSchoolCnt" size="small" type="warning" effect="plain">
|
||||
{{ scope.row.keepSchoolCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="gigCnt" label="记过人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><Warning /></el-icon>
|
||||
<span style="margin-left: 4px">记过人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'gigCnt'">
|
||||
<el-tag v-if="scope.row.gigCnt" size="small" type="warning" effect="plain">
|
||||
{{ scope.row.gigCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="seriousWarningCnt" label="严重警告人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><Warning /></el-icon>
|
||||
<span style="margin-left: 4px">严重警告人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'seriousWarningCnt'">
|
||||
<el-tag v-if="scope.row.seriousWarningCnt" size="small" type="warning" effect="plain">
|
||||
{{ scope.row.seriousWarningCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="warningCnt" label="警告人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><Warning /></el-icon>
|
||||
<span style="margin-left: 4px">警告人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'warningCnt'">
|
||||
<el-tag v-if="scope.row.warningCnt" size="small" type="warning" effect="plain">
|
||||
{{ scope.row.warningCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="revokeCnt" label="撤销处分人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><CircleCheck /></el-icon>
|
||||
<span style="margin-left: 4px">撤销处分人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'revokeCnt'">
|
||||
<el-tag v-if="scope.row.revokeCnt" size="small" type="success" effect="plain">
|
||||
{{ scope.row.revokeCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="dropCnt" label="退学人数" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><UserFilled /></el-icon>
|
||||
<span style="margin-left: 4px">退学人数</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'dropCnt'">
|
||||
<el-tag v-if="scope.row.dropCnt" size="small" type="danger" effect="plain">
|
||||
{{ scope.row.dropCnt }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="status" label="状态" show-overflow-tooltip align="center">
|
||||
<template #header>
|
||||
<el-icon><CircleCheck /></el-icon>
|
||||
<span style="margin-left: 4px">状态</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<template #default="scope" v-else-if="col.prop === 'status'">
|
||||
<el-tag size="small" :type="scope.row.status === '1' ? 'success' : 'warning'" effect="plain">
|
||||
{{ formatStatus(scope.row.status) }}
|
||||
</el-tag>
|
||||
@@ -328,7 +269,8 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts" name="ClassSummary">
|
||||
import { reactive, ref, onMounted } from 'vue'
|
||||
import { reactive, ref, onMounted, computed } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { BasicTableProps, useTable } from "/@/hooks/table";
|
||||
import { fetchList, delObj } from "/@/api/stuwork/classsummary";
|
||||
import { getTeachDept } from "/@/api/basic/basicdept";
|
||||
@@ -336,14 +278,17 @@ import { queryAllSchoolYear } from "/@/api/basic/basicyear";
|
||||
import { getClassListByRole } from "/@/api/basic/basicclass";
|
||||
import { getDicts } from "/@/api/admin/dict";
|
||||
import { useMessage, useMessageBox } from "/@/hooks/message";
|
||||
import TableColumnControl from '/@/components/TableColumnControl/index.vue'
|
||||
import FormDialog from './form.vue'
|
||||
import DetailDialog from './detail.vue'
|
||||
import { List, Calendar, Clock, Grid, UserFilled, Male, Female, House, Warning, CircleCheck, Setting } from '@element-plus/icons-vue'
|
||||
import { List, Calendar, Clock, Grid, UserFilled, Male, Female, House, Warning, CircleCheck, Setting, Menu } from '@element-plus/icons-vue'
|
||||
|
||||
// 定义变量内容
|
||||
const route = useRoute()
|
||||
const formDialogRef = ref()
|
||||
const detailDialogRef = ref()
|
||||
const searchFormRef = ref()
|
||||
const columnControlRef = ref()
|
||||
const showSearch = ref(true)
|
||||
const schoolYearList = ref<any[]>([])
|
||||
const schoolTermList = ref<any[]>([])
|
||||
@@ -351,6 +296,119 @@ const deptList = ref<any[]>([])
|
||||
const classList = ref<any[]>([])
|
||||
const statusList = ref<any[]>([])
|
||||
|
||||
// 表格列配置
|
||||
const tableColumns = [
|
||||
{ prop: 'schoolYear', label: '学年', icon: Calendar },
|
||||
{ prop: 'schoolTerm', label: '学期', icon: Clock },
|
||||
{ prop: 'classNo', label: '班号', icon: Grid },
|
||||
{ prop: 'totalCnt', label: '总人数', icon: UserFilled },
|
||||
{ prop: 'boyCnt', label: '男生人数', icon: Male },
|
||||
{ prop: 'girlCnt', label: '女生人数', icon: Female },
|
||||
{ prop: 'boyDormCnt', label: '男(住宿)', icon: House },
|
||||
{ prop: 'girlDormCnt', label: '女(住宿)', icon: House },
|
||||
{ prop: 'keepSchoolCnt', label: '留校察看人数', icon: Warning },
|
||||
{ prop: 'gigCnt', label: '记过人数', icon: Warning },
|
||||
{ prop: 'seriousWarningCnt', label: '严重警告人数', icon: Warning },
|
||||
{ prop: 'warningCnt', label: '警告人数', icon: Warning },
|
||||
{ prop: 'revokeCnt', label: '撤销处分人数', icon: CircleCheck },
|
||||
{ prop: 'dropCnt', label: '退学人数', icon: UserFilled },
|
||||
{ prop: 'status', label: '状态', icon: CircleCheck }
|
||||
]
|
||||
|
||||
// 当前显示的列
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
// 列变化处理
|
||||
const handleColumnChange = (value: string[]) => {
|
||||
visibleColumns.value = value
|
||||
const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
|
||||
const storageKey = `table-columns-${routePath}`
|
||||
const selectableColumns = value.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}`
|
||||
localStorage.setItem(`${storageKey}-order`, JSON.stringify(order))
|
||||
}
|
||||
|
||||
// 排序后的表格列
|
||||
const visibleColumnsSorted = computed(() => {
|
||||
const columns = tableColumns.filter(col => {
|
||||
const key = col.prop || col.label
|
||||
return visibleColumns.value.includes(key)
|
||||
})
|
||||
|
||||
if (columnOrder.value.length > 0) {
|
||||
const orderedColumns: any[] = []
|
||||
const unorderedColumns: any[] = []
|
||||
|
||||
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
|
||||
})
|
||||
|
||||
// 配置 useTable
|
||||
const state: BasicTableProps = reactive<BasicTableProps>({
|
||||
queryForm: {
|
||||
@@ -438,7 +496,6 @@ const getSchoolYearList = async () => {
|
||||
schoolYearList.value = []
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('获取学年列表失败', err)
|
||||
schoolYearList.value = []
|
||||
}
|
||||
}
|
||||
@@ -456,7 +513,6 @@ const getSchoolTermDict = async () => {
|
||||
schoolTermList.value = []
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('获取学期字典失败', err)
|
||||
schoolTermList.value = []
|
||||
}
|
||||
}
|
||||
@@ -471,7 +527,6 @@ const getDeptListData = async () => {
|
||||
deptList.value = []
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('获取开课部门列表失败', err)
|
||||
deptList.value = []
|
||||
}
|
||||
}
|
||||
@@ -486,7 +541,6 @@ const getClassListData = async () => {
|
||||
classList.value = []
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('获取班号列表失败', err)
|
||||
classList.value = []
|
||||
}
|
||||
}
|
||||
@@ -504,12 +558,12 @@ const getStatusDict = async () => {
|
||||
statusList.value = []
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('获取状态字典失败', err)
|
||||
statusList.value = []
|
||||
}
|
||||
}
|
||||
|
||||
// 初始化
|
||||
loadSavedConfig()
|
||||
onMounted(() => {
|
||||
getSchoolYearList()
|
||||
getSchoolTermDict()
|
||||
|
||||
Reference in New Issue
Block a user