Commit 7cc958225aa09606982e80dda458b036ac10c4b0

Authored by yangzhi
1 parent 4e083f72

组卷修改

src/views/TestPaper/ManualTestPaper.vue
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
64 <span style="margin-right: 10px;">单选题:{{TestPaper.SingleNumber}}</span> 64 <span style="margin-right: 10px;">单选题:{{TestPaper.SingleNumber}}</span>
65 <span style="margin-right: 10px;">多选题:{{TestPaper.MultipleNumber}}</span> 65 <span style="margin-right: 10px;">多选题:{{TestPaper.MultipleNumber}}</span>
66 <span style="margin-right: 10px;">主观题:{{TestPaper.SubjectiveNumber}}</span> 66 <span style="margin-right: 10px;">主观题:{{TestPaper.SubjectiveNumber}}</span>
  67 + <span style="margin-right: 10px;">主观题:{{TestPaper.VoiceNumber}}</span>
67 </el-form-item> 68 </el-form-item>
68 <el-form-item label="题目总分:" class="el-form-item-custom"> 69 <el-form-item label="题目总分:" class="el-form-item-custom">
69 {{TestPaper.TotalScore || ''}} 70 {{TestPaper.TotalScore || ''}}
@@ -231,6 +232,7 @@ @@ -231,6 +232,7 @@
231 SingleNumber: 0, 232 SingleNumber: 0,
232 MultipleNumber: 0, 233 MultipleNumber: 0,
233 SubjectiveNumber: 0, 234 SubjectiveNumber: 0,
  235 + VoiceNumber:0,
234 OriginalPrice: "0", 236 OriginalPrice: "0",
235 PresentPrice: "0", 237 PresentPrice: "0",
236 MembershipPrice: "0", 238 MembershipPrice: "0",
@@ -369,6 +371,11 @@ @@ -369,6 +371,11 @@
369 this.dialogTableVisible = false; 371 this.dialogTableVisible = false;
370 if (!list.length) { 372 if (!list.length) {
371 this.$message.warning('所选分类没有试题'); 373 this.$message.warning('所选分类没有试题');
  374 + }else{
  375 + this.TestPaper.SingleNumber = list.filter(t=>t.subjectType == 1).length;
  376 + this.TestPaper.MultipleNumber = list.filter(t=>t.subjectType == 2).length;
  377 + this.TestPaper.SubjectiveNumber = list.filter(t=>t.subjectType == 3).length;
  378 + this.TestPaper.VoiceNumber = list.filter(t=>t.subjectType == 4).length;
372 } 379 }
373 }); 380 });
374 }, 381 },
@@ -506,6 +513,10 @@ @@ -506,6 +513,10 @@
506 if (e.item._underlying_vm_.subjectType == 3) { 513 if (e.item._underlying_vm_.subjectType == 3) {
507 this.TestPaper.SubjectiveNumber -= 1; 514 this.TestPaper.SubjectiveNumber -= 1;
508 } 515 }
  516 + if (e.item._underlying_vm_.subjectType == 4) {
  517 + this.TestPaper.VoiceNumber -= 1;
  518 + }
  519 +
509 this.TestPaper.TotalScore -= e.item._underlying_vm_.fraction; 520 this.TestPaper.TotalScore -= e.item._underlying_vm_.fraction;
510 this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id); 521 this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
511 }, 522 },
@@ -521,6 +532,9 @@ @@ -521,6 +532,9 @@
521 if (e.item._underlying_vm_.subjectType == 3) { 532 if (e.item._underlying_vm_.subjectType == 3) {
522 this.TestPaper.SubjectiveNumber += 1; 533 this.TestPaper.SubjectiveNumber += 1;
523 } 534 }
  535 + if (e.item._underlying_vm_.subjectType == 4) {
  536 + this.TestPaper.VoiceNumber += 1;
  537 + }
