bug修复,前端测试。
This commit is contained in:
+11
-11
@@ -1338,7 +1338,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>${s.num}</td>
|
<td>${s.num}</td>
|
||||||
<td>${s.name}</td>
|
<td>${s.name}</td>
|
||||||
<td><span class="tag ${s.sex === '男' ? 'tag-primary' : 'tag-warning'}">${s.sex}</span></td>
|
<td><span class="tag ${s.sex === 'm' ? 'tag-primary' : 'tag-warning'}">${s.sex === 'm' ? '男' : s.sex === 'f' ? '女' : s.sex}</span></td>
|
||||||
<td>班级${s.class_id}</td>
|
<td>班级${s.class_id}</td>
|
||||||
<td>${s.specialty || '-'}</td>
|
<td>${s.specialty || '-'}</td>
|
||||||
<td>${s.phone}</td>
|
<td>${s.phone}</td>
|
||||||
@@ -1494,9 +1494,9 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>${t.id}</td>
|
<td>${t.id}</td>
|
||||||
<td>${t.name}</td>
|
<td>${t.name}</td>
|
||||||
<td><span class="tag ${t.sex === '男' ? 'tag-primary' : t.sex === '女' ? 'tag-warning' : ''}">${t.sex}</span></td>
|
<td><span class="tag ${t.sex === 'm' ? 'tag-primary' : t.sex === 'f' ? 'tag-warning' : ''}">${t.sex === 'm' ? '男' : t.sex === 'f' ? '女' : t.sex}</span></td>
|
||||||
<td>${t.specialty || '-'}</td>
|
<td>${t.specialty || '-'}</td>
|
||||||
<td>${t.education || '-'}</td>
|
<td>${t.work_experience || '-'}</td>
|
||||||
<td>${t.collage || '-'}</td>
|
<td>${t.collage || '-'}</td>
|
||||||
<td>
|
<td>
|
||||||
<button class="btn btn-sm btn-outline">编辑</button>
|
<button class="btn btn-sm btn-outline">编辑</button>
|
||||||
@@ -1578,12 +1578,12 @@
|
|||||||
const tbody = document.getElementById('employment-tbody');
|
const tbody = document.getElementById('employment-tbody');
|
||||||
tbody.innerHTML = data.map(e => `
|
tbody.innerHTML = data.map(e => `
|
||||||
<tr>
|
<tr>
|
||||||
<td>${e.sname || '-'}</td>
|
<td>${e['学生姓名'] || '-'}</td>
|
||||||
<td>班级${e.class_id}</td>
|
<td>班级${e['学生班级编号'] || '-'}</td>
|
||||||
<td>${e.company_name || '-'}</td>
|
<td>${e['公司'] || '-'}</td>
|
||||||
<td>¥${(e.employment_salary || 0).toLocaleString()}</td>
|
<td>¥${(e['薪资'] || 0).toLocaleString()}</td>
|
||||||
<td>${e.offer_recived_time || '待定'}</td>
|
<td>${e['offer下发时间'] || '待定'}</td>
|
||||||
<td><span class="tag ${e.offer_recived_time ? 'tag-success' : 'tag-warning'}">${e.offer_recived_time ? '已就业' : '待就业'}</span></td>
|
<td><span class="tag ${e['offer下发时间'] ? 'tag-success' : 'tag-warning'}">${e['offer下发时间'] ? '已就业' : '待就业'}</span></td>
|
||||||
<td>
|
<td>
|
||||||
<button class="btn btn-sm btn-outline">编辑</button>
|
<button class="btn btn-sm btn-outline">编辑</button>
|
||||||
<button class="btn btn-sm btn-danger" onclick="deleteEmployment(${e.id})">删除</button>
|
<button class="btn btn-sm btn-danger" onclick="deleteEmployment(${e.id})">删除</button>
|
||||||
@@ -1595,8 +1595,8 @@
|
|||||||
function searchEmployment() {
|
function searchEmployment() {
|
||||||
const keyword = document.getElementById('employment-search').value.toLowerCase();
|
const keyword = document.getElementById('employment-search').value.toLowerCase();
|
||||||
const filtered = employmentData.filter(e =>
|
const filtered = employmentData.filter(e =>
|
||||||
(e.sname && e.sname.toLowerCase().includes(keyword)) ||
|
((e['学生姓名'] && e['学生姓名'].toLowerCase().includes(keyword)) ||
|
||||||
(e.company_name && e.company_name.toLowerCase().includes(keyword))
|
(e['公司'] && e['公司'].toLowerCase().includes(keyword)))
|
||||||
);
|
);
|
||||||
renderEmployment(filtered);
|
renderEmployment(filtered);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -150,12 +150,12 @@ def seed_test_data():
|
|||||||
education, class_id, advisor_id, phone, is_deleted)
|
education, class_id, advisor_id, phone, is_deleted)
|
||||||
VALUES (:num, :name, :age, :sex, :home_Place, :college,
|
VALUES (:num, :name, :age, :sex, :home_Place, :college,
|
||||||
:specialty, :enrollment_time, :graduate_time,
|
:specialty, :enrollment_time, :graduate_time,
|
||||||
'本科', :class_id, :advisor_id, :phone, 0)
|
'ben', :class_id, :advisor_id, :phone, 0)
|
||||||
"""), {
|
"""), {
|
||||||
"num": f"2024{1001 + i}",
|
"num": f"2024{1001 + i}",
|
||||||
"name": first_names[i],
|
"name": first_names[i],
|
||||||
"age": 18 + (i % 4),
|
"age": 18 + (i % 4),
|
||||||
"sex": "男" if i % 2 == 0 else "女",
|
"sex": "m" if i % 2 == 0 else "f",
|
||||||
"home_Place": home_places[i % 8],
|
"home_Place": home_places[i % 8],
|
||||||
"college": colleges[i % 8],
|
"college": colleges[i % 8],
|
||||||
"specialty": specialties[i % 4],
|
"specialty": specialties[i % 4],
|
||||||
|
|||||||
+5
-5
@@ -85,7 +85,7 @@ def get_emp_dao( #获取学生
|
|||||||
# ,page
|
# ,page
|
||||||
# ,page_size
|
# ,page_size
|
||||||
): #根据选择条件获取信息
|
): #根据选择条件获取信息
|
||||||
q = (db.query(Employments,Company.employment_company,Address.somewhere)
|
q = (db.query(Employments, Students.name, Company.employment_company, Address.somewhere)
|
||||||
.outerjoin(Students, Students.id == Employments.stuid)
|
.outerjoin(Students, Students.id == Employments.stuid)
|
||||||
.outerjoin(ClassInfo, ClassInfo.id == Employments.class_id)
|
.outerjoin(ClassInfo, ClassInfo.id == Employments.class_id)
|
||||||
.outerjoin(Company,Employments.company_id==Company.id)
|
.outerjoin(Company,Employments.company_id==Company.id)
|
||||||
@@ -118,17 +118,17 @@ def get_emp_dao( #获取学生
|
|||||||
r= q.all()
|
r= q.all()
|
||||||
if r:
|
if r:
|
||||||
return [ {"id": i.id,
|
return [ {"id": i.id,
|
||||||
'学生姓名':sname,
|
'学生姓名':sname or '-',
|
||||||
'学生班级编号':i.class_id,
|
'学生班级编号':i.class_id,
|
||||||
"公司": employment_company or '未就业',
|
"公司": employment_company or '未就业',
|
||||||
"公司区域":somewhere or '-',
|
"公司区域":somewhere or '-',
|
||||||
"薪资":i.employment_salary or '-',
|
"薪资":i.employment_salary or '-',
|
||||||
"就业开放时间":i.employment_open_time.strftime('%Y-%m-%d') ,
|
"就业开放时间":i.employment_open_time.strftime('%Y-%m-%d') if i.employment_open_time else '-',
|
||||||
"offer下发时间":i.offer_recived_time.strftime('%Y-%m-%d')
|
"offer下发时间":i.offer_recived_time.strftime('%Y-%m-%d') if i.offer_recived_time else '-'
|
||||||
# , "创建时间": i.create_time,
|
# , "创建时间": i.create_time,
|
||||||
# "更新时间": i.update_time,
|
# "更新时间": i.update_time,
|
||||||
# "是否删除":i.is_deleted
|
# "是否删除":i.is_deleted
|
||||||
} for i,sname,employment_company in r ] #返回信息列表
|
} for i,sname,employment_company,somewhere in r ] #返回信息列表
|
||||||
return {"code": 200, "totals": len(r), "data": r}
|
return {"code": 200, "totals": len(r), "data": r}
|
||||||
|
|
||||||
def delete_emp_dao(id,db): #删除函数
|
def delete_emp_dao(id,db): #删除函数
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# students_schema:请求、响应的模型框架
|
# students_schema:请求、响应的模型框架
|
||||||
|
|
||||||
from pydantic import BaseModel , Field , field_validator
|
from pydantic import BaseModel , Field
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import enum
|
import enum
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user