Commit 10cf4c8c9738a7bba06e3a94d2a179fcb1b2dd19

Authored by 梁保满
1 parent 38bdc422

学生画像接口调整

src/views/examinationPaper/add.vue
@@ -1094,7 +1094,7 @@ export default { @@ -1094,7 +1094,7 @@ export default {
1094 this.stem.type = type; 1094 this.stem.type = type;
1095 this.stem.index = index; 1095 this.stem.index = index;
1096 this.stem.indexs = indexs; 1096 this.stem.indexs = indexs;
1097 - this.stem.knowledge = obj.knowledge?.split("") || []; 1097 + this.stem.knowledge = obj.knowledge&&obj.knowledge.split(",") || [];
1098 this.stem.difficultyFactor = obj.difficultyFactor || ""; 1098 this.stem.difficultyFactor = obj.difficultyFactor || "";
1099 this.dialogTag = true; 1099 this.dialogTag = true;
1100 }, 1100 },
src/views/examinationPaper/edit.vue
@@ -577,12 +577,13 @@ export default { @@ -577,12 +577,13 @@ export default {
577 this.dialogStem = true; 577 this.dialogStem = true;
578 }, 578 },
579 openTag(obj, type, index, indexs) { 579 openTag(obj, type, index, indexs) {
  580 + console.log(obj)
580 //难度,知识点 581 //难度,知识点
581 this.stem = { ...this.stem, obj }; 582 this.stem = { ...this.stem, obj };
582 this.stem.type = type; 583 this.stem.type = type;
583 this.stem.index = index; 584 this.stem.index = index;
584 this.stem.indexs = indexs; 585 this.stem.indexs = indexs;
585 - this.stem.knowledge = obj.knowledge?.split("") || []; 586 + this.stem.knowledge = obj.knowledge&&obj.knowledge.split(",") || [];
586 this.stem.difficultyFactor = obj.difficultyFactor || ""; 587 this.stem.difficultyFactor = obj.difficultyFactor || "";
587 this.dialogTag = true; 588 this.dialogTag = true;
588 }, 589 },
src/views/index/mainIndex.vue
@@ -140,8 +140,8 @@ @@ -140,8 +140,8 @@
140 </div> 140 </div>
141 <div class="text" v-else-if="item.path == '/portrait'"> 141 <div class="text" v-else-if="item.path == '/portrait'">
142 <p class="p1">学生画像</p> 142 <p class="p1">学生画像</p>
143 - <!-- <p class="p2">共分析{{ dataInfo.imagesCount }}名学生成绩。</p> -->  
144 - <p class="p2">功能开发中。</p> 143 + <p class="p2">共分析{{ dataInfo.imagesCount }}名学生成绩。</p>
  144 + <!-- <p class="p2">功能开发中。</p> -->
145 </div> 145 </div>
146 <div class="text" v-else-if="item.path == '/ask'"> 146 <div class="text" v-else-if="item.path == '/ask'">
147 <p class="p1">随堂问报表</p> 147 <p class="p1">随堂问报表</p>
src/views/personal/test/index.vue
@@ -91,6 +91,7 @@ @@ -91,6 +91,7 @@
91 <el-table-column 91 <el-table-column
92 prop="title" 92 prop="title"
93 label="试卷名称" 93 label="试卷名称"
  94 + fixed
