From 7cc958225aa09606982e80dda458b036ac10c4b0 Mon Sep 17 00:00:00 2001
From: yangzhi <765157588@qq.com>
Date: Wed, 18 May 2022 01:49:51 +0800
Subject: [PATCH] 组卷修改

---
 src/views/TestPaper/ManualTestPaper.vue | 17 +++++++++++++++++
 src/views/TestPaper/TestPaperList.vue   | 11 +++++++++++
 src/views/user/picuserimport.vue        |  8 +++-----
 src/views/user/userlist.vue             |  5 +----
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/views/TestPaper/ManualTestPaper.vue b/src/views/TestPaper/ManualTestPaper.vue
index 210e828..5d47a4a 100644
--- a/src/views/TestPaper/ManualTestPaper.vue
+++ b/src/views/TestPaper/ManualTestPaper.vue
@@ -64,6 +64,7 @@
               <span style="margin-right: 10px;">单选题：{{TestPaper.SingleNumber}}</span>
               <span style="margin-right: 10px;">多选题：{{TestPaper.MultipleNumber}}</span>
               <span style="margin-right: 10px;">主观题：{{TestPaper.SubjectiveNumber}}</span>
+              <span style="margin-right: 10px;">主观题：{{TestPaper.VoiceNumber}}</span>
             </el-form-item>
             <el-form-item label="题目总分:" class="el-form-item-custom">
               {{TestPaper.TotalScore || ''}}
@@ -231,6 +232,7 @@
           SingleNumber: 0,
           MultipleNumber: 0,
           SubjectiveNumber: 0,
+          VoiceNumber:0,
           OriginalPrice: "0",
           PresentPrice: "0",
           MembershipPrice: "0",
@@ -369,6 +371,11 @@
           this.dialogTableVisible = false;
           if (!list.length) {
             this.$message.warning('所选分类没有试题');
+          }else{
+            this.TestPaper.SingleNumber = list.filter(t=>t.subjectType == 1).length;
+            this.TestPaper.MultipleNumber = list.filter(t=>t.subjectType == 2).length;
+            this.TestPaper.SubjectiveNumber = list.filter(t=>t.subjectType == 3).length;
+            this.TestPaper.VoiceNumber = list.filter(t=>t.subjectType == 4).length;
           }
         });
       },
@@ -506,6 +513,10 @@
         if (e.item._underlying_vm_.subjectType == 3) {
           this.TestPaper.SubjectiveNumber -= 1;
         }
+        if (e.item._underlying_vm_.subjectType == 4) {
+          this.TestPaper.VoiceNumber -= 1;
+        }
+        
         this.TestPaper.TotalScore -= e.item._underlying_vm_.fraction;
         this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
       },
@@ -521,6 +532,9 @@
         if (e.item._underlying_vm_.subjectType == 3) {
           this.TestPaper.SubjectiveNumber += 1;
         }
+        if (e.item._underlying_vm_.subjectType == 4) {
+          this.TestPaper.VoiceNumber += 1;
+        }
         this.TestPaper.TotalScore += e.item._underlying_vm_.fraction;
 
         this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
@@ -548,6 +562,9 @@
               if (rs.subjectType == 3) {
                 this.TestPaper.SubjectiveNumber += 1;
               }
+              if (rs.subjectType == 4) {
+                this.TestPaper.VoiceNumber += 1;
+              }
             });
           });
         }
diff --git a/src/views/TestPaper/TestPaperList.vue b/src/views/TestPaper/TestPaperList.vue
index 1803eca..dc1de5b 100644
--- a/src/views/TestPaper/TestPaperList.vue
+++ b/src/views/TestPaper/TestPaperList.vue
@@ -21,6 +21,7 @@
           <span>{{ scope.row.TotalScore }}</span>
         </template>
       </el-table-column>
+      
       <el-table-column prop="date" label="单选题数量" width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.SingleNumber }}</span>
@@ -36,6 +37,16 @@
           <span>{{ scope.row.SubjectiveNumber }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="date" label="语音题数量" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.VoiceNumber }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="工种" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.UserTypeOfWorkName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="TestPaperClassId" label="分类" width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.TestPaperClassId | typeFilters}}</span>
diff --git a/src/views/user/picuserimport.vue b/src/views/user/picuserimport.vue
index 13c54f6..2a52498 100644
--- a/src/views/user/picuserimport.vue
+++ b/src/views/user/picuserimport.vue
@@ -339,12 +339,10 @@ export default {
         this.table_data = [];
       } else {
         console.log(index, row);
-        this.table_data.splice(index, 1);
+        
       }
-      UserInfo_BatchToUser(row.id);
-      this.$message({
-        message: "入库成功！",
-        type: "success",
+      UserInfo_BatchToUser(row.id).then(res=>{
+        this.table_data.splice(index, 1);
       });
     },
 
diff --git a/src/views/user/userlist.vue b/src/views/user/userlist.vue
index c10b9dc..17ecd54 100644
--- a/src/views/user/userlist.vue
+++ b/src/views/user/userlist.vue
@@ -189,12 +189,9 @@
 
     <el-dialog title="邀请面试-试卷选择" :visible.sync="dialogFormVisible">
       <el-form :model="form">
-        <!-- <el-form-item label="活动名称" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item> -->
         <el-form-item label="试卷">
           <el-select v-model="form.TestPaperId" placeholder="请选择试卷" style="width: 80%">
-            <el-option :value="item.id" v-for="item in testpaperlist">{{
+            <el-option :value="item.id" :label="'['+item.id+']'+item.TestPaperTitle"  v-for="item in testpaperlist">{{
               "[" + item.id + "] " + (item.TestPaperTitle || "未命名")
               }}</el-option>
           </el-select>
--
libgit2 0.21.4