Browse Source

调整算法返回后结果

zhouj1203@hotmail.com 2 năm trước cách đây
mục cha
commit
83a6aaa371

+ 11 - 9
TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -790,7 +790,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 //试题区域
                 //试题区域
                 List<string> topic = cdm.TopicFallArea;
                 List<string> topic = cdm.TopicFallArea;
                 //试题相关分析结果
                 //试题相关分析结果
-                List<(double Diff, double D, double R1, double R2, double R3, double R4, double R5, double R6, double PH, double PL)> rs = cdm.RS;
+                List<(double Diff, double D, double R0,double R1, double R2, double R3, double R4, double R5, double R6, double PH, double PL)> rs = cdm.RS;
                 for (int i = 0; i < rs.Count; i++)
                 for (int i = 0; i < rs.Count; i++)
                 {
                 {
                     string[] ex = new string[] { };
                     string[] ex = new string[] { };
@@ -832,19 +832,21 @@ namespace TEAMModelOS.Controllers.Analysis
                     {
                     {
                         values[4] = itemAnalysis[k][0].Trim();
                         values[4] = itemAnalysis[k][0].Trim();
                         values[5] = itemAnalysis[k][1].Trim();
                         values[5] = itemAnalysis[k][1].Trim();
-                        values[12] = itemAnalysis[k][2].Trim();
-                        values[13] = itemAnalysis[k][3].Trim();
-                        values[14] = itemAnalysis[k][4].Trim();
-                        values[15] = itemAnalysis[k][5].Trim();
-                        values[16] = itemAnalysis[k][6].Trim();
-                        values[17] = itemAnalysis[k][7].Trim();
-                        values[18] = itemAnalysis[k][8].Trim();
-                        values[19] = itemAnalysis[k][9].Trim();
+                        values[6] = itemAnalysis[k][2].Trim();
+                        values[12] = itemAnalysis[k][3].Trim();
+                        values[13] = itemAnalysis[k][4].Trim();
+                        values[14] = itemAnalysis[k][5].Trim();
+                        values[15] = itemAnalysis[k][6].Trim();
+                        values[16] = itemAnalysis[k][7].Trim();
+                        values[17] = itemAnalysis[k][8].Trim();
+                        values[18] = itemAnalysis[k][9].Trim();
+                        values[19] = itemAnalysis[k][10].Trim();
                     }
                     }
                     else
                     else
                     {
                     {
                         values[4] = "0";
                         values[4] = "0";
                         values[5] = "0";
                         values[5] = "0";
+                        values[6] = "0";
                         values[12] = "0";
                         values[12] = "0";
                         values[13] = "0";
                         values[13] = "0";
                         values[14] = "0";
                         values[14] = "0";