94 align="center" 95 align="center"
95 ></el-table-column> 96 ></el-table-column>
96 <el-table-column 97 <el-table-column
@@ -515,7 +516,7 @@ export default { @@ -515,7 +516,7 @@ export default {
515 query: { 516 query: {
516 id: obj.studentId, 517 id: obj.studentId,
517 classId: this.query.classId, 518 classId: this.query.classId,
518 - subjectNames: subjectNames.join(""), 519 + subjectNames: subjectNames.join(","),
519 studentName: obj.studentName, 520 studentName: obj.studentName,
520 studentCode: obj.studentCode, 521 studentCode: obj.studentCode,
521 }, 522 },
@@ -856,6 +857,8 @@ div::-webkit-scrollbar-thumb { @@ -856,6 +857,8 @@ div::-webkit-scrollbar-thumb {
856 } 857 }
857 .click-b { 858 .click-b {
858 cursor: pointer; 859 cursor: pointer;
  860 + color: #409EFF;
  861 + text-decoration: underline;
859 } 862 }
860 .down { 863 .down {
861 padding-top: 16px; 864 padding-top: 16px;
src/views/portrait/detail.vue
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 v-model="query.subjectNames" 27 v-model="query.subjectNames"
28 placeholder="选择科目" 28 placeholder="选择科目"
29 multiple 29 multiple
  30 + @change="changeSub"
30 > 31 >
31 <el-option 32 <el-option
32 v-for="item in subjectList" 33 v-for="item in subjectList"
@@ -178,21 +179,8 @@ export default { @@ -178,21 +179,8 @@ export default {
178 indicator: [], 179 indicator: [],
179 num: [], 180 num: [],
180 }, 181 },
181 - lineChartData: [  
182 - {  
183 - name: "班平均分",  
184 - value: [95, 85, 90, 86, 92],  
185 - },  
186 - {  
187 - name: "个人成绩",  
188 - value: [90, 80, 95, 82, 95],  
189 - },  
190 - {  
191 - name: "班级排名",  
192 - value: [2, 3, 1, 5, 6],  
193 - },  
194 - ],  
195 - xAxis: ["卷1", "卷2", "卷3", "卷4", "卷5"], 182 + lineChartData: [],
  183 + xAxis: [],
196 tableData: [], 184 tableData: [],
197 count: 0, //测练数 185 count: 0, //测练数
198 }; 186 };
@@ -206,7 +194,10 @@ export default { @@ -206,7 +194,10 @@ export default {
206 this.studentCode = this.$route.query.studentCode; 194 this.studentCode = this.$route.query.studentCode;
207 this.studentName = this.$route.query.studentName; 195 this.studentName = this.$route.query.studentName;
208 if (this.role != "ROLE_JIAOSHI") { 196 if (this.role != "ROLE_JIAOSHI") {
209 - this.subjectNames = this.$route.query.subjectNames?.split() || []; 197 + this.subjectNames =
  198 + (this.$route.query.subjectNames &&
  199 + this.$route.query.subjectNames.split(",")) ||
  200 + [];
210 } else { 201 } else {
211 this.subjectNames = this.$route.query.subjectNames; 202 this.subjectNames = this.$route.query.subjectNames;
212 } 203 }
@@ -228,12 +219,12 @@ export default { @@ -228,12 +219,12 @@ export default {
228 this.query.subjectNames = val.filter((item) => { 219 this.query.subjectNames = val.filter((item) => {
229 return sub != "全部" ? item != "全部" : item == "全部"; 220 return sub != "全部" ? item != "全部" : item == "全部";
230 }); 221 });
231 - this.type =  
232 - this.query.subjectNames.length > 1  
233 - ? 1  
234 - : this.query.subjectNames[0] == "全部" && this.subjectList.length > 2  
235 - ? 1  
236 - : 2; 222 + // this.type =
  223 + // this.query.subjectNames.length > 1
  224 + // ? 1
  225 + // : this.query.subjectNames[0] == "全部" && this.subjectList.length > 2
  226 + // ? 1
  227 + // : 2;
237 }, 228 },
238 setDate(index) { 229 setDate(index) {
239 const that = this; 230 const that = this;
@@ -377,9 +368,16 @@ export default { @@ -377,9 +368,16 @@ export default {
377 } else { 368 } else {
378 subjectNames = [...this.query.subjectNames]; 369 subjectNames = [...this.query.subjectNames];
379 } 370 }
  371 + this.type =
  372 + subjectNames.length > 1
  373 + ? 1
  374 + : subjectNames[0] == "全部" && this.subjectList.length > 2
  375 + ? 1
  376 + : 2;
380 } else { 377 } else {
381 subjectNames = [this.query.subjectNames]; 378 subjectNames = [this.query.subjectNames];
382 } 379 }
  380 +
383 let studentExamReport = 381 let studentExamReport =
384 this.role == "ROLE_PERSONAL" 382 this.role == "ROLE_PERSONAL"
385 ? this.$request.pStudentExamReport 383 ? this.$request.pStudentExamReport
src/views/standard/test/index.vue
@@ -105,6 +105,7 @@ @@ -105,6 +105,7 @@
105 <el-table-column 105 <el-table-column
106 prop="title" 106 prop="title"
107 label="试卷名称" 107 label="试卷名称"
  108 + fixed
108 align="center" 109 align="center"
109 ></el-table-column> 110 ></el-table-column>
110 <el-table-column 111 <el-table-column
@@ -592,7 +593,7 @@ export default { @@ -592,7 +593,7 @@ export default {
592 query: { 593 query: {
593 id: obj.studentId, 594 id: obj.studentId,
594 classId: this.query.classId, 595 classId: this.query.classId,
595 - subjectNames: subjectNames.join(""), 596 + subjectNames: subjectNames.join(","),
596 studentName: obj.studentName, 597 studentName: obj.studentName,
597 studentCode: obj.studentCode, 598 studentCode: obj.studentCode,
598 }, 599 },
@@ -1000,5 +1001,7 @@ div::-webkit-scrollbar-thumb { @@ -1000,5 +1001,7 @@ div::-webkit-scrollbar-thumb {
1000 } 1001 }
1001 .click-b { 1002 .click-b {
1002 cursor: pointer; 1003 cursor: pointer;
  1004 + color: #409EFF;
  1005 + text-decoration: underline;
1003 } 1006 }
1004 </style> 1007 </style>
1005 \ No newline at end of file 1008 \ No newline at end of file