修改试题分析

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseGeniusLine.vue

@@ -24,8 +24,8 @@
 
                 myLine.showLoading({
                     text: '',
-                    color: '#4cbbff',
-                    textColor: '#4cbbff',
+                    color: '#E6E6E6',
+                    textColor: '#E4E9EC',
                     maskColor: 'rgba(0, 0, 0, 0)'
                 })
 

TEAMModelOS/ClientApp/src/components/student-analysis/total/map.js

@@ -0,0 +1,15 @@
+"5a569451-d7b6-4bc5-85dc-4c97ba593090", "97752929-bee6-458e-b5ae-af16ee73a1e9",
+    "b32dcb15-9f13-4e8f-9f65-80e55e3b257d", "5160a86b-2d44-466f-bd82-ed08148f6607",
+    "9e6a3b59-bdeb-4b21-90ec-903ef9847864", "6d1f223d-a84e-4fab-b015-fe1c4298834b",
+    "72571322-43d9-4777-b3b1-a6a5a4bf4e10", "bf4707a6-f541-46b9-85b2-82aa6077ba27",
+    "9dd91708-be01-4947-850c-77b88e7cf2ad", "24d9f39f-906a-4ca6-bc4f-8f9307d51d5a",
+    "4acee7e2-434c-4257-9331-8c42fba14a3b", "170125f4-4cfc-40eb-aae4-7a82840a6297",
+    "6b14df14-17ae-4f47-a1e4-16738268feba", "a9c1ada9-232f-4993-bf63-3c279e5ecaac",
+    "4ff7b031-a45c-4b02-921e-933be73bb38a", "a96ebded-aeb0-42c8-ab90-8b1ab8a4a489",
+    "e3564799-3b9a-4b5d-a904-f09565f98890", "64b4326f-1f76-4c7c-8fb7-5940894e2205",
+    "4e43d507-8af1-4b21-b09e-7fe8533104e8", "25032d80-b88c-42c1-8ffd-1a30815859aa",
+    "b1baff75-fdf9-4020-acfb-af6497017f4b", "c6e8bdaf-9738-48f6-bd7f-5bc6d6444684",
+    "d75000f7-168a-4521-b056-780ef38114cc", "f6c768e8-12ea-445c-8df1-750736294a80",
+    "5ac2805d-b31d-44a3-9058-1239d5557270", "49512c48-f38a-452e-8bb9-170728cb271e",
+    "57088641-14d1-498d-ae8e-61627e0d8e4a", "2222f52f-cc3f-4ac3-96b8-638078455f64",
+    "1687d096-4d58-4828-97de-d31e23784b36", "45ae3d97-cd76-4c53-a821-e220367eb2c2" 

TEAMModelOS/ClientApp/src/store/module/totalAnalysis.js

