|
|
@@ -93,14 +93,21 @@ export async function GetMPSDistrictPersonNum(ctx) {
|
|
93
|
93
|
for(let i=0;i<list.length;i++){
|
|
94
|
94
|
list[i].PlanNum=Number(list[i].PlanNum);
|
|
95
|
95
|
}
|
|
96
|
|
- arr.push({ "Name": "能上" + list[1].SchoolType2Short, "Year1": list[1].PlanNum, "Year2": list[1].PlanNum - list[0].PlanNum });
|
|
97
|
|
- 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 });
|
|
98
|
|
- arr.push({ "Name": "能上" + list[7].SchoolType2Short, "Year1": list[7].PlanNum, "Year2": list[7].PlanNum - list[6].PlanNum });
|
|
99
|
|
- arr.push({ "Name": "能上高中总计", "Year1": arr[0].Year1 + arr[1].Year1 + arr[2].Year1, "Year2": arr[0].Year2 + arr[1].Year2 + arr[2].Year2 });
|
|
100
|
|
-
|
|
101
|
|
- arr[0].Rate = Math.round(100 * arr[0].Year1 / arr[3].Year1);
|
|
102
|
|
- arr[1].Rate = Math.round(100 * arr[1].Year1 / arr[3].Year1);
|
|
103
|
|
- arr[2].Rate = Math.round(100 * arr[2].Year1 / arr[3].Year1);
|
|
|
96
|
+
|
|
|
97
|
+ if (arr[1]){
|
|
|
98
|
+ arr.push({ "Name": "能上" + list[1].SchoolType2Short, "Year1": list[1].PlanNum, "Year2": list[1].PlanNum - list[0].PlanNum });
|
|
|
99
|
+ 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 });
|
|
|
100
|
+ arr.push({ "Name": "能上" + list[7].SchoolType2Short, "Year1": list[7].PlanNum, "Year2": list[7].PlanNum - list[6].PlanNum });
|
|
|
101
|
+ arr.push({ "Name": "能上高中总计", "Year1": arr[0].Year1 + arr[1].Year1 + arr[2].Year1, "Year2": arr[0].Year2 + arr[1].Year2 + arr[2].Year2 });
|
|
|
102
|
+
|
|
|
103
|
+ arr[0].Rate = Math.round(100 * arr[0].Year1 / arr[3].Year1);
|
|
|
104
|
+ arr[1].Rate = Math.round(100 * arr[1].Year1 / arr[3].Year1);
|
|
|
105
|
+ arr[2].Rate = Math.round(100 * arr[2].Year1 / arr[3].Year1);
|
|
|
106
|
+ }
|
|
|
107
|
+ else{
|
|
|
108
|
+ arr.push({ "Name": "能上" + list[1].SchoolType2Short, "Year1": list[1].PlanNum, "Year2": '-' });
|
|
|
109
|
+ arr[0].Rate="-";
|
|
|
110
|
+ }
|
|
104
|
111
|
}
|
|
105
|
112
|
|
|
106
|
113
|
info = {
|