From 4736ba034d43acf92761fd913bf3025b0cb8e213 Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Wed, 20 Aug 2025 14:03:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../学生考核管理/学生考核管理数据库模型.sql | 16 ++++++++++------ .../xskh/classTeacherRewardRecord/index.vue | 8 +++++++- web/src/views/xskh/studentRewardRecord/index.vue | 8 +++++++- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/docs/设计文档/database/学生考核管理/学生考核管理数据库模型.sql b/docs/设计文档/database/学生考核管理/学生考核管理数据库模型.sql index b136c3c4..dc87992e 100644 --- a/docs/设计文档/database/学生考核管理/学生考核管理数据库模型.sql +++ b/docs/设计文档/database/学生考核管理/学生考核管理数据库模型.sql @@ -22,7 +22,7 @@ CREATE TABLE `xskh_discipline_type` ( `deleted` tinyint(1) DEFAULT 0 COMMENT '删除标志(0-未删除 1-已删除)', `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户ID', PRIMARY KEY (`id`), - UNIQUE KEY `uk_type_code` (`type_code`), + KEY `uk_type_code` (`type_code`), KEY `idx_type_category` (`type_category`), KEY `idx_status` (`status`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='学生违纪处分类型表'; @@ -107,7 +107,7 @@ CREATE TABLE `xskh_reward_type` ( `deleted` tinyint(1) DEFAULT 0 COMMENT '删除标志(0-未删除 1-已删除)', `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户ID', PRIMARY KEY (`id`), - UNIQUE KEY `uk_type_code` (`type_code`), + KEY `uk_type_code` (`type_code`), KEY `idx_status` (`status`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='学生奖励类型表'; @@ -161,7 +161,7 @@ CREATE TABLE `xskh_assessment_indicator_type` ( `deleted` tinyint(1) DEFAULT 0 COMMENT '删除标志(0-未删除 1-已删除)', `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户ID', PRIMARY KEY (`id`), - UNIQUE KEY `uk_type_code` (`type_code`), + KEY `uk_type_code` (`type_code`), KEY `idx_status` (`status`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='学生考核指标体系类型表'; @@ -206,7 +206,7 @@ CREATE TABLE `xskh_assessment_plan` ( `deleted` tinyint(1) DEFAULT 0 COMMENT '删除标志(0-未删除 1-已删除)', `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户ID', PRIMARY KEY (`id`), - UNIQUE KEY `uk_plan_code` (`plan_code`), + KEY `uk_plan_code` (`plan_code`), KEY `idx_status` (`status`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='学生考核方案表'; @@ -216,7 +216,9 @@ CREATE TABLE `xskh_assessment_plan_indicator` ( `id` bigint(20) NOT NULL COMMENT '主键ID', `plan_id` bigint(20) NOT NULL COMMENT '考核方案ID', `indicator_id` bigint(20) NOT NULL COMMENT '指标体系ID', + `max_score` decimal(5,2) NOT NULL COMMENT '最高分值', `weight` decimal(3,2) DEFAULT 1.00 COMMENT '权重', + `sort_order` int(4) DEFAULT 0 COMMENT '排序号', `create_by` bigint(20) DEFAULT NULL COMMENT '创建者', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_dept` bigint(20) DEFAULT NULL COMMENT '创建部门', @@ -305,7 +307,7 @@ CREATE TABLE `xskh_assessment_application` ( `deleted` tinyint(1) DEFAULT 0 COMMENT '删除标志(0-未删除 1-已删除)', `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户ID', PRIMARY KEY (`id`), - UNIQUE KEY `uk_schedule_student` (`schedule_id`, `student_id`), + KEY `uk_schedule_student` (`schedule_id`, `student_id`), KEY `idx_schedule_id` (`schedule_id`), KEY `idx_student_id` (`student_id`), KEY `idx_status` (`status`) @@ -333,7 +335,7 @@ CREATE TABLE `xskh_assessment_self_score` ( `deleted` tinyint(1) DEFAULT 0 COMMENT '删除标志(0-未删除 1-已删除)', `tenant_id` varchar(20) DEFAULT '000000' COMMENT '租户ID', PRIMARY KEY (`id`), - UNIQUE KEY `uk_application_indicator` (`application_id`, `indicator_id`), + KEY `uk_application_indicator` (`application_id`, `indicator_id`), KEY `idx_application_id` (`application_id`), KEY `idx_indicator_id` (`indicator_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='学生考核自评得分表'; @@ -348,6 +350,8 @@ CREATE TABLE `xskh_assessment_bonus` ( `bonus_score` decimal(5,2) NOT NULL COMMENT '附加分值', `evidence_file` varchar(500) DEFAULT NULL COMMENT '证明材料文件，ossIds，逗号分隔', `status` char(1) DEFAULT '1' COMMENT '状态(1-待审核 2-审核通过 3-审核拒绝)', + -- 审核得分 + `approval_score` decimal(5,2) DEFAULT 0.00 COMMENT '审核得分', `approval_by` bigint(20) DEFAULT NULL COMMENT '审核人ID', `approval_time` datetime DEFAULT NULL COMMENT '审核时间', `approval_remark` varchar(500) DEFAULT NULL COMMENT '审核备注', diff --git a/web/src/views/xskh/classTeacherRewardRecord/index.vue b/web/src/views/xskh/classTeacherRewardRecord/index.vue index aa710726..3f1006e2 100644 --- a/web/src/views/xskh/classTeacherRewardRecord/index.vue +++ b/web/src/views/xskh/classTeacherRewardRecord/index.vue @@ -487,7 +487,13 @@ onMounted(() => { /* 搜索按钮区域右对齐 */ .search-btn-container { - text-align: right; + display: flex; + justify-content: flex-end; + margin-top: 10px; + + .el-form-item { + margin-bottom: 0 !important; + } } /* 表格样式 */ diff --git a/web/src/views/xskh/studentRewardRecord/index.vue b/web/src/views/xskh/studentRewardRecord/index.vue index 61a8b9f6..d97b4423 100644 --- a/web/src/views/xskh/studentRewardRecord/index.vue +++ b/web/src/views/xskh/studentRewardRecord/index.vue @@ -495,7 +495,13 @@ onMounted(() => { /* 搜索按钮区域右对齐 */ .search-btn-container { - text-align: right; + display: flex; + justify-content: flex-end; + margin-top: 10px; + + .el-form-item { + margin-bottom: 0 !important; + } } /* 表格样式 */