wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 选择器

Browse Source
This commit is contained in:
wangys
2025-10-30 17:59:04 +08:00
parent 2b252e1b3c
commit 0935ec5ec5
22 changed files with 2313 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
schoolNewsWeb/src/views/admin/manage/logs/OperationLogsView.vue
View File

@@ -276,10 +276,10 @@
</div>
</div>
<div class="detail-section" v-if="currentLog.responseResult">
<div class="detail-section" v-if="currentLog.responseData">
<h4 class="detail-title">响应结果</h4>
<div class="detail-content">
<pre class="code-block">{{ currentLog.responseResult }}</pre>
<pre class="code-block">{{ currentLog.responseData }}</pre>
</div>
</div>

354
schoolNewsWeb/src/views/admin/manage/study/TaskCard.vue Normal file
View File

@@ -0,0 +1,354 @@
<template>
<div class="task-card">
<!-- 卡片头部 -->
<div class="card-header">
<div class="header-content">
<h3 class="task-title">{{ task.learningTask.name }}</h3>
<div class="task-meta">
<!-- <div class="meta-item">
<img class="icon" src="@/assets/imgs/usermange.svg" alt="部门" />
<span class="meta-text">{{ getDeptName }}</span>
</div> -->
<div class="meta-item">
<img class="icon" src="@/assets/imgs/calendar-icon.svg" alt="日期" />
<span class="meta-text">截止: {{ formatDate(task.learningTask.endTime) }}</span>
</div>
</div>
</div>
<div class="status-badge" :class="getStatusClass(task.learningTask.status)">
{{ getStatusText(task.learningTask.status, task.learningTask.startTime, task.learningTask.endTime) }}
</div>
</div>
<!-- 统计信息 -->
<div class="card-stats">
<div class="stat-item">
<div class="stat-label">分配人数</div>
<div class="stat-value">{{ task.totalTaskNum || 0 }}</div>
</div>
<div class="stat-item stat-completed">
<div class="stat-label">已完成</div>
<div class="stat-value stat-value-completed">{{ task.completedTaskNum || 0 }}</div>
</div>
<div class="stat-item stat-rate">
<div class="stat-label">完成率</div>
<div class="stat-value stat-value-rate">{{ completionRate }}</div>
</div>
</div>
<!-- 进度条 -->
<div class="card-progress">
<div class="progress-header">
<span class="progress-label">完成进度</span>
<span class="progress-value">{{ completionRate }}</span>
</div>
<div class="progress-bar">
<div class="progress-fill" :style="{ width: completionRate }"></div>
</div>
</div>
<!-- 操作按钮 -->
<div class="card-footer">
<div class="card-actions">
<button class="btn-link btn-primary" @click="$emit('view', task)">查看</button>
<button class="btn-link btn-warning" @click="$emit('edit', task)" v-if="task.learningTask.status !== 1">编辑</button>
<button class="btn-link btn-success" @click="$emit('publish', task)" v-if="task.learningTask.status !== 1">发布</button>
<button class="btn-link btn-warning" @click="$emit('unpublish', task)" v-if="task.learningTask.status === 1">下架</button>
<button class="btn-link btn-primary" @click="$emit('statistics', task)" v-if="task.learningTask.status !== 0">统计</button>
<button class="btn-link btn-warning" @click="$emit('update-user', task)">修改人员</button>
<button class="btn-link btn-danger" @click="$emit('delete', task)" v-if="task.learningTask.status === 0">删除</button>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { computed } from 'vue';
import type { TaskVO } from '@/types/study';
interface Props {
task: TaskVO;
}
const props = defineProps<Props>();
defineEmits<{
view: [task: TaskVO];
edit: [task: TaskVO];
publish: [task: TaskVO];
unpublish: [task: TaskVO];
statistics: [task: TaskVO];
'update-user': [task: TaskVO];
delete: [task: TaskVO];
}>();
/**
* 获取部门名称
*/
// const getDeptName = computed(() => {
// if (props.task.taskUsers && props.task.taskUsers.length > 0) {
// const deptNames = new Set(props.task.taskUsers.map(u => u.deptName).filter(Boolean));
// if (deptNames.size === 0) return '全校';
// if (deptNames.size === 1) return Array.from(deptNames)[0] || '全校';
// return '多个部门';
// }
// return '全校';
// });
/**
* 格式化日期
*/
function formatDate(dateStr?: string): string {
if (!dateStr) return '-';
const date = new Date(dateStr);
return date.toLocaleDateString('zh-CN', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
}).replace(/\//g, '-');
}
/**
* 获取状态样式类
*/
function getStatusClass(status?: number): string {
switch (status) {
case 0:
return 'status-draft';
case 1:
return 'status-ongoing';
case 2:
return 'status-ended';
default:
return '';
}
}
/**
* 获取状态文本
*/
function getStatusText(status?: number, startTime?: string, endTime?: string): string {
if (status === 0) return '草稿';
if (status === 1) {
const now = new Date();
const start = new Date(startTime!);
const end = new Date(endTime!);
if (now >= start && now <= end) {
return '进行中';
} else if (now < start) {
return '未开始';
} else {
return '已结束';
}
}
if (status === 2) return '下架';
return '未知';
}
/**
* 计算完成率
*/
const completionRate = computed(() => {
const total = props.task.totalTaskNum || 0;
const completed = props.task.completedTaskNum || 0;
if (total === 0) return '0%';
const rate = Math.round((completed / total) * 100);
return `${rate}%`;
});
</script>
<style lang="scss" scoped>
.task-card {
background: #F9FAFB;
border: 1px solid rgba(0, 0, 0, 0.1);
border-radius: 14px;
padding: 24px;
display: flex;
flex-direction: column;
gap: 24px;
transition: all 0.3s;
&:hover {
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
}
}
// 卡片头部
.card-header {
display: flex;
justify-content: space-between;
gap: 16px;
}
.header-content {
flex: 1;
display: flex;
flex-direction: column;
gap: 8px;
}
.task-title {
font-size: 16px;
font-weight: 400;
line-height: 1.5em;
letter-spacing: -1.953125%;
color: #101828;
margin: 0;
}
.task-meta {
display: flex;
align-items: center;
gap: 16px;
}
.meta-item {
display: flex;
align-items: center;
gap: 4px;
.icon {
width: 16px;
height: 16px;
flex-shrink: 0;
}
.meta-text {
font-size: 14px;
font-weight: 400;
line-height: 1.428571em;
letter-spacing: -1.07421875%;
color: #4A5565;
}
}
.status-badge {
display: flex;
align-items: center;
justify-content: center;
padding: 2px 8px;
height: 22px;
border-radius: 8px;
font-size: 12px;
font-weight: 500;
line-height: 1.333333em;
white-space: nowrap;
&.status-draft {
background: #F4F4F5;
color: #909399;
border: 1px solid transparent;
}
&.status-ongoing {
background: #DBEAFE;
color: #1447E6;
border: 1px solid transparent;
}
&.status-ended {
background: #F0F9FF;
color: #409EFF;
border: 1px solid transparent;
}
}
// 统计信息
.card-stats {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 16px;
}
.stat-item {
background: #FFFFFF;
border-radius: 10px;
padding: 12px;
display: flex;
flex-direction: column;
gap: 4px;
}
.stat-label {
font-size: 14px;
font-weight: 400;
line-height: 1.428571em;
letter-spacing: -1.07421875%;
color: #4A5565;
}
.stat-value {
font-size: 20px;
font-weight: 400;
line-height: 1.4em;
letter-spacing: -2.24609375%;
color: #101828;
}
.stat-value-completed {
color: #00A63E;
}
.stat-value-rate {
color: #155DFC;
}
// 进度条
.card-progress {
display: flex;
flex-direction: column;
gap: 8px;
}
.progress-header {
display: flex;
justify-content: space-between;
align-items: center;
}
.progress-label {
font-size: 14px;
font-weight: 400;
line-height: 1.428571em;
letter-spacing: -1.07421875%;
color: #4A5565;
}
.progress-value {
font-size: 14px;
font-weight: 400;
line-height: 1.428571em;
letter-spacing: -1.07421875%;
color: #101828;
}
.progress-bar {
width: 100%;
height: 8px;
background: rgba(3, 2, 19, 0.2);
border-radius: 16777200px;
overflow: hidden;
}
.progress-fill {
height: 100%;
background: #030213;
border-radius: 16777200px;
transition: width 0.3s ease;
}
// 卡片底部
.card-footer {
padding-top: 16px;
border-top: 1px solid rgba(0, 0, 0, 0.05);
}
// 操作按钮
.card-actions {
display: flex;
justify-content: flex-end;
flex-wrap: wrap;
gap: 6px;
}
</style>

