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.29</Version>
-		<AssemblyVersion>5.2311.29.1</AssemblyVersion>
-		<FileVersion>5.2311.29.1</FileVersion>
+		<Version>5.2312.6</Version>
+		<AssemblyVersion>5.2312.6.1</AssemblyVersion>
+		<FileVersion>5.2312.6.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

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

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>5.2311.29</Version>
-    <AssemblyVersion>5.2311.29.1</AssemblyVersion>
-    <FileVersion>5.2311.29.1</FileVersion>
+    <Version>5.2312.6</Version>
+    <AssemblyVersion>5.2312.6.1</AssemblyVersion>
+    <FileVersion>5.2312.6.1</FileVersion>
     <PackageReleaseNotes>发版</PackageReleaseNotes>
   </PropertyGroup>
 

TEAMModelOS/ClientApp/src/common/BaseCanvas.vue

@@ -152,11 +152,19 @@
 						var imgElement = document.createElement("img"); //声明我们的图片
 						imgElement.crossOrigin = 'Anonymous'
 						imgElement.src = this.bgImg
-						imgElement.width = this.width
-						imgElement.height = this.height
+						// imgElement.width = this.width
+						// imgElement.height = this.height
 						imgElement.onload = () => {
+							let scaleY = 1
+							let scaleX = 1
+							if(imgElement.height > this.height || imgElement.width > this.width){
+								scaleY = this.height / imgElement.height
+								scaleX = this.width / imgElement.width
+							}
 							var imgInstance = new fabric.Image(imgElement, {
 								zIndex: -2,
+								scaleX: Math.min(scaleX, scaleY),
+								scaleY: Math.min(scaleX, scaleY),
 							});
 							this.canvas.add(imgInstance);
 						};
@@ -258,11 +266,19 @@
 				}
 				var imgElement = document.getElementById("img"); //声明我们的图片
 
