fix(plugins/score): 修复了会造成历年学期课表无法使用的 bug

Author: frederick-wang

src/plugins/list.ts

@@ -4,7 +4,7 @@ import { Tooltip } from '@/plugins/tooltip'
 import { RecoverRememberMe } from '@/plugins/recover-remember-me'
 import { Rearrange } from '@/plugins/rearrange'
 import { Score } from '@/plugins/score'
-import { SubitemScore } from '@/plugins/subitem-score'
+// import { SubitemScore } from '@/plugins/subitem-score'
 // import { TrainingScheme } from '@/plugins/training-scheme'
 // import { UserExperienceImprovementProgram } from '@/plugins/user-experience-improvement-program'
 import { DataAnalysis } from '@/plugins/data-analysis'
@@ -30,7 +30,7 @@ const optionalPluginsLogined = [
   FastEvaluation,
   textbookSelection,
   Score,
-  SubitemScore,
+  // SubitemScore,
   // 之所以放到中间，是因为菜单的渲染顺序是和数组中的顺序一致的
   // 需要将「设置」菜单和「帮助」菜单放到最后
   ...(isSCU() ? optionalPluginsLoginedOnlySCU : []),

src/plugins/score/ExpectedGradesEstimation.vue

@@ -235,7 +235,7 @@ export default class ExpectedGradeEstimation extends Vue {
   }
 
   get hasNoError(): boolean {
-    return this.alerts.every((v) => v.type !== 'error')
+    return this.alerts.every(v => v.type !== 'error')
   }
 
   get allCourses(): CourseScoreRecord[] {
@@ -384,15 +384,15 @@ export default class ExpectedGradeEstimation extends Vue {
     this.newCourses[index].compulsoryGPA =
       getPointByScore(
         this.newCourses[index].compulsoryScore,
-        state.user.semesterNumberList[0]
+        state.basic.currentSemesterNumber
       ) || 0
   }
 
   onOptionalScoreChange(index: number): void {
     this.newCourses[index].optionalGPA =
       getPointByScore(
         this.newCourses[index].optionalScore,
-        state.user.semesterNumberList[0]
+        state.basic.currentSemesterNumber
       ) || 0
   }
 }

src/store/actions/index.ts

@@ -3,8 +3,8 @@ import {
   // requestTrainingSchemeList,
   // requestTrainingScheme,
   // requestBachelorDegree,
-  requestCourseSchedule,
-  requestStudentSemesterNumberList
+  requestCourseSchedule
+  // requestStudentSemesterNumberList
   // requestScuUietpList,
   // requestAccessToken
 } from './request'
@@ -40,8 +40,8 @@ const actions = {
   // [Request.TRAINING_SCHEME_LIST]: requestTrainingSchemeList,
   // [Request.TRAINING_SCHEME]: requestTrainingScheme,
   // [Request.BACHELOR_DEGREE]: requestBachelorDegree,
-  [Request.COURSE_SCHEDULE]: requestCourseSchedule,
-  [Request.STUDENT_SEMESTER_CODE_LIST]: requestStudentSemesterNumberList
+  [Request.COURSE_SCHEDULE]: requestCourseSchedule
+  // [Request.STUDENT_SEMESTER_CODE_LIST]: requestStudentSemesterNumberList
   // [Request.SCU_UIETP_LIST]: requestScuUietpList,
   // [Request.ACCESS_TOKEN]: requestAccessToken,
   // [Submit.COURSE_SCORE_PUBLIC_INFO]: submitCourseScorePublicInfo,

src/store/actions/request.ts

@@ -153,14 +153,20 @@ const requestTeachingEvaluationPageHTML = async (
   return html
 }
 
-async function requestStudentSemesterNumberList(): Promise<string[]> {
-  const url = '/student/courseSelect/calendarSemesterCurriculum/index'
-  const rawHTML = await getPageHTML(url)
-  const codeList = Array.from($('#planCode', rawHTML).find('option')).map(
-    v => $(v).val() as string
-  )
-  return codeList
-}
+/**
+ * 获取学生自入学到现在全部的执行教学计划号列表
+ * NOTE: 2022-2-21 废弃此方法，会造成「历年学期课表」功能无法正常使用，报错「非法请求」
+ *
+ * @returns 执行教学计划号列表
+ */
+// async function requestStudentSemesterNumberList(): Promise<string[]> {
+//   const url = '/student/courseSelect/calendarSemesterCurriculum/index'
+//   const rawHTML = await getPageHTML(url)
+//   const codeList = Array.from($('#planCode', rawHTML).find('option')).map(
+//     v => $(v).val() as string
+//   )
+//   return codeList
+// }
 
 async function requestStudentInfo(): Promise<Map<string, string>> {
   const url = '/student/rollManagement/rollInfo/index'
@@ -827,7 +833,6 @@ export {
   // requestTrainingSchemeList,
   // requestTrainingScheme,
   requestCourseSchedule,
-  requestStudentSemesterNumberList,
   requestStudentInfo
   // requestScuUietpList,
   // requestBachelorDegree,

src/store/state.ts

@@ -8,8 +8,6 @@ import { allList as pluginList } from '@/plugins'
 import { convertSemesterNumberToName } from '@/helper/converter'
 import { getUserId } from '@/helper/getter'
 import { Num } from '@/helper/util'
-// import { isSCU } from '@/helper/judger'
-// import { notifyError } from '@/helper/util'
 
 const { version } = pack
 
@@ -22,7 +20,6 @@ interface AcademicInfo {
 }
 let academicInfo: AcademicInfo
 let studentInfos: Map<string, string>
-let userSemesterNumberList: string[]
 // let accessToken: string
 const data = {} as {
   [key: string]: unknown
@@ -61,30 +58,16 @@ async function init(localStore: LocalStore): Promise<void> {
   await initPluginEnabledStates()
   const res = await Promise.all([
     actions[Request.CURRENT_SEMESTER_STUDENT_ACADEMIC_INFO](),
-    requestStudentInfo(),
-    actions[Request.STUDENT_SEMESTER_CODE_LIST]()
+    requestStudentInfo()
   ])
   academicInfo = res[0]
   studentInfos = res[1]
-  userSemesterNumberList = res[2]
-  // if (isSCU()) {
-  //   try {
-  //     accessToken = (await actions[Request.ACCESS_TOKEN]()).accessToken
-  //   } catch (error) {
-  //     notifyError(
-  //       '获取accessToken失败，以下插件将无法使用：专业授位查询、培养方案相关、历届大创查询、课程评价。您可以尝试刷新页面，也许能解决问题。',
-  //       '[初始化错误] 获取accessToken失败'
-  //     )
-  //   }
-  // }
 }
 
 type User = {
   id: string
-  // accessToken: string
   programPlanNumber: number
   programPlanName: string
-  semesterNumberList: string[]
   courseNumber: number
   gpa: number
   currentSemesterCourseNumber: number
@@ -112,10 +95,8 @@ export default {
   get user(): User {
     return {
       id: getUserId(studentInfos),
-      // accessToken,
       programPlanNumber: Num(studentInfos.get('培养方案代码')),
       programPlanName: studentInfos.get('培养方案名称') || '',
-      semesterNumberList: userSemesterNumberList,
       courseNumber: academicInfo.courseNumber,
       gpa: academicInfo.gpa,
       currentSemesterCourseNumber: academicInfo.currentSemesterCourseNumber,