完善修复内容
1. 添加系统LOGO 2. 导航栏新增用户中心 3. 修复新增账号的显示问题 4. 修复新增账号个人中心主页显示问题 5. 修改了一些提示信息
This commit is contained in:
parent
71417b58e9
commit
10e3ec0af3
|
|
@ -39,6 +39,7 @@
|
|||
<form method="post" action="{% url 'user_login' %}">
|
||||
{% csrf_token %}
|
||||
<div class="card-body">
|
||||
<img src="{% static 'images/logos/Galaxy Logo Dark.png' %}" alt="" style="width: 80px; height: 80px;">
|
||||
<h4 class="mb-3 f-w-400">欢迎登录 星环集团 数字化管理系统</h4>
|
||||
<div class="form-group mb-2">
|
||||
<label class="form-label" for="id_username">邮箱</label>
|
||||
|
|
|
|||
|
|
@ -538,11 +538,11 @@ function fetchEmployeeList() {
|
|||
`;
|
||||
});
|
||||
} else {
|
||||
alert("获取员工列表失败：" + data.message);
|
||||
showAlert('danger', '获取员工列表失败');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
showAlert('danger', '获取员工列表时出错:' + error);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -565,16 +565,16 @@ document.getElementById('createAccountProfiles').addEventListener('click', funct
|
|||
.then(data => {
|
||||
if(data.success) {
|
||||
// 处理成功逻辑
|
||||
alert(data.message);
|
||||
showAlert('success', '账户创建成功');
|
||||
$('#createAccountProfileModal').modal('hide');
|
||||
fetchEmployeeList(); // 刷新员工列表
|
||||
} else {
|
||||
// 处理失败逻辑
|
||||
alert(data.message);
|
||||
showAlert('danger', '账户创建失败');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
showAlert('danger', '账户创建时出错:' + error);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -525,7 +525,7 @@ def user_homepage_view(request):
|
|||
on_duty_days = (date.today() - employee_information.entry_date).days
|
||||
# 查询年假使用表中的年假剩余天数
|
||||
try:
|
||||
annual_leave_records = AnnualLeaveRecord.objects.get(employee_name__icontains=employee_information.name)
|
||||
annual_leave_records = AnnualLeaveRecord.objects.get(employee=employee_information)
|
||||
remaining_annual_leave = annual_leave_records.remaining_annual_leave
|
||||
used_annual_leave = annual_leave_records.used_annual_leave
|
||||
except AnnualLeaveRecord.DoesNotExist:
|
||||
|
|
@ -534,7 +534,7 @@ def user_homepage_view(request):
|
|||
|
||||
# 查询员工业绩目标表的sales_target，和项目台账的关于这个人今年状态为已完成所有项目的标的金额，用标的金额除以目标表的sales_target得到完成率
|
||||
try:
|
||||
employee_performance = EmployeePerformanceTarget.objects.get(name=employee_information.name)
|
||||
employee_performance = EmployeePerformanceTarget.objects.get(name=employee_information.employee_id)
|
||||
performance_target = employee_performance.sales_target
|
||||
except EmployeePerformanceTarget.DoesNotExist:
|
||||
performance_target = 0
|
||||
|
|
@ -545,18 +545,19 @@ def user_homepage_view(request):
|
|||
end_date = f"{current_year}-12-31"
|
||||
|
||||
try:
|
||||
# 查询今年完成的项目
|
||||
# 查询今年进行中的项目
|
||||
ongoing_projects = ProjectLedger.objects.filter(
|
||||
Q(project_leader=employee_information.name) | Q(project_members__contains=employee_information.name),
|
||||
Q(project_leader=employee_information) | Q(project_members=employee_information),
|
||||
project_status='进行中',
|
||||
end_date__range=[start_date, end_date]
|
||||
)
|
||||
).distinct()
|
||||
|
||||
# 查询今年已完成的项目
|
||||
completed_projects = ProjectLedger.objects.filter(
|
||||
Q(project_leader=employee_information.name) | Q(project_members__contains=employee_information.name),
|
||||
Q(project_leader=employee_information) | Q(project_members=employee_information),
|
||||
project_status='完成',
|
||||
end_date__range=[start_date, end_date]
|
||||
)
|
||||
).distinct()
|
||||
|
||||
ongoing_project_count = ongoing_projects.count()
|
||||
completed_project_count = completed_projects.count()
|
||||
|
|
@ -648,7 +649,8 @@ def create_account_profile(request):
|
|||
user = User.objects.create_user(
|
||||
username=username,
|
||||
email=employee_information.email,
|
||||
password=password
|
||||
password=password,
|
||||
last_name=employee_information.name
|
||||
)
|
||||
|
||||
# 创建新的AccountProfile实例
|
||||
|
|
|
|||
|
|
@ -769,9 +769,17 @@ def emp_list_for_create_account_profile(request):
|
|||
page_obj = paginator.get_page(page_number)
|
||||
|
||||
# 创建员工信息的列表，包含需要的字段
|
||||
employees = list(page_obj.object_list.values(
|
||||
'employee_id', 'name', 'email', 'mobile_number', 'primary_department', 'position'
|
||||
))
|
||||
employees = [
|
||||
{
|
||||
'employee_id': emp.employee_id,
|
||||
'name': emp.name,
|
||||
'email': emp.email,
|
||||
'mobile_number': emp.mobile_number,
|
||||
'primary_department': emp.primary_department.department_name if emp.primary_department else '',
|
||||
'position': emp.position.position_name if emp.position else ''
|
||||
}
|
||||
for emp in page_obj.object_list
|
||||
]
|
||||
|
||||
# 返回JSON响应
|
||||
return JsonResponse({
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 416 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
|
|
@ -83,6 +83,27 @@
|
|||
.pcoded-navbar .pcoded-inner-navbar > li> a.active:after {
|
||||
background: linear-gradient(-45deg, #19BCBF, #149698);
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
display: flex;
|
||||
align-items: center; /* 垂直居中对齐 */
|
||||
}
|
||||
|
||||
.brand-container {
|
||||
display: flex;
|
||||
align-items: center; /* 垂直居中对齐 */
|
||||
margin-right: 10px; /* 根据需要调整间距 */
|
||||
}
|
||||
|
||||
.logo, .logo-thumb {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
}
|
||||
|
||||
.brand-title {
|
||||
color: white;
|
||||
margin: 0; /* 移除默认的外边距 */
|
||||
}
|
||||
</style>
|
||||
<!-- 必备JS -->
|
||||
<script src="{% static 'js/jquery.com_jquery-3.6.0.js' %}"></script>
|
||||
|
|
@ -103,19 +124,27 @@
|
|||
<!-- [ 导航菜单 ] 开始 -->
|
||||
<nav class="pcoded-navbar menupos-fixed menu-dark menu-item-icon-style6 ">
|
||||
<div class="navbar-wrapper ">
|
||||
<div class="navbar-brand header-logo">
|
||||
<a href="{% url 'index' %}" class="b-brand">
|
||||
<img src="{% static 'images/logo.svg' %}" alt="logo" class="logo images">
|
||||
<img src="{% static 'images/logo-icon.svg' %}" alt="logo" class="logo-thumb images">
|
||||
</a>
|
||||
<a class="mobile-menu" id="mobile-collapse" href="#"><span></span></a>
|
||||
</div>
|
||||
<div class="navbar-brand header-logo">
|
||||
<a href="{% url 'index' %}" class="b-brand brand-container">
|
||||
<img src="{% static 'images/logos/Galaxy Logo White.png' %}" alt="logo" class="logo images">
|
||||
<img src="{% static 'images/logos/Galaxy Logo White.png' %}" alt="logo" class="logo-thumb images">
|
||||
</a>
|
||||
<h5 class="brand-title">星环集团</h5>
|
||||
<a class="mobile-menu" id="mobile-collapse" href="#"><span></span></a>
|
||||
</div>
|
||||
<div class="navbar-content scroll-div" id="layout-sidenav">
|
||||
<ul class="nav pcoded-inner-navbar sidenav-inner">
|
||||
<li class="nav-item pcoded-menu-caption">
|
||||
<label>视图数据</label>
|
||||
</li>
|
||||
|
||||
<li data-username="" class="nav-item pcoded-hasmenu">
|
||||
<a href="#" class="nav-link"><span class="pcoded-micon">
|
||||
<i class="feather icon-home"></i></span><span class="pcoded-mtext">视图</span></a>
|
||||
<ul class="pcoded-submenu">
|
||||
<li><a href="{% url 'user_homepage' %}" >用户中心</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
{% if request.user|is_in_group:"董事会、总经办" %}
|
||||
<li data-username="" class="nav-item pcoded-hasmenu">
|
||||
<a href="#" class="nav-link"><span class="pcoded-micon">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
{% block content %}
|
||||
{% if error %}
|
||||
<div class="pcoded-main-container mt-4">
|
||||
<h1>用户信息异常</h1>
|
||||
{% include 'error_page.html' %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="pcoded-main-container">
|
||||
|
|
|
|||
Loading…
Reference in New Issue