+				// imgElement.width = this.width
+				// imgElement.height = this.height
 				imgElement.onload = () => {
-					// this.width = imgElement.width
-					// this.height = imgElement.height
+					let scaleY = 1
+					let scaleX = 1;
+					if(imgElement.height > this.height || imgElement.width > this.width){
+						scaleY = this.height / imgElement.height
+						scaleX = this.width / imgElement.width
+					}
 					var imgInstance = new fabric.Image(imgElement, {
 						zIndex: -1,
+						scaleX: Math.min(scaleX,scaleY),
+						scaleY: Math.min(scaleX,scaleY),
 						selectable: true
 					});
 					this.canvas.add(imgInstance);

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

@@ -175,8 +175,9 @@ export default {
     markStuAnswer() {
       let answerIframe = ""
       answerIframe = document.getElementById("answerIframe")
-      answerIframe.contentWindow.document.body.style.width = "fit-content"
-      answerIframe.contentWindow.document.body.style.minWidth = "600px"
+      // answerIframe.contentWindow.document.body.style.width = "fit-content"
+      answerIframe.contentWindow.document.body.style.maxWidth = "1160px"
+      answerIframe.contentWindow.document.body.style.maxHeight = "480px"
       answerIframe.contentWindow.document.body.style.backgroundColor =
         "#f5f5f5"
       console.log(
@@ -189,9 +190,9 @@ export default {
       if (iframe.length > 0) {
         for (let i = 0; i < iframe.length - 1; i++) {
           iframe[i].style.lineHeight = "50px"
-          iframe[i].style.paddingBottom = "30px"
+          // iframe[i].style.paddingBottom = "30px"
         }
-        iframe[iframe.length - 1].style.paddingBottom = "100px"
+        // iframe[iframe.length - 1].style.paddingBottom = "100px"
         iframe[iframe.length - 1].style.lineHeight = "50px"
       }
       html2canvas(answerIframe.contentWindow.document.body).then(
@@ -301,8 +302,10 @@ export default {
   /*height: 100px;*/
   border: none;
   position: fixed;
-  height: 0.1px;
-  width: 50%;
+  opacity: 0;
+  /* height: 0.1px; */
+  width: 100%;
+  max-width: 1160px;
   /*margin-left:10px;*/
   /*line-height: 50px;*/
 }

TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -991,28 +991,10 @@ namespace TEAMModelOS.Controllers
                                         uploadStatus=uploadStatus
                                     });
                                 }
-                               
                                 foreach (var activityEnroll in enrollResult.list)
                                 {
                                     var inviteEnrollTeacher = inviteEnrollTeachers.Find(z => z.id.Equals(activityEnroll.id)   &&  !string.IsNullOrWhiteSpace(z.school)  && !string.IsNullOrEmpty(activityEnroll.schoolId)  && z.school.Equals(activityEnroll.schoolId));
-                                    if (inviteEnrollTeacher!= null)
-                                    {
-                                        if (activityEnroll.contest!= null)
-                                        {
-                                            inviteEnrollTeacher.contestStatus = 1;
-                                            inviteEnrollTeacher.contestTime = activityEnroll.contest.enrollTime;
-                                            inviteEnrollTeacher.contestType = activityEnroll.contest.type;
-                                        }
-                                        if (activityEnroll.upload!=null)
-                                        {
-                                            inviteEnrollTeacher.uploadId=activityEnroll.upload.uploadId;
-                                            inviteEnrollTeacher.uploadType=activityEnroll.upload.type;
-                                            inviteEnrollTeacher.uploadStatus=1;
-                                            inviteEnrollTeacher.uploadTime= activityEnroll.upload.uploadTime;
-                                            inviteEnrollTeacher.uploadScore=activityEnroll.upload.score;
-                                        }
-                                    }
-                                    else
+                                    if (inviteEnrollTeacher==null)
                                     {
                                         inviteEnrollTeacher= new InviteEnrollTeacherDto
                                         {
@@ -1023,24 +1005,23 @@ namespace TEAMModelOS.Controllers
                                             schoolName=activityEnroll.schoolName,
                                             contestStatus=contestStatus,
                                             uploadStatus=uploadStatus
-
                                         };
-                                        if (activityEnroll.contest!= null)
-                                        {
-                                            inviteEnrollTeacher.contestStatus = 1;
-                                            inviteEnrollTeacher.contestTime = activityEnroll.contest.enrollTime;
-                                            inviteEnrollTeacher.contestType = activityEnroll.contest.type;
-                                        }
-                                        if (activityEnroll.upload!=null)
-                                        {
-                                            inviteEnrollTeacher.uploadId=activityEnroll.upload.uploadId;
-                                            inviteEnrollTeacher.uploadType=activityEnroll.upload.type;
-                                            inviteEnrollTeacher.uploadStatus=1;
-                                            inviteEnrollTeacher.uploadTime= activityEnroll.upload.uploadTime;
-                                            inviteEnrollTeacher.uploadScore=activityEnroll.upload.score;
-                                        }
                                         inviteEnrollTeachers.Add(inviteEnrollTeacher);
                                     }
+                                    if (activityEnroll.contest!= null)
+                                    {
+                                        inviteEnrollTeacher.contestStatus = 1;
+                                        inviteEnrollTeacher.contestTime = activityEnroll.contest.enrollTime;
+                                        inviteEnrollTeacher.contestType = activityEnroll.contest.type;
+                                    }
+                                    if (activityEnroll.upload!=null)
+                                    {
+                                        inviteEnrollTeacher.uploadId=activityEnroll.upload.uploadId;
+                                        inviteEnrollTeacher.uploadType=activityEnroll.upload.type;
+                                        inviteEnrollTeacher.uploadStatus=1;
+                                        inviteEnrollTeacher.uploadTime= activityEnroll.upload.uploadTime;
+                                        inviteEnrollTeacher.uploadScore=activityEnroll.upload.score;
+                                    }
                                 }
                                 return Ok(new { inviteEnrollTeachers });
                             }
@@ -1490,8 +1471,7 @@ namespace TEAMModelOS.Controllers
                     jwt.Payload.TryGetValue("picture", out   picture);
                     jwt.Payload.TryGetValue("lang", out object _jwtlang);
                     head_lang = !string.IsNullOrWhiteSpace($"{_jwtlang}") ? $"{_jwtlang}" : head_lang;
-                    
-                     }
+                }
             }
             
             if (tmdid == null   )
@@ -1646,7 +1626,6 @@ namespace TEAMModelOS.Controllers
             (string tmdid, _, _, _) = HttpContext.GetAuthTokenInfo();
             if (!request.TryGetProperty("grant_type", out JsonElement grant_type)) return BadRequest();
             if (!request.TryGetProperty("activityId", out JsonElement _activityId)) return BadRequest();