1169
schoolNewsWeb/src/views/admin/manage/study/TaskManageView.vue
View File

File diff suppressed because it is too large Load Diff

1
schoolNewsWeb/src/views/admin/manage/study/index.ts Normal file
View File

@@ -0,0 +1 @@
export { default as TaskCard } from './TaskCard.vue';

11
schoolNewsWeb/src/views/admin/manage/system/DeptManageView.vue
View File

@@ -409,7 +409,16 @@ function resetForm() {
// 获取所有可选角色的接口
async function fetchAllRoles() {
return await roleApi.getAllRoles();
const result = await roleApi.getAllRoles();
if (result.success && result.dataList) {
result.dataList = result.dataList.map(item => ({
roleID: item.roleID,
name: item.roleName, // roleName -> name
description: item.roleDescription // roleDescription -> description
}));
}
return result;
}
// 获取部门已绑定角色的接口

10
schoolNewsWeb/src/views/admin/manage/system/ModulePermissionManageView.vue
View File

@@ -638,7 +638,15 @@ async function fetchPermissionMenus() {
// 获取所有角色的接口
async function fetchAllRoles() {
return await roleApi.getAllRoles();
const result = await roleApi.getAllRoles();
if (result.success && result.dataList) {
result.dataList = result.dataList.map(item => ({
roleID: item.roleID,
name: item.roleName,
description: item.roleDescription
}));
}
return result;
}
// 获取权限已绑定角色的接口

12
schoolNewsWeb/src/views/admin/manage/system/RoleManageView.vue
View File

@@ -19,9 +19,9 @@
border
stripe
>
<el-table-column prop="name" label="角色名称" min-width="200" />
<el-table-column prop="roleName" label="角色名称" min-width="200" />
<el-table-column prop="roleID" label="角色ID" min-width="150" />
<el-table-column prop="description" label="角色描述" min-width="200" show-overflow-tooltip />
<el-table-column prop="roleDescription" label="角色描述" min-width="200" show-overflow-tooltip />
<el-table-column prop="creatorName" label="创建人" width="120" />
<el-table-column prop="createTime" label="创建时间" width="180" />
<el-table-column label="操作" width="280" fixed="right">
@@ -99,7 +99,7 @@
<!-- 绑定权限对话框 -->
<GenericSelector
v-model:visible="bindPermissionDialogVisible"
:title="`绑定权限 - ${currentRole?.name || ''}`"
:title="`绑定权限 - ${currentRole?.roleName || ''}`"
left-title="可选权限"
right-title="已选权限"
:fetch-available-api="fetchAllPermissions"
@@ -122,7 +122,7 @@
<script setup lang="ts">
import { roleApi } from '@/apis/system/role';
import { permissionApi } from '@/apis/system/permission';
import { SysRole, SysPermission } from '@/types';
import { SysRole, SysPermission, UserDeptRoleVO } from '@/types';
import { AdminLayout } from '@/views/admin';
import { GenericSelector } from '@/components/base';
@@ -134,7 +134,7 @@ import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus';
import { Plus } from '@element-plus/icons-vue';
// 数据状态
const roleList = ref<SysRole[]>([]);
const roleList = ref<UserDeptRoleVO[]>([]);
const loading = ref(false);
const submitting = ref(false);
@@ -142,7 +142,7 @@ const submitting = ref(false);
// 移除：改为由 GenericSelector 通过 API 加载
// const permissionList = ref<SysPermission[]>([]);
// const initialBoundPermissions = ref<SysPermission[]>([]);
const currentRole = ref<SysRole | null>(null);
const currentRole = ref<UserDeptRoleVO | null>(null);
// 对话框状态
const dialogVisible = ref(false);