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

TEAMModelBI/TEAMModelBI.csproj

@@ -65,9 +65,9 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2311.1</Version>
-		<AssemblyVersion>5.2311.1.1</AssemblyVersion>
-		<FileVersion>5.2311.1.1</FileVersion>
+		<Version>5.2311.8</Version>
+		<AssemblyVersion>5.2311.8.1</AssemblyVersion>
+		<FileVersion>5.2311.8.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelOS.FunctionV4/CosmosDB/TriggerExam.cs

@@ -866,6 +866,8 @@ namespace TEAMModelOS.FunctionV4
             var papers = info.papers.GroupBy(c => c.subjectId).Select(x => new { 
                 subject =  x.Key,
                 blob = x.ToList().Select(z => z.blob).ToList() });
+            bool flag =  info.papers.Exists(c => c.subjectId != null);
+            //var subs = info.papers.Select(z => z.subjectId).Distinct().ToList();
             if (addTmdidsCls.IsNotEmpty())
             {
                 addTmdidsCls.ForEach(x =>
@@ -932,7 +934,7 @@ namespace TEAMModelOS.FunctionV4
                         creatorId = info.creatorId,
                         subjects = sub,
                         blob = null,
-                        paper = info.pk.Equals("Art") ? papers.Select(c => new {
+                        paper = flag ? papers.Select(c => new {
                             c.subject,
                             blob = c.blob[new Random().Next(c.blob.Count)]
                         }) : "",
@@ -1015,7 +1017,7 @@ namespace TEAMModelOS.FunctionV4
                         creatorId = info.creatorId,
                         subjects = sub,
                         blob = null,
-                        paper = info.pk.Equals("Art") ? papers.Select(c => new {
+                        paper = flag ? papers.Select(c => new {
                             c.subject,
                             blob = c.blob[new Random().Next(c.blob.Count)]
                         }) : "",
@@ -1675,6 +1677,7 @@ namespace TEAMModelOS.FunctionV4
                             items.type = itemInfos.Where(c => c.id.Equals(items.id)).FirstOrDefault().type;
                             items.pId = itemInfos.Where(c => c.id.Equals(items.id)).FirstOrDefault().pid;
                             items.knowledge = itemInfos.Where(c => c.id.Equals(items.id)).FirstOrDefault().knows;
+                            items.qamode = info.qamode;
                             error.its.Add(items);
                         }
                         errors.Add(error);

TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

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

TEAMModelOS.SDK/Models/Cosmos/Student/ErrorItems.cs

@@ -36,5 +36,6 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Student
         public double proficiency { get; set; }
         //星号标记 后续扩展
         public double asteriskMark { get; set; }
+        public int qamode { get; set; } = 0;
     }
 }

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>5.2311.1</Version>
-    <AssemblyVersion>5.2311.1.1</AssemblyVersion>
-    <FileVersion>5.2311.1.1</FileVersion>
+    <Version>5.2311.8</Version>
+    <AssemblyVersion>5.2311.8.1</AssemblyVersion>
+    <FileVersion>5.2311.8.1</FileVersion>
     <PackageReleaseNotes>发版</PackageReleaseNotes>
   </PropertyGroup>
 

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

@@ -216,6 +216,7 @@
                 canvas2: [],
                 allDom: [],
                 isPrint: false,
+                stusInfo: [],// 艺术评测接口返回的stus
             };
         },
         methods: {
@@ -319,6 +320,7 @@
                                 }
                             })
                         })
+                        this.stusInfo = res.stus
                         
                         if(subList.length) {
                             let ids = JSON.parse(decodeURIComponent(sessionStorage.getItem("ids")))
@@ -395,14 +397,29 @@
                                     cloudas: res.cloudas
                                 }
                                 this.getCorrectData(res)
-                                res.papers.forEach(item => {
-                                    if (item.scope) {
-                                        item.source = null
-                                        item.source = this.getItemTitle.source
-                                        item.qamode = this.getItemTitle.qamode
-                                        this.paperData.push(item)
+                                // 艺术评测试卷需先从stus -> paper 中获取blob, 再从res.papers中找出那一个试卷
+                                if(isArt) {
+                                    let blob = this.stusInfo.find(item => {
+                                        return item.paper[0].subject === res.subjects[0].id
+                                    })
+                                    if(blob) {
+                                        let paperArt = res.papers.find(papers => {
+                                            return papers.blob === blob.paper[0].blob
+                                        })
+                                        paperArt.source = this.getItemTitle.source || null
+                                        paperArt.qamode = this.getItemTitle.qamode
+                                        this.paperData.push(paperArt)
                                     }
-                                })
+                                } else {
+                                    res.papers.forEach(item => {
+                                        if (item.scope) {
+                                            item.source = null
+                                            item.source = this.getItemTitle.source
+                                            item.qamode = this.getItemTitle.qamode
+                                            this.paperData.push(item)
+                                        }
+                                    })
+                                }
                                 for (let i = 0; i < this.paperData.length; i++) {
                                     this.paperData[i].subject = res.subjects[i]
                                     this.paperData[i].allClass = res.claId

TEAMModelOS/TEAMModelOS.csproj

@@ -74,11 +74,11 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2311.1</Version>
-    <AssemblyVersion>5.2311.1.1</AssemblyVersion>
-    <FileVersion>5.2311.1.1</FileVersion>
+    <Version>5.2311.8</Version>
+    <AssemblyVersion>5.2311.8.1</AssemblyVersion>
+    <FileVersion>5.2311.8.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
-    <PackageReleaseNotes>IES版本说明版本切换标记5.2311.1.1</PackageReleaseNotes>
+    <PackageReleaseNotes>IES版本说明版本切换标记5.2311.8.1</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>
     <Authors>teammodel</Authors>
     <Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS/appsettings.Development.json

@@ -18,7 +18,7 @@
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction-test.chinacloudsites.cn/api/",
     //"HttpTrigger": "http://localhost:7071/api/"
-    "Version": "5.2311.1.1"
+    "Version": "5.2311.8.1"
   },
   "Azure": {
     // 测试站数据库

TEAMModelOS/appsettings.json

@@ -18,7 +18,7 @@
     "Exp": 86400,
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction.chinacloudsites.cn/api/",
-    "Version": "5.2311.1.1"
+    "Version": "5.2311.8.1"
   },
   "Azure": {
     "Storage": {