-          
             var client = _azureCosmos.GetCosmosClient();
             Azure.Response response = await client.GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(_activityId.GetString(), new PartitionKey("Activity"));
             if (response.Status==200)
@@ -1655,7 +1634,17 @@ namespace TEAMModelOS.Controllers
                 Activity activity= JsonDocument.Parse(response.Content).RootElement.ToObject<Activity>();
                 if (activity.publish==1) {
                     switch (true)
-                    {
+                    { 
+                        //生成组队口令
+                        case bool when $"{grant_type}".Equals("gen-cipher", StringComparison.OrdinalIgnoreCase):
+                            {
+                                break;
+                            }
+                        //根据口令获取团队和队员信息
+                        case bool when $"{grant_type}".Equals("get-team-by-cipher", StringComparison.OrdinalIgnoreCase):
+                            { 
+                                break; 
+                            }
                         //教师报名参加
                         case bool when $"{grant_type}".Equals("sign-contest", StringComparison.OrdinalIgnoreCase):
                             {
@@ -1663,12 +1652,14 @@ namespace TEAMModelOS.Controllers
                                     return Ok(new { code = 0, msg = "报名信息未完善！" });
                                 };
                                 TeacherEnrollContestDto enrollData= _enrollData.ToObject<TeacherEnrollContestDto>();
-
                                 ActivityEnroll enroll = null;
+                                Azure.Response responseActivityEnroll = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(tmdid, new PartitionKey($"ActivityEnroll-{_activityId.GetString()}"));
+                                if (responseActivityEnroll.Status==200) { 
+                                    enroll= JsonDocument.Parse(responseActivityEnroll.Content).RootElement.ToObject<ActivityEnroll>();
+                                }
                                 //邀请制
                                 if (activity.joinMode.Equals("invite"))
                                 {
-
                                     Azure.Response responseActivityTeacher = await client.GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(_activityId.GetString(), new PartitionKey("ActivityTeacher"));
                                     if (responseActivityTeacher.Status==200)
                                     {
@@ -1770,12 +1761,32 @@ namespace TEAMModelOS.Controllers
                                                     else { code=200; }
                                                 }
                                                 //检查团队组，检查口令
-                                                if (contest.sign.type==1) { 
-                                                    
+                                                if (contest.sign.type==1)
+                                                {
+                                                    if (enrollData.type==1)
+                                                    {
+                                                        if (enrollData.leader==1)
+                                                        {
+                                                            //队长
+
+                                                        }
+                                                        else { 
+                                                        //队员
+                                                        }
+                                                    }
+                                                    else {
+                                                        return Ok(new { code = 9, msg = "参加组别不一致！" });
+                                                    }
                                                 }
+                                                else {
+                                                    if (contest.sign.type== enrollData.type)
+                                                    {
 
-                                                Azure.Response responseActivityEnroll = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(tmdid, new PartitionKey($"ActivityEnroll-{_activityId.GetString()}"));
-                                                //更新报名信息
+                                                    }
+                                                    else {
+                                                        return Ok(new { code = 9, msg = "参加组别不一致！" });
+                                                    }
+                                                }
                                             }
                                         }
                                     }
@@ -1799,8 +1810,11 @@ namespace TEAMModelOS.Controllers
             public string tmdPicture { get; set; }
             public string schoolPicture { get; set; }
             public long enrollTime { get; set; }
+            /// <summary>
+            ///  参赛模式 0 个人，1 团队（是否允许跨校）
+            /// </summary>
             [Required(ErrorMessage = "Required")]
-            public string type { get; set; }
+            public int type { get; set; }
             public string cipher { get; set; }
             public int leader { get; set; }
             public string teamName { get; set; }

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.29</Version>
-    <AssemblyVersion>5.2311.29.1</AssemblyVersion>
-    <FileVersion>5.2311.29.1</FileVersion>
+    <Version>5.2312.6</Version>
+    <AssemblyVersion>5.2312.6.1</AssemblyVersion>
+    <FileVersion>5.2312.6.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
-    <PackageReleaseNotes>IES版本说明版本切换标记5.2311.29.1</PackageReleaseNotes>
+    <PackageReleaseNotes>IES版本说明版本切换标记5.2312.6.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.29.1"
+    "Version": "5.2312.6.1"
   },
   "Azure": {
     // 测试站数据库

TEAMModelOS/appsettings.json

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