dev #41

Merged
hy merged 2 commits from dev into master 2026-04-21 16:51:00 +08:00
6 changed files with 14 additions and 21 deletions
Showing only changes of commit f64a46710c - Show all commits

View File

@ -8,11 +8,17 @@ VITE_PUBLIC_PATH = /
VITE_ROUTER_HISTORY = "hash" VITE_ROUTER_HISTORY = "hash"
# 接口地址 # 接口地址
VITE_API_BASEURL = "http://192.168.2.33:5199/api" # VITE_API_BASEURL = "http://192.168.2.33:5199/api"
#数据中心后台地址 # #数据中心后台地址
VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api" # VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api"
# # 接口地址 # # 接口地址
# VITE_API_BASEURL = "https://learn-archives-admin-dev.23544.com/api" # VITE_API_BASEURL = "https://learn-archives-admin-dev.23544.com/api"
# #数据中心后台地址 # #数据中心后台地址
# VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api" # VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api"
# 接口地址
VITE_API_BASEURL = "https://learn-archives-admin.23544.com/api"
#数据中心后台地址
VITE_API_USERCENTER_URL = "https://dcb.23544.com/api"

View File

@ -204,7 +204,7 @@ export interface Position {
subjectName: string; subjectName: string;
positionType: number; positionType: number;
positionLevel: number; positionLevel: number;
status: boolean; status: number;
classList?: ComboModel[]; classList?: ComboModel[];
} }

View File

@ -649,7 +649,7 @@ const fetchFormData = async () => {
} }
let sInfo = await StudentInfo(props.id); let sInfo = await StudentInfo(props.id);
positionList.value = res.data.positions positionList.value = res.data.positions
.filter((s: Position) => s.enable) .filter((s: Position) => s.enable && s.status == 1)
.map((s: Position) => { .map((s: Position) => {
if (s.positionLevel > 2) if (s.positionLevel > 2)
s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届"; s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
@ -680,12 +680,6 @@ const fetchFormData = async () => {
positionList: positionList.value, positionList: positionList.value,
...sInfo.data, ...sInfo.data,
}); });
positionList.value = res.data.positions
.filter((s: Position) => s.enable)
.map((s: Position) => {
s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
return s;
});
PositionFormIds.value = res.data.positions PositionFormIds.value = res.data.positions
.filter((s: Position) => s.enable) .filter((s: Position) => s.enable)
.map((s: any) => s.id); .map((s: any) => s.id);

View File

@ -638,7 +638,7 @@ const PositionsSort = (arr: Position[]) => {
return 1; return 1;
} }
}); });
return arr.filter((s) => s.enable); return arr.filter((s) => s.enable && s.status == 1);
}; };
const handleReloadPaged = (event?: any, searchUnUse?: boolean) => { const handleReloadPaged = (event?: any, searchUnUse?: boolean) => {

View File

@ -493,7 +493,7 @@ const fetchFormData = () => {
} }
positionList.value = res.data.positions positionList.value = res.data.positions
.filter((s: Position) => s.enable) .filter((s: Position) => s.enable && s.status == 1)
.map((s: Position) => { .map((s: Position) => {
if (s.positionLevel > 2) if (s.positionLevel > 2)
s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届"; s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
@ -522,13 +522,6 @@ const fetchFormData = () => {
pointPenSN: res.data.pointPenSN, pointPenSN: res.data.pointPenSN,
positionList: positionList.value ?? [], positionList: positionList.value ?? [],
}); });
positionList.value = res.data.positions
.filter((s: Position) => s.enable)
.map((s: Position) => {
if (s.positionLevel > 2)
s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
return s;
});
PositionFormIds.value = res.data.positions PositionFormIds.value = res.data.positions
.filter((s: Position) => s.enable) .filter((s: Position) => s.enable)
.map((s: any) => s.id); .map((s: any) => s.id);

View File

@ -618,7 +618,7 @@ const PositionsSort = (arr: Position[]) => {
return 1; return 1;
} }
}); });
return arr.filter((s) => s.enable); return arr.filter((s) => s.enable && s.status == 1);
}; };
function searchReload() { function searchReload() {