0

src/api/mps/mpsCommonController.js

@@ -408,7 +408,7 @@ export async function GetMPSArticle(ctx) {
     let articles = [
         {
             ID: 27,
-            Category: "2025",
+            Category: "2026",
             IsPageShow: 1,
             Logo: "icon_sys_02.png",
             Title: "2026新开17所高中介绍（黄埔、徐汇、静安、普陀、闵行……）",

src/api/mps/mpsScoreController.js

@@ -93,14 +93,21 @@ export async function GetMPSDistrictPersonNum(ctx) {
                 for(let i=0;i<list.length;i++){
                     list[i].PlanNum=Number(list[i].PlanNum);
                 }
-                arr.push({ "Name": "能上" + list[1].SchoolType2Short, "Year1": list[1].PlanNum, "Year2": list[1].PlanNum - list[0].PlanNum });
-                arr.push({ "Name": "能上" + list[5].SchoolType2Short, "Year1": list[5].PlanNum + list[3].PlanNum, "Year2": list[5].PlanNum + list[3].PlanNum - list[4].PlanNum - list[2].PlanNum });
-                arr.push({ "Name": "能上" + list[7].SchoolType2Short, "Year1": list[7].PlanNum, "Year2": list[7].PlanNum - list[6].PlanNum });
-                arr.push({ "Name": "能上高中总计", "Year1": arr[0].Year1 + arr[1].Year1 + arr[2].Year1, "Year2": arr[0].Year2 + arr[1].Year2 + arr[2].Year2 });
-
-                arr[0].Rate = Math.round(100 * arr[0].Year1 / arr[3].Year1);
-                arr[1].Rate = Math.round(100 * arr[1].Year1 / arr[3].Year1);
-                arr[2].Rate = Math.round(100 * arr[2].Year1 / arr[3].Year1);
+                
+                if (arr[1]){
+                    arr.push({ "Name": "能上" + list[1].SchoolType2Short, "Year1": list[1].PlanNum, "Year2": list[1].PlanNum - list[0].PlanNum });
+                    arr.push({ "Name": "能上" + list[5].SchoolType2Short, "Year1": list[5].PlanNum + list[3].PlanNum, "Year2": list[5].PlanNum + list[3].PlanNum - list[4].PlanNum - list[2].PlanNum });
+                    arr.push({ "Name": "能上" + list[7].SchoolType2Short, "Year1": list[7].PlanNum, "Year2": list[7].PlanNum - list[6].PlanNum });
+                    arr.push({ "Name": "能上高中总计", "Year1": arr[0].Year1 + arr[1].Year1 + arr[2].Year1, "Year2": arr[0].Year2 + arr[1].Year2 + arr[2].Year2 });
+
+                    arr[0].Rate = Math.round(100 * arr[0].Year1 / arr[3].Year1);
+                    arr[1].Rate = Math.round(100 * arr[1].Year1 / arr[3].Year1);
+                    arr[2].Rate = Math.round(100 * arr[2].Year1 / arr[3].Year1);
+                }
+                else{
+                    arr.push({ "Name": "能上" + list[1].SchoolType2Short, "Year1": list[1].PlanNum, "Year2": '-' });
+                    arr[0].Rate="-";
+                }
             }
 
             info = {

src/model/mps.js

@@ -224,14 +224,14 @@ class MPS {
 
 // 当前年份配置
 export const ArrYear = [
-    // {
-    //     Name: "2026",
-    //     CSS: ""
-    // },
     {
-        Name: "2025",
-        IsNullScoreLine: (moment().format("MM-DD") >= "05-30" && moment().format("MM-DD") < "07-14") ? true : false, // 当只有计划没有分数线时
+        Name: "2026",
+        IsNullScoreLine: (moment().format("MM-DD") >= "05-31" && moment().format("MM-DD") < "07-14") ? true : false, // 当只有计划没有分数线时
         CSS: "Selected"
+    },
+    {
+        Name: "2025",
+        CSS: ""
     }, {
         Name: "2024",
         CSS: ""