Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

@@ -5,9 +5,9 @@
 		<OutputType>Exe</OutputType>
 		<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
 		<SignAssembly>true</SignAssembly>
-		<AssemblyVersion>5.2204.29.1</AssemblyVersion>
-		<FileVersion>5.2204.29.1</FileVersion>
-		<Version>5.2204.29</Version>
+		<AssemblyVersion>5.2205.6.1</AssemblyVersion>
+		<FileVersion>5.2205.6.1</FileVersion>
+		<Version>5.2205.6</Version>
 		<PackageId>TEAMModelOS.FunctionV4</PackageId>
 		<Authors>teammodel</Authors>
 		<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/LessonTestReportCharts/QuCount.vue

@@ -2,9 +2,13 @@
     <div>
         <div class="qu-score-count" id="class-score-count"></div>
         <p class="legend-info">
-            <span>{{ $t('studentWeb.exam.chart.legendSimple.legend1') }}</span>
-            <span>{{ $t('studentWeb.exam.chart.legendSimple.legend2') }}√</span>
-            <span>{{ $t('studentWeb.exam.chart.legendSimple.legend3') }}×</span>
+            <!-- <span>{{ $t('studentWeb.exam.chart.legendSimple.legend1') }}</span> -->
+            <span>{{ $t('studentWeb.exam.chart.legendSimple.legend2') }}
+                <span style="color: #00AD6C;">√</span>
+            </span>
+            <span>{{ $t('studentWeb.exam.chart.legendSimple.legend3') }}
+                <span style="color: #FF5508;">×</span>
+            </span>
         </p>
     </div>
 </template>

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/PaperView.vue

@@ -132,7 +132,8 @@
                         id: paper.id,
                         studentId: this.userInfo.sub,
                         code: codes,
-                        scode: paper.scode
+                        scode: paper.scode,
+                        cIds: paper.classIds
                     }
                     this.paperCtn = paper.scope
                     let isTest = 0

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -1541,7 +1541,7 @@ namespace TEAMModelOS.Controllers
             //ResponseBuilder builder = ResponseBuilder.custom();
             //var (id, school) = HttpContext.GetAuthTokenInfo();
             if (!requert.TryGetProperty("id", out JsonElement id)) return BadRequest();
-            //if (!requert.TryGetProperty("code", out JsonElement code)) return BadRequest();
+            if (!requert.TryGetProperty("cIds", out JsonElement cIds)) return BadRequest();
             if (!requert.TryGetProperty("studentId", out JsonElement studentId)) return BadRequest();
             if (!requert.TryGetProperty("code", out JsonElement school)) return BadRequest();
             if (!requert.TryGetProperty("scode", out JsonElement scode)) return BadRequest();
@@ -1554,7 +1554,7 @@ namespace TEAMModelOS.Controllers
                 List<string> classIds = new List<string>();
                 //List<string> stus = new List<string>();
                 //存放当前学生所在班级ID或者名单ID
-                HashSet<string> resultIds = new();
+                /*HashSet<string> resultIds = new();
                 //List<string> ids = new List<string>();
                 //处理班级人数（公共部分的校本名单）
                 //List<Student> students = new List<Student>();
@@ -1616,8 +1616,8 @@ namespace TEAMModelOS.Controllers
                     {
                         infoIds.Add(ids);
                     }
-                }
-
+                }*/
+                List<string> infoIds = cIds.ToObject<List<string>>();
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<PaperSimple>(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{scode}") }))
                 {
                     papers.Add(item);
@@ -1700,7 +1700,7 @@ namespace TEAMModelOS.Controllers
                     int index = subId.IndexOf(exam.subjectId);
                     //根据索引找到试卷分数
                     List<double> points = papers[index].point;
-                    List<double> wn = await getWrongNum(exam, points);
+                    List<double> wn = await getWrongNum(exam, points,infoIds);
                     wno.Add(wn);
                 }
                 if (papers.IsNotEmpty())
@@ -3539,7 +3539,7 @@ namespace TEAMModelOS.Controllers
             return (ansBlob, scores);
         }
 
-        private Task<List<double>> getWrongNum(ExamResult result, List<double> points)
+        private Task<List<double>> getWrongNum(ExamResult result, List<double> points,List<string> infoIds)
         {
             int num = 0;
             List<double> wn = new List<double>();
@@ -3549,6 +3549,7 @@ namespace TEAMModelOS.Controllers
                 double p = point * 0.8;
                 foreach (ClassRange range in result.classes)
                 {
+                    if (!infoIds.Contains(range.id)) continue;
                     for (int i = range.range[0]; i <= range.range[1]; i++)
                     {
                         //判断推送的数据中，学生正常得分数据

TEAMModelOS/TEAMModelOS.csproj

@@ -32,9 +32,9 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2204.29</Version>
-    <AssemblyVersion>5.2204.29.1</AssemblyVersion>
-    <FileVersion>5.2204.29.1</FileVersion>
+    <Version>5.2205.6</Version>
+    <AssemblyVersion>5.2205.6.1</AssemblyVersion>
+    <FileVersion>5.2205.6.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
     <PackageReleaseNotes>6.0版本说明</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>