Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelFunction/TriggerExam.cs

@@ -111,6 +111,7 @@ namespace TEAMModelFunction
                                         code = $"Activity-{x.id}",
                                         type = "Exam",
                                         name = info.name,
+                                        source = info.source,
                                         startTime = info.startTime,
                                         endTime = info.endTime,
                                         scode = info.code,
@@ -124,7 +125,7 @@ namespace TEAMModelFunction
                                         taskStatus = -1,
                                         classIds = classes
 
-                                    });;
+                                    });
                                 });
                             }
                             if (studentss.IsNotEmpty())
@@ -138,6 +139,7 @@ namespace TEAMModelFunction
                                         code = $"Activity-{x.code.Replace("Base-", "")}-{x.id}",
                                         type = "Exam",
                                         name = info.name,
+                                        source = info.source,
                                         startTime = info.startTime,
                                         endTime = info.endTime,
                                         scode = info.code,

TEAMModelOS.SDK/Models/Cosmos/Common/StuActivity.cs

@@ -47,6 +47,8 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public string scode { get; set; }
         public string type { get; set; }
+        //评测模式
+        public string source { get; set; }
         public string name { get; set; }
         public long startTime { get; set; }
         public long endTime { get; set; }

TEAMModelOS.SDK/Models/Cosmos/School/ExamInfo.cs

@@ -105,7 +105,9 @@ namespace TEAMModelOS.SDK.Models
         public double standard { get; set; }
         //记录该评测内容下blob大小
         public long? size { get; set; } = 0;
+       //进线比列
         public int income { get; set; } = 0;
+        //踩线比列
         public int touch { get; set; } = 0;
         //容器名称 container name
         //public string cn { get; set; }

TEAMModelOS/ClientApp/package.json

@@ -38,6 +38,7 @@
 		"i18next": "^20.3.1",
 		"imports-loader": "^0.8.0",
 		"increase-memory-limit": "^1.0.7",
+		"js-md5": "^0.7.3",
 		"js-sha1": "^0.6.0",
 		"json-markup": "^1.1.3",
 		"jsonpath": "^1.1.1",

TEAMModelOS/ClientApp/src/view/sso/Index.vue

@@ -5,9 +5,33 @@
     </div>
 </template>
 <script>
+import MD5 from 'js-md5';
 export default {
     data() {
-
+        return{
+            Encrypt:'',
+            Pxid:'',
+            Webid:'',
+            tid:'',
+            time:''
+        }
+    },
+    created(){
+        console.log(this.$route)
+        let routerData = this.$route.query
+        if(routerData.Encrypt && routerData.Pxid && routerData.Webid && routerData.tid && routerData.time){
+            let str = `Pxid=${routerData.Pxid}&Webid=${routerData.Webid}&tid=${routerData.tid}&time=${routerData.time}`
+            let md5Res = MD5(str)
+            console.log('加密结果',md5Res)
+            if(md5Res != routerData.Encrypt){
+                this.$Message.error('参数异常，未通过验证')
+            }else{
+                //TODE
+                
+            }
+        }else{
+            this.$Message.error('参数错误，登录失败')
+        }
     }
 }
 </script>

TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -296,7 +296,13 @@ namespace TEAMModelOS.Controllers.Analysis
                 }
                 //处理进线分数
                 gradeTotal.Sort((s1, s2) => { return s2.CompareTo(s1); });
-                ipoint = gradeTotal[personCount];
+                if (personCount == 0)
+                {
+                    ipoint = gradeTotal[personCount] + 1;
+                }
+                else {
+                    ipoint = gradeTotal[personCount];
+                }               
                 //以班级为单位(此处处理的是行政班级,教学班暂未处理)
                 foreach (string classId in info.classes)
                 {