524 this.TestPaper.TotalScore += e.item._underlying_vm_.fraction; 538 this.TestPaper.TotalScore += e.item._underlying_vm_.fraction;
525 539
526 this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id); 540 this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
@@ -548,6 +562,9 @@ @@ -548,6 +562,9 @@
548 if (rs.subjectType == 3) { 562 if (rs.subjectType == 3) {
549 this.TestPaper.SubjectiveNumber += 1; 563 this.TestPaper.SubjectiveNumber += 1;
550 } 564 }
  565 + if (rs.subjectType == 4) {
  566 + this.TestPaper.VoiceNumber += 1;
  567 + }
551 }); 568 });
552 }); 569 });
553 } 570 }
src/views/TestPaper/TestPaperList.vue
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 <span>{{ scope.row.TotalScore }}</span> 21 <span>{{ scope.row.TotalScore }}</span>
22 </template> 22 </template>
23 </el-table-column> 23 </el-table-column>
  24 +
24 <el-table-column prop="date" label="单选题数量" width="100"> 25 <el-table-column prop="date" label="单选题数量" width="100">
25 <template slot-scope="scope"> 26 <template slot-scope="scope">
26 <span>{{ scope.row.SingleNumber }}</span> 27 <span>{{ scope.row.SingleNumber }}</span>
@@ -36,6 +37,16 @@ @@ -36,6 +37,16 @@
36 <span>{{ scope.row.SubjectiveNumber }}</span> 37 <span>{{ scope.row.SubjectiveNumber }}</span>
37 </template> 38 </template>
38 </el-table-column> 39 </el-table-column>
  40 + <el-table-column prop="date" label="语音题数量" width="100">
  41 + <template slot-scope="scope">
  42 + <span>{{ scope.row.VoiceNumber }}</span>
  43 + </template>
  44 + </el-table-column>
  45 + <el-table-column prop="date" label="工种" width="80">
  46 + <template slot-scope="scope">
  47 + <span>{{ scope.row.UserTypeOfWorkName }}</span>
  48 + </template>
  49 + </el-table-column>
39 <el-table-column prop="TestPaperClassId" label="分类" width="100"> 50 <el-table-column prop="TestPaperClassId" label="分类" width="100">
40 <template slot-scope="scope"> 51 <template slot-scope="scope">
41 <span>{{ scope.row.TestPaperClassId | typeFilters}}</span> 52 <span>{{ scope.row.TestPaperClassId | typeFilters}}</span>
src/views/user/picuserimport.vue
@@ -339,12 +339,10 @@ export default { @@ -339,12 +339,10 @@ export default {
339 this.table_data = []; 339 this.table_data = [];
340 } else { 340 } else {
341 console.log(index, row); 341 console.log(index, row);
342 - this.table_data.splice(index, 1); 342 +
343 } 343 }
344 - UserInfo_BatchToUser(row.id);  
345 - this.$message({  
346 - message: "入库成功!",  
347 - type: "success", 344 + UserInfo_BatchToUser(row.id).then(res=>{
  345 + this.table_data.splice(index, 1);
348 }); 346 });
349 }, 347 },
350 348
src/views/user/userlist.vue
@@ -189,12 +189,9 @@ @@ -189,12 +189,9 @@
189 189
190 <el-dialog title="邀请面试-试卷选择" :visible.sync="dialogFormVisible"> 190 <el-dialog title="邀请面试-试卷选择" :visible.sync="dialogFormVisible">
191 <el-form :model="form"> 191 <el-form :model="form">
192 - <!-- <el-form-item label="活动名称" :label-width="formLabelWidth">  
193 - <el-input v-model="form.name" autocomplete="off"></el-input>  
194 - </el-form-item> -->  
195 <el-form-item label="试卷"> 192 <el-form-item label="试卷">
196 <el-select v-model="form.TestPaperId" placeholder="请选择试卷" style="width: 80%"> 193 <el-select v-model="form.TestPaperId" placeholder="请选择试卷" style="width: 80%">
197 - <el-option :value="item.id" v-for="item in testpaperlist">{{ 194 + <el-option :value="item.id" :label="'['+item.id+']'+item.TestPaperTitle" v-for="item in testpaperlist">{{
198 "[" + item.id + "] " + (item.TestPaperTitle || "未命名") 195 "[" + item.id + "] " + (item.TestPaperTitle || "未命名")
199 }}</el-option> 196 }}</el-option>
200 </el-select> 197 </el-select>