@@ -178,7 +178,7 @@ export default {
                     console.log('Cache-Achievement')
                     r(context.state.achievementData)
                 } else {
-                    apiTools.totalAnalysis.getAchievementData({ 'ExamCode': '1371cb0c-6c72-4c1c-868a-aac00e74a0fb' }).then(res => { // api请求
+                    apiTools.totalAnalysis.getAchievementData({ 'examCode': '1371cb0c-6c72-4c1c-868a-aac00e74a0fb' }).then(res => { // api请求
                         context.commit('getAchievementData', res.result.data) // 提交到vuex保存数据
                         context.commit('updateCurSubject', res.result.data.average.datas.map(item => item.name)[2]) // 提交到vuex保存数据
                         console.log('API-Achievement')
@@ -242,7 +242,8 @@ export default {
             let params = {
                 // Subject: context.state.currentSubject
                 subjectCode: 'Subject_Math',
-                scopeCode: 'qcs',
+                scopeCode: '1371cb0c-6c72-4c1c-868a-aac00e74a0fb',
+                schoolCode:'qcs',
                 examCode: '1371cb0c-6c72-4c1c-868a-aac00e74a0fb'
             }
             return new Promise((r, j) => {
@@ -267,8 +268,9 @@ export default {
             let params = {
                 // Subject: context.state.currentSubject
                 subjectCode: 'Subject_Math',
-                scopeCode: 'qcs',
+                scopeCode: '1371cb0c-6c72-4c1c-868a-aac00e74a0fb',
                 type: '5',
+                schoolCode: 'qcs',
                 examCode: '1371cb0c-6c72-4c1c-868a-aac00e74a0fb'
             }
             return new Promise((r, j) => {

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/EvaluationList/TotalIndex.vue

@@ -67,7 +67,7 @@
                             <div class="section-box">
                                 <div class="exam-data-item block-item">
                                     <div class="item-content">
-                                        <div class="item-num">16</div>
+                                        <div class="item-num">{{ examList.length }}</div>
                                         <div class="item-name">{{$t('totalAnalysis.ti_text12')}}</div>
                                     </div>
                                 </div>
@@ -305,7 +305,7 @@
 
             // 获取评测列表
             getExamList() {
-                this.$api.totalAnalysis.getExamList({ schoolCode: 'qcs',scopeCode: 'qcs' }).then(res => { // api请求
+                this.$api.totalAnalysis.getExamList({ scopeCode: 'qcs' }).then(res => { // api请求
                     this.examList = res.result.data
                     this.originList = res.result.data
                     this.searchList = this.examList.length ? this.examList.map(item => item.name) : []

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/index.vue

@@ -259,7 +259,7 @@
 
             // 如果路由跳转到成绩分析页面带有考试序号参数则跳转到当前考试
             if (examIndex || examIndex === 0) {
-                this.$api.totalAnalysis.getExamList({ Code: 'qcs' }).then(res => { // api请求
+                this.$api.totalAnalysis.getExamList({ scopeCode: 'qcs' }).then(res => { // api请求
                     this.currentExamItem = res.result.data[examIndex]
                     console.log(this.currentExamItem)
                     this.subjectSplitList = this.currentExamItem.conditions.subject
@@ -271,7 +271,7 @@
                     console.log(err)
                 })
             } else if (!examIndex && examIndex !== 0) { // 如果是首次进入则读取上次考试，如果没有上次考试则默认读取第一个
-                this.$api.totalAnalysis.getExamList({ Code: 'qcs' }).then(res => { // api请求
+                this.$api.totalAnalysis.getExamList({ scopeCode: 'qcs' }).then(res => { // api请求
                     let existExam = JSON.parse(sessionStorage.getItem('c_exam'))
                     let list = res.result.data
                     if (existExam) {

TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -585,21 +585,24 @@ namespace TEAMModelOS.Controllers.Analysis
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             HashSet<string> classList = new HashSet<string>();
             List<Dictionary<string, object>> exerciseScatter = new List<Dictionary<string, object>>();
-            //Dictionary<string, object> scatterAnalysis = new Dictionary<string, object>();
+            Dictionary<string, object> scatterAnalysis = new Dictionary<string, object>();
             request.@params.TryGetValue("subjectCode", out object subjectCode);
             request.@params.TryGetValue("schoolCode", out object schoolCode);
             request.@params.TryGetValue("examCode", out object examCode);
+            request.@params.TryGetValue("scopeCode", out object scopeCode);
             Dictionary<string, object> sub = new Dictionary<string, object>
             {
-                { "subjectCode",  subjectCode.ToString()}
+                { "subjectCode",  subjectCode.ToString()},
+                { "scopeCode",scopeCode.ToString()}
             };
             Dictionary<string, object> examMap = new Dictionary<string, object>
             {
                 { "subjectCode", subjectCode.ToString()},
-                { "examCode", examCode.ToString()}
+                { "examCode", scopeCode.ToString()},
+                { "schoolCode", schoolCode.ToString()}
             };
             List<ExamResult> exams = await azureCosmosDBRepository.FindByDict<ExamResult>(examMap);
-            List<ExamPaper> paper = await azureCosmosDBRepository.FindByDict<ExamPaper>(sub);
+            List<ExamPaper> paper = await azureCosmosDBRepository.FindByDict<ExamPaper> (sub);
             List<string> key = new List<string>
             {
                 "id",