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

TEAMModelOS/ClientApp/src/view/classrecord/ClassRecord.vue

@@ -760,9 +760,9 @@ export default {
   created() {
     this.hiTeachEvent = this.$GLOBAL.HI_TEACH_EVENT()
     //正式站先暂时不放出课中评测
-    // if (this.$store.state.config.srvAdrType == 'product') {
-    //     this.$delete(this.hiTeachEvent, 'SPQStrt')
-    // }
+     if (this.$store.state.config.srvAdrType == 'product') {
+         this.$delete(this.hiTeachEvent, 'SPQStrt')
+     }
     this.events = Object.keys(this.hiTeachEvent)
     this.fnEvents = this.events.filter(key => this.hiTeachEvent[key].type === 'fn')
     console.log(this.events, this.fnEvents)

TEAMModelOS/ClientApp/src/view/learnactivity/CreatePrivEva.vue

@@ -26,8 +26,8 @@
                                     </Tooltip>
                                 </label>
                                 <Select v-model="evaluationInfo.source" @on-change="checkItemSort">
-                                    <!-- 暂时取消创建课中评量 -->
-                                    <Option v-for="(item,index) in $GLOBAL.EV_MODE()" v-show="index != 1" :label="item.label" :value="item.value" :key="index" :disabled="index > 1 && (!$store.state.userInfo.hasSchool || !$store.state.user.schoolProfile.svcStatus.VABAJ6NV)">
+                                    <!-- 暂时取消创建课中评量 --> <!-- 20221124非正式站課中評測放回 -->
+                                    <Option v-for="(item,index) in $GLOBAL.EV_MODE()" v-show="index != 1 || $store.state.config.srvAdrType != 'product'" :label="item.label" :value="item.value" :key="index" :disabled="index > 1 && (!$store.state.userInfo.hasSchool || !$store.state.user.schoolProfile.svcStatus.VABAJ6NV)">
                                         <div>
                                             <span>
                                                 {{ item.label }}

TEAMModelOS/ClientApp/src/view/learnactivity/CreateSchoolEva.vue

@@ -26,8 +26,8 @@
                                     </Tooltip>
                                 </label>
                                 <Select v-model="evaluationInfo.source" @on-change="checkItemSort">
-                                    <!-- 校本评测开放创建课中评量 2022530调整不能发布课中评测，没有做物联网-->
-                                    <Option v-for="(item,index) in $GLOBAL.EV_MODE()" v-show="index != 1" :label="item.label" :value="item.value" :key="index" :disabled="index > 1 && !$store.state.user.schoolProfile.svcStatus.VABAJ6NV">
+                                    <!-- 校本评测开放创建课中评量 2022530调整不能发布课中评测，没有做物联网--> <!-- 20221124非正式站課中評測放回 -->
+                                    <Option v-for="(item,index) in $GLOBAL.EV_MODE()" v-show="index != 1 || $store.state.config.srvAdrType != 'product'" :label="item.label" :value="item.value" :key="index" :disabled="index > 1 && !$store.state.user.schoolProfile.svcStatus.VABAJ6NV">
                                         <div>
                                             <span>
                                                 {{ item.label }}

TEAMModelOS/ClientApp/src/view/mycourse/exam/CreatePrivExam.vue

@@ -26,8 +26,8 @@
                                     </Tooltip>
                                 </label>
                                 <Select v-model="evaluationInfo.source" @on-change="checkItemSort">
-                                    <!-- 暂时取消创建课中评量 -->
-                                    <Option v-for="(item,index) in $GLOBAL.EV_MODE()" v-show="index != 1" :label="item.label" :value="item.value" :key="index" :disabled="index > 1 && (!$store.state.userInfo.hasSchool || !$store.state.user.schoolProfile.svcStatus.VABAJ6NV)">
+                                    <!-- 暂时取消创建课中评量 --> <!-- 20221124非正式站課中評測放回 -->
+                                    <Option v-for="(item,index) in $GLOBAL.EV_MODE()" v-show="index != 1 || $store.state.config.srvAdrType != 'product'" :label="item.label" :value="item.value" :key="index" :disabled="index > 1 && (!$store.state.userInfo.hasSchool || !$store.state.user.schoolProfile.svcStatus.VABAJ6NV)">
                                         <div>
                                             <span>
                                                 {{ item.label }}

TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs

@@ -132,50 +132,58 @@ namespace TEAMModelOS.Controllers.Analysis
                     School scInfo = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>($"{code}", partitionKey: new PartitionKey("Base"));
                     var perMore = scInfo.period.Where(c => c.id.Equals(pId.GetString())).FirstOrDefault().grades;
 
-                    var clientInteractionCount = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
+                    var interaction = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.clientInteractionCount)
+                        count = x.Sum(t => t.learningCategory.interaction)
                     });
-                    var pushCount = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
+                    var cooperation = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.pushCount)
+                        count = x.Sum(t => t.learningCategory.cooperation)
                     });
-                    var collateTaskCount = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
+                    var task = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.collateTaskCount)
+                        count = x.Sum(t => t.learningCategory.task)
                     });
-                    var examCount = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
+                    var exam = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.examCount)
+                        count = x.Sum(t => t.learningCategory.exam)
                     });
-                    List<(string name, int? cICount, int? pCount, int? cTCount, int? eCount)> tcount = new();
+                    var diffential = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
+                    {
+                        x.Key,
+                        name = perMore[x.Key],
+                        count = x.Sum(t => t.learningCategory.diffential)
+                    });
+                    List<(string name, int? cICount, int? pCount, int? cTCount, int? eCount,int? diffCount)> tcount = new();
                     List<(string name, int? count)> gdCount = new();
                     perMore.ForEach(x =>
                     {
-                        var cICount = clientInteractionCount.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
-                        var pCount = pushCount.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
-                        var cTCount = collateTaskCount.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
-                        var eCount = examCount.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
+                        var cICount = interaction.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
+                        var pCount = cooperation.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
+                        var cTCount = task.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
+                        var eCount = exam.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
+                        var diffCount = diffential.Where(c => c.name.Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault()?.count;
                         var gradeCount = grades.Where(c => perMore[int.Parse(c.name)].Equals(x, StringComparison.OrdinalIgnoreCase)).FirstOrDefault().count;
-                        tcount.Add((x, cICount, pCount, cTCount, eCount));
+                        tcount.Add((x, cICount, pCount, cTCount, eCount, diffCount));
                         gdCount.Add((x, gradeCount));
                     });
 
                     var teachingCount = tcount.Select(x => new
                     {
                         x.name,
-                        clientInteractionCount = x.cICount == null ? 0 : x.cICount,
-                        pushCount = x.pCount == null ? 0 : x.pCount,
-                        collateTaskCount = x.cTCount == null ? 0 : x.cTCount,
-                        examCount = x.eCount == null ? 0 : x.eCount
+                        interaction = x.cICount == null ? 0 : x.cICount,
+                        cooperation = x.pCount == null ? 0 : x.pCount,
+                        task = x.cTCount == null ? 0 : x.cTCount,
+                        exam = x.eCount == null ? 0 : x.eCount,
+                        diffential = x.diffCount == null ? 0 : x.eCount
                     });
                     var classify_grade = gdCount.Select(x => new
                     {