Merge pull request 'dev' (#41) from dev into master

Reviewed-on: #41

.env.development

@@ -16,3 +16,9 @@ VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/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_BASEURL = "https://learn-archives-admin.23544.com/api"
+# #数据中心后台地址
+# VITE_API_USERCENTER_URL = "https://dcb.23544.com/api"

Dockerfiles/Dockerfile-production/Dockerfile

@@ -32,7 +32,7 @@ FROM m.daocloud.io/docker.io/library/nginx:alpine
 COPY --from=builder --chown=nginx:nginx /app/dist /usr/share/nginx/html
 
 # 复制 Nginx 配置
-COPY Dockerfiles/Dockerfile-staging/default.conf /etc/nginx/conf.d/default.conf
+COPY Dockerfiles/Dockerfile-production/default.conf /etc/nginx/conf.d/default.conf
 
 # 暴露端口
 EXPOSE 80

src/api/userCenter.ts

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

src/views/student/edit.vue

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

src/views/student/index.vue

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

src/views/teacher/edit.vue

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

src/views/teacher/index.vue

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