diff --git a/client/src/views/exam/testPaperCreate.vue b/client/src/views/exam/testPaperCreate.vue
index 6a60a5e..a4e3e2c 100644
--- a/client/src/views/exam/testPaperCreate.vue
+++ b/client/src/views/exam/testPaperCreate.vue
@@ -10,7 +10,29 @@
             <el-form-item label="时间限制" prop="limit">
               <el-input-number v-model="Form.limit" :min="0"></el-input-number>分钟
             </el-form-item>
-            <el-form-item label="试卷信息">
+            <el-form-item label="试卷模式" prop="paper_types">
+              <el-select v-model="Form.paper_types" style="width:100%" clearable>
+                <el-option
+                label = "押题"
+                value = 'true'>
+                </el-option>
+                <el-option 
+                  label = '抽考'
+                  value= 'false'>
+                </el-option>
+          </el-select>
+            </el-form-item> 
+          <el-form-item label="题目类型" prop="category" v-if="Form.paper_types==='false'">
+            <el-select v-model="Form.category"  multiple placeholder = "请选择题目分类">
+              <el-option 
+              v-for="item in type_list"
+              :key = "item.id"
+              :label = "item.name"
+              :value = "item.id">
+              </el-option>
+          </el-select>
+          </el-form-item>
+            <el-form-item label="试卷信息" v-if="Form.paper_types==='true'">
               <div>
                 单选题
                 <span style="color:darkred;font-weight:bold">{{Form.danxuan_count}} 道</span>
@@ -34,6 +56,31 @@
                 <span style="color:darkred;font-weight:bold">{{Form.total_score}}</span>
               </div>
             </el-form-item>
+            <el-form-item label="试卷信息" v-if="Form.paper_types==='false'">
+              <div>
+                单选题
+                <el-input-number style="width:30%" v-model="Form.danxuan_count" :min="0"></el-input-number>道
+                每道
+                <el-input-number style="width:30%" v-model="Form.danxuan_score" :min="0" ></el-input-number>分
+              </div>
+              <div>
+                多选题
+                <el-input-number style="width:30%" v-model="Form.duoxuan_count" :min="0"></el-input-number>道
+                每道
+                <el-input-number style="width:30%" v-model="Form.duoxuan_score" :min="0" ></el-input-number>分
+              </div>
+              <div>
+                判断题
+                <el-input-number style="width:30%" v-model="Form.panduan_count" :min="0"></el-input-number>道
+                每道
+                <el-input-number style="width:30%" v-model="Form.panduan_score" :min="0" ></el-input-number>分
+              </div>
+              <div>
+                总分数
+                <!-- <el-input-number style="width:30%" v-model="Form.total_score" :min="0" ></el-input-number>分 -->
+                 <span style="color:darkred;font-weight: bold;">{{ totalScore }}</span>
+              </div>
+            </el-form-item>
             <el-form-item label="及格分数" prop="pass_score">
               <el-input-number v-model="Form.pass_score" :min="0"></el-input-number>分
             </el-form-item>
@@ -45,7 +92,7 @@
          </el-card>
         </el-col>
         <el-col :span="16">
-          <el-card header="试题信息">
+          <el-card header="试题信息" v-if="Form.paper_types==='true'">
           <!-- <div> -->
           <div style="display: flex;">
           <el-button type="primary" @click="handleChoose" icon="el-icon-plus" style="margin-right: 10px;">选择试题</el-button>     
@@ -131,7 +178,9 @@
             name: "",
             // workscope: null,
             limit: 60,
+            paper_types:"",
             total_score: 0,
+            category:[],
             pass_score: 60,
             questions_: [],
             danxuan_score: 2,
@@ -172,6 +221,15 @@
     watch: {
       questions: "calScore"
     },
+    computed:{
+      totalScore(){
+        return(
+            this.Form.danxuan_score * this.Form.danxuan_count +
+            this.Form.duoxuan_score * this.Form.duoxuan_count +
+            this.Form.panduan_score * this.Form.panduan_count
+        );
+      },
+    },
     created() {
       this.getQuestioncat();
     },
@@ -222,6 +280,11 @@
         this.$refs[formName].validate(valid => {
           if (valid) {
             this.submitLoding = true;
+            if (this.Form.paper_types == 'false'){
+              this.Form.paper_types = '抽考';
+              this.Form.total_score = this.totalScore;
+            }else{this.Form.paper_types = '押题'};
+    
             createPaper(this.Form).then(response => {
               this.submitLoding = false;
               this.$message({
diff --git a/client/src/views/system/userExam.vue b/client/src/views/system/userExam.vue
index a31eb2d..67c2b61 100644
--- a/client/src/views/system/userExam.vue
+++ b/client/src/views/system/userExam.vue
@@ -520,7 +520,7 @@ export default {
             updateUser(this.user.id, this.user).then((res) => {
               if (res.code >= 200) {
                 this.getList();
-                this.dialogVisible = true;
+                this.dialogVisible = false;
                  this.impForm.file = ''
                 this.$message.success("成功");
               };