Просмотр исходного кода

💊 修复等级筛选无效问题

快乐的梦鱼 недель назад: 3
Родитель
Сommit
d83a9ed2b8

+ 3 - 5
src/pages/collect/assessment/evaluation-form-list-block.vue

@@ -230,19 +230,17 @@ function selfAssessmentProgressLabel(progress: number | null | undefined) {
 
 async function loadSelfAssessmentAdminList(page: number, pageSize: number, searchText: string, dropDownValues: number[]) {
   const pv = dropDownValues?.[0];
-  const lv = dropDownValues?.[1];
-  const st = dropDownValues?.[2];
+  const st = dropDownValues?.[1];
   lastSelfAssessmentProgress.value = pv ?? -100;
-  lastSelfAssessmentLevel.value = lv ?? 0;
+  lastSelfAssessmentLevel.value = props.level ?? 0;
   const progress = pv != null && pv > -50 ? pv : undefined;
-  const level = lv != null && lv > 0 ? lv : undefined;
   const list = await AssessmentContentApi.getInheritorList({
     year: new Date().getFullYear(),
     page,
     pageSize,
     keywords: searchText?.trim() || undefined,
     progress,
-    level,
+    level: props.level ?? undefined,
     logStatus: st > 0 ? st : undefined,
   });
   return {

+ 14 - 3
src/scripts/UpdateScript/auth.mjs

@@ -77,7 +77,7 @@ async function tryRefreshToken() {
   refreshPromise = (async () => {
     try {
       const res = await axios.post(
-        `${constant.ServerUrl}/auth/refresh?identifier=${currentData.identifier}`,
+        `${constant.ServerUrl}auth/refresh?identifier=${currentData.identifier}`,
         { refreshToken: currentData.refreshToken },
         { responseType: 'json', validateStatus: () => true }
       );
@@ -90,7 +90,8 @@ async function tryRefreshToken() {
           currentData.refreshToken = res.data.data.refreshToken;
         await saveCurrentData();
         return true;
-      }
+      } else
+        return false;
     } catch {
       // 刷新失败
     }
@@ -104,7 +105,8 @@ async function tryRefreshToken() {
 }
 
 axiosInstance.interceptors.response.use((value) => {
-  if (value.data.success) return value.data;
+  if (value.data.success) 
+    return value.data;
   const err = value.data;
   err.__config = value.config;
   return Promise.reject(err);
@@ -158,6 +160,15 @@ export async function initAuth() {
       }
     } catch {
       console.log('未登录或登录已过期');
+      if (currentData.refreshToken) {
+        console.log('尝试刷新 token');
+        try {
+          const res = await tryRefreshToken();
+          console.log(res ? '刷新登录成功' : '刷新登录失败');  
+        } catch (e) {
+          console.error('刷新 token 失败', e);
+        }
+      }
     }
   } else {
     console.log('未登录');