diff --git a/src/api/QuestionClass.js b/src/api/QuestionClass.js
index f4af1be..41de4d4 100644
--- a/src/api/QuestionClass.js
+++ b/src/api/QuestionClass.js
@@ -15,6 +15,14 @@ export function getQuestionClass(params) {
         params
     })
 }
+
+export function GetQuestionClassByType(params) {
+    return request({
+        url: `/QuestionClass/GetQuestionClassByType`,
+        method: 'get',
+        params
+    })
+}
 // 修改 | 保存
 export function EditQuestionClass(params) {
     return request({
diff --git a/src/api/TestPaper.js b/src/api/TestPaper.js
index c2f8bc6..93f4dc0 100644
--- a/src/api/TestPaper.js
+++ b/src/api/TestPaper.js
@@ -10,7 +10,8 @@ export function EditTestPaper(params) {
 
 export function getTestPaperList(params) {
 	return request({
-		url: `/TestPaper/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&sort=${params.sort}&sortOrder=${params.sortOrder}`,
+		url: `/TestPaper/List`,
+		// url: `/TestPaper/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&sort=${params.sort}&sortOrder=${params.sortOrder}`,
 		method: 'get',
 		data: params
 	})
diff --git a/src/api/user.js b/src/api/user.js
index f375988..82bced6 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -94,4 +94,12 @@ export function UpdateCurrentPasswordById(data) {
     method: 'post',
     data
   })
-}
+} 
+ 
+export function AddInvitationAnswerMultiple(data) {
+  return request({
+    url: `/InvitationAnswer/AddInvitationAnswerMultiple`,
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file
diff --git a/src/views/QuestionBank/components/EditDimension.vue b/src/views/QuestionBank/components/EditDimension.vue
index 921d8fe..8ac49c4 100644
--- a/src/views/QuestionBank/components/EditDimension.vue
+++ b/src/views/QuestionBank/components/EditDimension.vue
@@ -237,8 +237,7 @@
         } catch (e) { }
       },
       show(id) {
-        if (id) {
-          this.data = {
+        this.data = {
             // id: Date.parse(new Date()) + '_' + Math.ceil(Math.random() * 99999),
             // key: Date.parse(new Date()) + '_' + Math.ceil(Math.random() * 99999),
             rules: [
@@ -255,6 +254,8 @@
               }
             ]
           };
+        if (id) {
+         
           this.dialogFormVisible = true;
           getQuestionClass({ id }).then(res => {
 
diff --git a/src/views/QuestionBank/index.vue b/src/views/QuestionBank/index.vue
index f66502f..d36c527 100644
--- a/src/views/QuestionBank/index.vue
+++ b/src/views/QuestionBank/index.vue
@@ -6,48 +6,24 @@
           <div class="TreeHeader">
             <label style="font-size: 18px">题目分类</label>
           </div>
-          <div
-            :style="{ height: TableColHeight + 'px' }"
-            class="areadiv"
-            style="margin: 10px 0 0 0; padding: 5px 0 0 0"
-          >
-            <el-tabs
-              v-model="activeTab"
-              @tab-click="handleTabsClick"
-              style="padding: 0 20px"
-              :stretch="true"
-            >
+          <div :style="{ height: TableColHeight + 'px' }" class="areadiv"
+            style="margin: 10px 0 0 0; padding: 5px 0 0 0">
+            <el-tabs v-model="activeTab" @tab-click="handleTabsClick" style="padding: 0 20px" :stretch="true">
               <el-tab-pane label="专业类" name="first"></el-tab-pane>
               <el-tab-pane label="测评类" name="second"></el-tab-pane>
             </el-tabs>
-            <el-tree
-              :data="activeTab == 'first' ? firstTreeData : secondTreeData"
-              :props="activeTab == 'first' ? firstTreeData : secondTreeData"
-              @node-click="handleNodeClick"
-              class="eltree"
-              :expand-on-click-node="false"
-            >
+            <el-tree :data="activeTab == 'first' ? firstTreeData : secondTreeData"
+              :props="activeTab == 'first' ? firstTreeData : secondTreeData" @node-click="handleNodeClick"
+              class="eltree" :expand-on-click-node="false">
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span>{{ node.label }}</span>
                 <span style="">
-                  <el-button
-                    type="text"
-                    size="mini"
-                    @click="showClassDialog(node)"
-                  >
+                  <el-button type="text" size="mini" @click="showClassDialog(node)" v-if="activeTab == 'first'?true:node.level<2?true:false">
                     添加下级
                   </el-button>
-                  <el-button
-                    type="text"
-                    v-if="activeTab == 'second'"
-                    @click="handleEditDimension(node, data)"
-                    >编辑</el-button
-                  >
-                  <el-button
-                    type="text"
-                    size="mini"
-                    @click="() => handleDeleteQuestionClass(node, data)"
-                  >
+                  <el-button type="text" v-if="activeTab == 'second'" @click="handleEditDimension(node, data)">编辑
+                  </el-button>
+                  <el-button type="text" size="mini" @click="() => handleDeleteQuestionClass(node, data)">
                     删除
                   </el-button>
                 </span>
@@ -59,24 +35,16 @@
       <el-col :span="18">
         <div class="grid-content bg-purple-light">
           <div class="seetingsDiv" style="">
-            <el-button type="primary" @click="dialogsubjectlVisible = true"
-              >添加题目
+            <el-button type="primary" @click="AddSubject">添加题目
             </el-button>
           </div>
           <div class="areadiv" :style="{ height: TableColHeight + 'px' }">
-            <el-table
-              :data="QuestList"
-              id="QuestionTable"
-              border
-              style="
+            <el-table :data="QuestList" id="QuestionTable" border style="
                 width: 100%;
                 border-radius: 5px;
                 box-shadow: 0 0 10px #efefef;
                 margin-top: 10px;
-              "
-              :header-cell-class-name="headerStyle"
-              :stripe="true"
-            >
+              " :header-cell-class-name="headerStyle" :stripe="true">
               <el-table-column prop="date" label="ID" width="50">
                 <template slot-scope="scope">
                   <span>{{ scope.row.id }}</span>
@@ -86,32 +54,28 @@
                 <template slot-scope="scope">
                   <span style="padding-left: 10px">{{
                     scope.row.subjectName
-                  }}</span>
+                    }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="QuestionClassName"
-                label="分类"
-                width="100"
-              >
+              <el-table-column prop="QuestionClassName" label="分类" width="100">
                 <template slot-scope="scope">
                   <span style="padding-left: 10px">{{
                     scope.row.QuestionClassName
-                  }}</span>
+                    }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="name" label="分数" width="80">
                 <template slot-scope="scope">
                   <span style="padding-left: 10px">{{
                     scope.row.fraction
-                  }}</span>
+                    }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="name" label="单项分数" width="80">
                 <template slot-scope="scope">
                   <span style="padding-left: 10px">{{
                     scope.row.singleFraction
-                  }}</span>
+                    }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="name" label="正确答案" width="80">
@@ -119,46 +83,33 @@
                   <span style="padding-left: 10px">{{ scope.row.answer }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="name"
-                label="题目"
-                :show-overflow-tooltip="true"
-              >
+              <el-table-column prop="name" label="题目" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   <span style="padding-left: 10px">{{
                     scope.row.subject
-                  }}</span>
+                    }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="name"
-                label="解析"
-                :show-overflow-tooltip="true"
-              >
+              <el-table-column prop="name" label="解析" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   <span style="padding-left: 10px">{{
                     scope.row.analysis
-                  }}</span>
+                    }}</span>
                 </template>
               </el-table-column>
               <el-table-column fixed="right" label="操作" width="150">
                 <template slot-scope="scope">
-                  <el-dropdown
-                    @command="
+                  <el-dropdown @command="
                       (e) => {
                         handleCommand(e, scope.row.id);
                       }
-                    "
-                    style="padding-left: 10px"
-                  >
+                    " style="padding-left: 10px">
                     <span class="el-dropdown-link">
                       操作<i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
                     <template #dropdown>
                       <el-dropdown-menu>
-                        <el-dropdown-item command="update"
-                          >编辑</el-dropdown-item
-                        >
+                        <el-dropdown-item command="update">编辑</el-dropdown-item>
                         <!-- <el-dropdown-item command="b">锁定</el-dropdown-item> -->
                         <el-dropdown-item command="del">删除</el-dropdown-item>
                       </el-dropdown-menu>
@@ -167,83 +118,43 @@
                 </template>
               </el-table-column>
             </el-table>
-            <el-pagination
-              background
-              @current-change="currentchange"
-              style="
+            <el-pagination background @current-change="currentchange" style="
                 position: static;
                 bottom: 3px;
                 text-align: center;
                 margin-top: 5px;
-              "
-              :page-size="this.parameter.pageSize"
-              layout="total,prev, pager, next"
-              :total="Count"
-            >
+              " :page-size="this.parameter.pageSize" layout="total,prev, pager, next" :total="Count">
             </el-pagination>
             <div style="clear: both"></div>
           </div>
         </div>
       </el-col>
     </el-row>
-    <el-dialog
-      title="分类维护"
-      :visible.sync="dialogClassIVIsible"
-      @close="closeClassDialog"
-      width="400px"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="QuestionClassInfo"
-        :model="QuestionClassInfo"
-        label-width="70px"
-      >
+    <el-dialog title="分类维护" :visible.sync="dialogClassIVIsible" @close="closeClassDialog" width="400px"
+      :close-on-click-modal="false">
+      <el-form ref="QuestionClassInfo" :model="QuestionClassInfo" label-width="70px">
         <el-form-item label="分类名称">
-          <el-input
-            v-model="QuestionClassInfo.ClassificationName"
-            placeholder="请输入分类名称"
-          ></el-input>
+          <el-input v-model="QuestionClassInfo.ClassificationName" placeholder="请输入分类名称"></el-input>
         </el-form-item>
       </el-form>
-      <el-button
-        @click="CreateQuestionClassHealder"
-        style="margin: 10px 0 0 0; float: right"
-        type="primary"
-        >确定
+      <el-button @click="CreateQuestionClassHealder" style="margin: 10px 0 0 0; float: right" type="primary">确定
       </el-button>
       <div style="clear: both"></div>
     </el-dialog>
-    <el-dialog
-      title="编辑题目"
-      :visible.sync="dialogsubjectlVisible"
-      @close="closeDialog"
-      width="800px"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="编辑题目" :visible.sync="dialogsubjectlVisible" @close="closeDialog" width="800px"
+      :close-on-click-modal="false">
       <el-form ref="Dataform" :model="Dataform" label-width="60px">
         <el-form-item label="题目">
-          <el-input
-            v-model="Dataform.subject"
-            placeholder="请输入题目名称"
-          ></el-input>
+          <el-input v-model="Dataform.subject" placeholder="请输入题目名称"></el-input>
         </el-form-item>
         <el-form-item label="分类" style="padding-top: 5px">
-          <el-cascader
-            v-model="Dataform.QuestionClassId"
-            style="width: 400px"
-            :props="{ emitPath: false }"
-            :clearable="true"
-            :options="QuestionClass"
-          >
+          <el-cascader @change="changequestionclass" v-model="Dataform.QuestionClassId" style="width: 400px" :props="{ emitPath: false ,checkStrictly:true}"
+            :clearable="true" :options="QuestionClass">
           </el-cascader>
         </el-form-item>
         <el-form-item label="题型" style="padding-top: 5px">
-          <el-select
-            v-model="Dataform.subjectType"
-            value-key="Dataform.subjectType"
-            @change="changeQuestionType"
-            placeholder="请选择题型"
-          >
+          <el-select v-model="Dataform.subjectType" value-key="Dataform.subjectType" @change="changeQuestionType"
+            placeholder="请选择题型">
             <el-option label="单选题" :value="1"></el-option>
             <el-option label="多选题" :value="2"></el-option>
             <el-option label="主观题" :value="3"></el-option>
@@ -253,484 +164,488 @@
           <el-table :data="subjectContent" :show-header="false">
             <el-table-column>
               <template slot-scope="scope">
-                <el-input
-                  placeholder="请输入答案"
-                  v-model="scope.row.optionContent"
-                  class="optionInput"
-                  style="width:68% !important"
-                >
+                <el-input placeholder="请输入答案" v-model="scope.row.optionContent" class="optionInput"
+                  style="width:68% !important">
                   <template slot="prepend">{{ scope.row.option }}</template>
                 </el-input>
 
-                <el-input
-                placeholder="维度分值"
-                v-model="scope.row.score"
-                class="optionInput"
-                style="width:21% !important;margin-left:1%"
-              > 
-              </el-input> 
+                <el-input placeholder="维度分值" v-model="scope.row.score" class="optionInput" v-if="FormClassType==2"
+                  style="width:21% !important;margin-left:1%">
+                </el-input>
 
 
                 <i class="el-icon-circle-plus el-icon" @click="Addlist"></i>
-                <i
-                  class="el-icon-remove el-icon"
-                  @click="RemoveList(scope)"
-                  v-if="scope.$index != 0"
-                ></i>
+                <i class="el-icon-remove el-icon" @click="RemoveList(scope)" v-if="scope.$index != 0"></i>
               </template>
             </el-table-column>
-      
+
           </el-table>
         </el-form-item>
-        <el-form-item
-          label="答案"
-          v-show="OptionVisible"
-          class="subjectContentClass"
-        >
-          <el-radio-group
-            v-for="(item, i) in subjectContent"
-            v-model="Dataform.answer"
-            v-if="GroupVisible"
-          >
+        <el-form-item label="答案" v-show="OptionVisible" class="subjectContentClass"  v-if="FormClassType!=2">
+          <el-radio-group v-for="(item, i) in subjectContent" v-model="Dataform.answer" v-if="GroupVisible">
             <el-radio :label="item.option">{{ item.option }}</el-radio>
           </el-radio-group>
-          <el-checkbox-group
-            v-for="(item, i) in subjectContent"
-            v-model="Dataform.answer"
-            v-if="!GroupVisible"
-          >
+          <el-checkbox-group v-for="(item, i) in subjectContent" v-model="Dataform.answer" v-if="!GroupVisible">
             <el-checkbox style="float: left" :label="item.option">{{
               item.option
-            }}</el-checkbox>
+              }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="分数" v-show="OptionVisible">
-          <el-input-number
-            :step="1"
-            style="float: left"
-            :min="0"
-            v-model="Dataform.fraction"
-          >
+        <el-form-item label="分数" v-show="OptionVisible && FormClassType !=2">
+          <el-input-number :step="1" style="float: left" :min="0" v-model="Dataform.fraction">
           </el-input-number>
           <div style="float: left; margin-left: 20px" v-if="!GroupVisible">
             <lable style="font-weight: bold">单项分数：</lable>
-            <el-input-number
-              :step="0.5"
-              :max="Dataform.fraction / 2"
-              :min="0"
-              v-model="Dataform.singleFraction"
-            >
+            <el-input-number :step="0.5" :max="Dataform.fraction / 2" :min="0" v-model="Dataform.singleFraction">
             </el-input-number>
           </div>
         </el-form-item>
         <el-form-item label="解析" style="margin-top: 10px">
-          <el-input
-            v-model="Dataform.analysis"
-            :rows="10"
-            type="textarea"
-            placeholder="请输入答案解析"
-          />
+          <el-input v-model="Dataform.analysis" :rows="10" type="textarea" placeholder="请输入答案解析" />
         </el-form-item>
       </el-form>
-      <el-button
-        @click="EditQuestionHeadler"
-        style="margin: 10px 0 0 0; float: right"
-        type="primary"
-        >确定
+      <el-button @click="EditQuestionHeadler" style="margin: 10px 0 0 0; float: right" type="primary">确定
       </el-button>
       <div style="clear: both"></div>
     </el-dialog>
-	<EditDimension ref="editDimensionDialog" :model="currentEditDimension"></EditDimension>
+    <EditDimension ref="editDimensionDialog" :model="currentEditDimension"></EditDimension>
   </div>
 </template>
 
 <script lang="ts">
-import {
-  getQuestionList,
-  EditQuestion,
-  getQuestionClassList,
-  DelQuestionBankEvent,
-  GetQuestionBankById,
-  CreateQuestionClass,
-} from "@/api/QuestionBank";
-import { parseTime } from "@/utils/index.js";
-import EditDimension from "./components/EditDimension.vue";
-export default {
-  filters: {},
-  components: {
-    EditDimension,
-  },
-  data() {
-    return {
-	  currentEditDimension:{},
-      activeTab: "first",
-      parameter: {
-        pageIndex: 1,
-        pageSize: 12,
-        sort: "id",
-        sortOrder: 1,
-        keyword: "",
-        QuestionClassId: 0,
-        status: 1,
-      },
-      Count: 0,
-      QuestList: [],
-      dialogsubjectlVisible: false,
-      dialogClassIVIsible: false,
-      OptionVisible: true,
-      GroupVisible: true,
-      Dataform: {
-        subject: "",
-        subjectType: 1,
-        subjectContent: "",
-        QuestionClassId: 0,
-        answer: [],
-        analysis: "",
-        fraction: 0,
-        singleFraction: 0,
-        addTime: "2021-11-12",
-        state: 1,
-      },
-      subjectContent: [
-        {
-          option: "A",
-          optionContent: "",
-        },
-      ],
-      QuestionClass: [],
-      QuestionClassInfo: {
-        ParentId: 0,
-        ClassificationName: "",
-        Addtime: "",
-      },
-      TreeColHeight: 0,
-      TableColHeight: 0,
-      treeData: [],
-      firstTreeData: [],
-      secondTreeData: [],
-      CreatClassId: 0,
-    };
-  },
-  created() {},
-  mounted() {
-    let ContentAreaHight =
-      window.innerHeight - document.getElementById("elRow").offsetTop - 70;
-    this.TableColHeight =
-      ContentAreaHight - document.getElementById("QuestionTable").offsetTop;
-    let lineNumber = this.TableColHeight - 50 - 20; //减去表头来计算
-    this.TreeColHeight = ContentAreaHight;
-    lineNumber = Math.floor(lineNumber / 49);
-    this.parameter.pageSize = lineNumber;
-    this.GetList();
-    this.getQuestionClassListHeadler();
-  },
-  methods: {
-    //维度编辑
-    handleEditDimension(node,data) {
-		console.log(data);
-      // this.$refs.editDimensionDialog.dialogFormVisible = true;
-      this.$refs.editDimensionDialog.show(data.id);
-	  this.currentEditDimension = data;
-    },
-    //切换分类
-    handleTabsClick(e) {
-      console.log(e.name);
+  import {
+    getQuestionList,
+    EditQuestion,
+    getQuestionClassList,
+    DelQuestionBankEvent,
+    GetQuestionBankById,
+    CreateQuestionClass,
+  } from "@/api/QuestionBank";
+  import { parseTime } from "@/utils/index.js";
+  import EditDimension from "./components/EditDimension.vue";
+  export default {
+    filters: {},
+    components: {
+      EditDimension,
     },
-    //删除分类
-    handleDeleteQuestionClass(node, data) {
-      console.log(node, data);
-      console.log(this.API);
-      this.API.deleteQuestionClass(data.value).then((res) => {
-        this.getQuestionClassListHeadler();
-      });
-    },
-    closeClassDialog() {
-      this.dialogClassIVIsible = false;
-    },
-    //表格右边的操作按钮
-    handleCommand(value, val) {
-      if (value == "update") {
-        this.GetQuestionBankByIdHeadler(val);
-      }
-      if (value == "del") {
-        this.DelQuestionBankEventHeadler(val);
-      }
+    data() {
+      return {
+        FormClassType:0,
+        loading: false,
+        currentEditDimension: {},
+        activeTab: "first",
+        parameter: {
+          pageIndex: 1,
+          pageSize: 12,
+          sort: "id",
+          sortOrder: 1,
+          keyword: "",
+          QuestionClassId: 0,
+          status: 1,
+        },
+        Count: 0,
+        QuestList: [],
+        dialogsubjectlVisible: false,
+        dialogClassIVIsible: false,
+        OptionVisible: true,
+        GroupVisible: true,
+        Dataform: {
+          subject: "",
+          subjectType: 1,
+          subjectContent: "",
+          QuestionClassId: 0,
+          answer: [],
+          analysis: "",
+          fraction: 0,
+          singleFraction: 0,
+          addTime: "2021-11-12",
+          state: 1,
+        },
+        subjectContent: [
+          {
+            option: "A",
+            optionContent: "",
+          },
+        ],
+        QuestionClass: [],
+        QuestionClassInfo: {
+          ParentId: 0,
+          ClassificationName: "",
+          Addtime: "",
+        },
+        TreeColHeight: 0,
+        TableColHeight: 0,
+        treeData: [],
+        firstTreeData: [],
+        secondTreeData: [],
+        CreatClassId: 0,
+      };
     },
-    //添加分类
-    CreateQuestionClassHealder() {
-      this.QuestionClassInfo.Addtime = parseTime(new Date(), "");
-      CreateQuestionClass(this.QuestionClassInfo).then((res) => {
-        // alert(res.code);
-      });
+    created() { },
+    mounted() {
+      let ContentAreaHight =
+        window.innerHeight - document.getElementById("elRow").offsetTop - 70;
+      this.TableColHeight =
+        ContentAreaHight - document.getElementById("QuestionTable").offsetTop;
+      let lineNumber = this.TableColHeight - 50 - 20; //减去表头来计算
+      this.TreeColHeight = ContentAreaHight;
+      lineNumber = Math.floor(lineNumber / 49);
+      this.parameter.pageSize = lineNumber;
+      this.GetList();
+      this.getQuestionClassListHeadler();
     },
-    //获取选择的题目详细信息
-    GetQuestionBankByIdHeadler(id) {
-      GetQuestionBankById(id).then((res) => {
-        this.changeQuestionType(res.data.data.subjectType); //这里先初始化编辑显示内容
-        this.Dataform = res.data.data; //内容赋值
-        this.subjectContent = JSON.parse(res.data.data.subjectContent); //赋值选项
-        if (res.data.data.subjectType == 1) {
-          this.Dataform.answer = res.data.data.answer.split(",")[0]; //赋值答案
-        } else {
-          this.Dataform.answer = res.data.data.answer.split(","); //赋值答案
+    methods: {
+      AddSubject(){
+        this.FormClassType = 0;
+        this.dialogsubjectlVisible = true
+      },
+      changequestionclass(a,b,c){ 
+        var item = this.QuestionClass.find(o=>o.id ==a);
+        if(item) this.FormClassType = item.ClassType;
+      },
+      //维度编辑
+      handleEditDimension(node, data) {
+        console.log(data);
+        // this.$refs.editDimensionDialog.dialogFormVisible = true;
+        this.$refs.editDimensionDialog.show(data.id);
+        this.currentEditDimension = data;
+      },
+      //切换分类
+      handleTabsClick(e) {
+        console.log(e.name);
+      },
+      //删除分类
+      handleDeleteQuestionClass(node, data) {
+        this.loading = true;
+        // console.log(node, data);
+        // console.log(this.API);
+        this.API.deleteQuestionClass(data.value).then((res) => {
+          
+          this.getQuestionClassListHeadler();
+
+          this.loading = false; 
+          this.$message.success('操作成功！');
+        });
+      },
+      closeClassDialog() {
+        this.dialogClassIVIsible = false;
+      },
+      //表格右边的操作按钮
+      handleCommand(value, val) {
+        if (value == "update") {
+          this.GetQuestionBankByIdHeadler(val);
         }
-        this.dialogsubjectlVisible = true;
-      });
-    },
-    showClassDialog(node) {
-      this.dialogClassIVIsible = true;
-      console.log(node);
-      this.QuestionClassInfo.ParentId = node.data.value;
-      //   alert(this.QuestionClassInfo.ParentId);
-    },
-    //关闭弹框的事件
-    closeDialog() {
-      //初始化数据
-      this.Dataform = this.$options.data().Dataform;
-      this.subjectContent = this.$options.data().subjectContent;
-      //所有文本框恢复到初始化状态
-      this.Dataform.answer = [];
-      this.OptionVisible = true;
-      this.GroupVisible = true;
-    },
-    //选择题目类型来判断是否显示部分表单
-    changeQuestionType(val) {
-      if (val == 3) {
-        this.OptionVisible = false;
-      }
-      if (val == 2) {
-        this.OptionVisible = true;
-        this.Dataform.answer = [];
-        this.GroupVisible = false;
-      }
-      if (val == 1) {
+        if (value == "del") {
+          this.DelQuestionBankEventHeadler(val);
+        }
+      },
+      //添加分类
+      CreateQuestionClassHealder() {
+      if(this.loading)return;
+        this.loading=true;
+      
+        this.QuestionClassInfo.Addtime = parseTime(new Date(), "");
+        CreateQuestionClass(this.QuestionClassInfo).then((res) => {
+          this.getQuestionClassListHeadler();
+          this.dialogClassIVIsible = false;
+          setTimeout(()=>{
+              this.loading = false;
+            },1000); 
+        });
+      },
+      //获取选择的题目详细信息
+      GetQuestionBankByIdHeadler(id) {
+        GetQuestionBankById(id).then((res) => {
+           
+          var d = this.QuestionClass.find(o=>o.id==res.data.data.QuestionClassId);
+          if(d)this.FormClassType = d.ClassType; 
+          this.changeQuestionType(res.data.data.subjectType); //这里先初始化编辑显示内容
+          this.Dataform = res.data.data; //内容赋值
+          this.subjectContent = JSON.parse(res.data.data.subjectContent); //赋值选项
+          if (res.data.data.subjectType == 1) {
+            this.Dataform.answer = res.data.data.answer.split(",")[0]; //赋值答案
+          } else {
+            this.Dataform.answer = res.data.data.answer.split(","); //赋值答案
+          }
+          this.dialogsubjectlVisible = true;
+        });
+      },
+      showClassDialog(node) {
+        this.dialogClassIVIsible = true;
+        console.log(node);
+        this.QuestionClassInfo.ParentId = node.data.value;
+        //   alert(this.QuestionClassInfo.ParentId);
+      },
+      //关闭弹框的事件
+      closeDialog() {
+        //初始化数据
+        this.Dataform = this.$options.data().Dataform;
+        this.subjectContent = this.$options.data().subjectContent;
+        //所有文本框恢复到初始化状态
         this.Dataform.answer = [];
         this.OptionVisible = true;
         this.GroupVisible = true;
-      }
-    },
-    headerStyle({ row, column, rowIndex, columnIndex }) {
-      return "tableStyle";
-    },
-    Addlist() {
-      if (this.subjectContent.length < 4) {
-        var alphabet = String.fromCharCode(
-          64 + parseInt(this.subjectContent.length + 1)
-        );
-        this.subjectContent.push({
-          option: alphabet,
-          title: "",
+      },
+      //选择题目类型来判断是否显示部分表单
+      changeQuestionType(val) { 
+        if (val == 3) {
+          this.OptionVisible = false;
+        }
+        if (val == 2) {
+          this.OptionVisible = true;
+          this.Dataform.answer = [];
+          this.GroupVisible = false;
+         
+        }
+        if (val == 1) {
+          this.Dataform.answer = [];
+          this.OptionVisible = true;
+          this.GroupVisible = true;
+        }
+      },
+      headerStyle({ row, column, rowIndex, columnIndex }) {
+        return "tableStyle";
+      },
+      Addlist() {
+        if (this.subjectContent.length < 4) {
+          var alphabet = String.fromCharCode(
+            64 + parseInt(this.subjectContent.length + 1)
+          );
+          this.subjectContent.push({
+            option: alphabet,
+            title: "",
+          });
+        } else {
+          this.$confirm("系统暂时只支持4个答案！", "消息");
+        }
+      },
+      RemoveList(val) {
+        this.subjectContent.splice(val.$index, 1);
+        this.subjectContent.forEach((item, index) => {
+          item.option = String.fromCharCode(64 + parseInt(index + 1));
         });
-      } else {
-        this.$confirm("系统暂时只支持4个答案！", "消息");
-      }
-    },
-    RemoveList(val) {
-      this.subjectContent.splice(val.$index, 1);
-      this.subjectContent.forEach((item, index) => {
-        item.option = String.fromCharCode(64 + parseInt(index + 1));
-      });
-    },
-    handleNodeClick(val) {
-      this.parameter.QuestionClassId = val.value;
-      this.parameter.pageIndex = 1;
-      this.GetList();
-    },
-    DelQuestionBankEventHeadler(id) {
-      this.$confirm("确定删除该试题？", "消息", {
-        confirmButtonText: "确认",
-        cancelButtonText: "取消",
-        callback: (action) => {
-          if (action == "confirm") {
-            DelQuestionBankEvent(id).then((res) => {
-              if (res.data.code == 200) {
-                this.$confirm(res.data.message, "消息");
-                this.GetList();
-              }
-            });
+      },
+      handleNodeClick(val) {
+        if(this.loading)return;
+        this.parameter.QuestionClassId = val.value;
+        this.parameter.pageIndex = 1;
+        this.GetList();
+      },
+      DelQuestionBankEventHeadler(id) {
+        this.$confirm("确定删除该试题？", "消息", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          callback: (action) => {
+            if (action == "confirm") {
+              DelQuestionBankEvent(id).then((res) => {
+                if (res.data.code == 200) {
+                  this.$confirm(res.data.message, "消息");
+                  this.GetList();
+                }
+              });
+            }
+          },
+        });
+      },
+      EditQuestionHeadler() {
+        let reg = new RegExp('"', "g");
+        //this.Dataform.subjectContent = JSON.stringify(this.subjectContent).replace(reg, "\"");
+        this.Dataform.subjectContent = this.subjectContent;
+        if (typeof this.Dataform.answer != "string")
+          //判断是否为字符串
+          this.Dataform.answer = this.Dataform.answer.join(",");
+        var _this = this;
+        EditQuestion(this.Dataform).then((res) => {
+          if (res.data.code == 200) {
+            _this.GetList();
+            this.$message(res.data.message);
+            setTimeout(function () {
+              _this.dialogsubjectlVisible = false;
+            }, 10);
           }
-        },
-      });
-    },
-    EditQuestionHeadler() {
-      let reg = new RegExp('"', "g");
-      //this.Dataform.subjectContent = JSON.stringify(this.subjectContent).replace(reg, "\"");
-      this.Dataform.subjectContent = this.subjectContent;
-      if (typeof this.Dataform.answer != "string")
-        //判断是否为字符串
-        this.Dataform.answer = this.Dataform.answer.join(",");
-      var _this = this;
-      EditQuestion(this.Dataform).then((res) => {
-        if (res.data.code == 200) {
-          _this.GetList();
-          this.$message(res.data.message);
-          setTimeout(function () {
-            _this.dialogsubjectlVisible = false;
-          }, 10);
-        }
-      });
-    },
-    GetList() {
-      let _this = this;
-      getQuestionList(_this.parameter).then((res) => {
-        _this.QuestList = res.data.data.rows;
-        _this.Count = res.data.data.total;
-        _this.$forceUpdate();
-      });
-    },
-    currentchange(page) {
-      this.parameter.pageIndex = page;
-      this.GetList();
-    },
-    getSubTree(id, list) {
-      let result = [];
-      result = list.filter((t) => t.ParentId == id);
-      if (result.length) {
-        result = result.map((item) => {
-          item.children = this.getSubTree(item.id, list);
-          return item;
         });
-      }
-      return result;
-    },
-    getQuestionClassListHeadler() {
-      let _this = this;
-      getQuestionClassList().then((res) => {
-        let list = res.data.data;
-        list = list.map((t) => {
-          t.value = t.id;
-          t.label = t.ClassificationName;
-          return t;
+      },
+      GetList() {
+        let _this = this;
+        getQuestionList(_this.parameter).then((res) => {
+          _this.QuestList = res.data.data.rows;
+          _this.Count = res.data.data.total;
+          _this.$forceUpdate();
         });
-        let firstClass = list.find((t) => t.id == 6);
-        firstClass.children = this.getSubTree(6, list);
-        let secondClass = list.find((t) => t.id == 1);
-        secondClass.children = this.getSubTree(1, list);
-        this.QuestionClass = list;
+      },
+      currentchange(page) {
+        this.parameter.pageIndex = page;
+        this.GetList();
+      },
+      getSubTree(id, list) {
+        let result = [];
+        result = list.filter((t) => t.ParentId == id);
+        if (result.length) {
+          result = result.map((item) => {
+            item.children = this.getSubTree(item.id, list);
+            return item;
+          });
+        }
+        return result;
+      },
+      getQuestionClassListHeadler() {
+        let _this = this;
+        getQuestionClassList().then((res) => {
+          let list = res.data.data;
+          list = list.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            return t;
+          });
+          let firstClass = list.find((t) => t.id == 6);
+          firstClass.children = this.getSubTree(6, list);
+          let secondClass = list.find((t) => t.id == 1);
+          secondClass.children = this.getSubTree(1, list);
+          this.QuestionClass = list;
 
-        this.firstTreeData = [firstClass];
-        this.secondTreeData = [secondClass];
-      });
+          this.firstTreeData = [firstClass];
+          this.secondTreeData = [secondClass];
+        });
+      },
     },
-  },
-};
+  };
 </script>
 <style scoped="scoped">
-/deep/.cell {
-  padding-left: 0px;
-}
-/deep/.el-form-item {
-  margin-bottom: 5px;
-}
-/deep/.el-radio {
-  margin-right: 10px;
-}
-/deep/.el-radio__input.is-checked .el-radio__inner {
-  border-color: #409eff;
-  background-color: #409eff;
-}
-/deep/.el-radio__input.is-checked + .el-radio__label {
-  color: #409eff;
-  font-weight: bold;
-}
-/deep/.tableStyle {
-  background-color: #304156 !important;
-  color: #fff;
-  font-weight: 400;
-}
-.QuestDiv {
-  width: 24%;
-  float: left;
-  min-height: 50px;
-  border: 1px solid #cdcdcd;
-  margin-right: 10px;
-  box-shadow: 0 0 10px #808080;
-  border-radius: 8px;
-  min-height: 100px;
-  background-color: #fff;
-  opacity: 0.8;
-  margin-bottom: 10px;
-  height: 313px;
-}
-.clear {
-  clear: both;
-  margin-bottom: 10px;
-}
-.font-color {
-  background-color: #ae1e15 !important;
-  color: #fff;
-  box-shadow: 0 0 5px #ae1e15;
-}
-/deep/.el-input-group__prepend {
-  font-weight: bold;
-  width: 30px;
-  text-align: center;
-  background: #409eff;
-  color: #fff;
-}
-.optionInput {
-  float: left;
-  width: 620px !important;
-}
-.el-icon {
-  font-size: 20px;
-  line-height: 40px;
-  margin: 0 5px;
-  cursor: pointer;
-  color: #409eff !important;
-}
->>> .subjectContentClass .el-checkbox__label {
-  padding-right: 10px !important;
-}
-.seetingsDiv {
-  width: 100%;
-  height: 60px;
-  background: #efefef;
-  line-height: 60px;
-  border-radius: 5px;
-  box-shadow: 0 0 5px #cdcdcd;
-}
-.seetingsDiv button {
-  background-color: #304156;
-  border: 0px;
-  margin-left: 10px;
-  box-shadow: 0 0 5px #cdcdcd;
-  float: right;
-  margin-top: 12px;
-  margin-right: 10px;
-}
-.areadiv {
-  background-color: #efefef;
-  border-radius: 5px;
-  box-shadow: 0 0 5px #efefef;
-}
-.TreeHeader {
-  background-color: #304156;
-  height: 60px;
-  border-radius: 5px;
-  box-shadow: 0 0 10px #efefef;
-  line-height: 60px;
-  color: #fff;
-  padding-left: 10px;
-}
-.classbtn {
-  float: right;
-  margin: 11px 10px 0 0;
-  height: 35px;
-  line-height: 12px;
-}
-.eltree {
-  background-color: #efefef;
-}
-/deep/.el-tree-node__content {
-  min-height: 40px;
-}
-.custom-tree-node {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 14px;
-  padding-right: 8px;
-}
-</style>
+  /deep/.cell {
+    padding-left: 0px;
+  }
+
+  /deep/.el-form-item {
+    margin-bottom: 5px;
+  }
+
+  /deep/.el-radio {
+    margin-right: 10px;
+  }
+
+  /deep/.el-radio__input.is-checked .el-radio__inner {
+    border-color: #409eff;
+    background-color: #409eff;
+  }
+
+  /deep/.el-radio__input.is-checked+.el-radio__label {
+    color: #409eff;
+    font-weight: bold;
+  }
+
+  /deep/.tableStyle {
+    background-color: #304156 !important;
+    color: #fff;
+    font-weight: 400;
+  }
+
+  .QuestDiv {
+    width: 24%;
+    float: left;
+    min-height: 50px;
+    border: 1px solid #cdcdcd;
+    margin-right: 10px;
+    box-shadow: 0 0 10px #808080;
+    border-radius: 8px;
+    min-height: 100px;
+    background-color: #fff;
+    opacity: 0.8;
+    margin-bottom: 10px;
+    height: 313px;
+  }
+
+  .clear {
+    clear: both;
+    margin-bottom: 10px;
+  }
+
+  .font-color {
+    background-color: #ae1e15 !important;
+    color: #fff;
+    box-shadow: 0 0 5px #ae1e15;
+  }
+
+  /deep/.el-input-group__prepend {
+    font-weight: bold;
+    width: 30px;
+    text-align: center;
+    background: #409eff;
+    color: #fff;
+  }
+
+  .optionInput {
+    float: left;
+    width: 620px !important;
+  }
+
+  .el-icon {
+    font-size: 20px;
+    line-height: 40px;
+    margin: 0 5px;
+    cursor: pointer;
+    color: #409eff !important;
+  }
+
+  >>>.subjectContentClass .el-checkbox__label {
+    padding-right: 10px !important;
+  }
+
+  .seetingsDiv {
+    width: 100%;
+    height: 60px;
+    background: #efefef;
+    line-height: 60px;
+    border-radius: 5px;
+    box-shadow: 0 0 5px #cdcdcd;
+  }
+
+  .seetingsDiv button {
+    background-color: #304156;
+    border: 0px;
+    margin-left: 10px;
+    box-shadow: 0 0 5px #cdcdcd;
+    float: right;
+    margin-top: 12px;
+    margin-right: 10px;
+  }
+
+  .areadiv {
+    background-color: #efefef;
+    border-radius: 5px;
+    box-shadow: 0 0 5px #efefef;
+  }
+
+  .TreeHeader {
+    background-color: #304156;
+    height: 60px;
+    border-radius: 5px;
+    box-shadow: 0 0 10px #efefef;
+    line-height: 60px;
+    color: #fff;
+    padding-left: 10px;
+  }
+
+  .classbtn {
+    float: right;
+    margin: 11px 10px 0 0;
+    height: 35px;
+    line-height: 12px;
+  }
+
+  .eltree {
+    background-color: #efefef;
+  }
+
+  /deep/.el-tree-node__content {
+    min-height: 40px;
+  }
+
+  .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-right: 8px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/TestPaper/ManualTestPaper.vue b/src/views/TestPaper/ManualTestPaper.vue
index 91257e1..0afed77 100644
--- a/src/views/TestPaper/ManualTestPaper.vue
+++ b/src/views/TestPaper/ManualTestPaper.vue
@@ -10,10 +10,12 @@
           <div style="padding:0 10px">
             <el-input size="small" placeholder="输入关键字搜索" v-model="parameter.keyWord"></el-input>
           </div>
+
           <draggable :options="{animation:380,filter:'.unmover'}" group="itxst" v-model="arr1" @end="end1"
             @add="RemoveHere" :move="onMove" class="infinite-list" :style="{'height':contentHeight-80+'px'}"
             infinite-scroll-disabled="disabled" v-infinite-scroll="load" style="overflow:auto">
-            <li v-for="i in arr1" class="infinite-list-item" :key="i.id">{{ i.subject }}</li>
+            <li v-for="i in arr1" class="infinite-list-item" :key="i.id" v-if="!classarr.some(o=>o == i.id)">{{
+              i.subject }}</li>
             <p v-if="loading" style="text-align: center;color: #cdcdcd;" class="unmover">加载中...</p>
             <p v-if="noMore" style="text-align: center;color: #cdcdcd;" class="unmover">没有更多了</p>
           </draggable>
@@ -28,6 +30,7 @@
             <i :class="{'el-icon-edit': !edit, 'el-icon-check': edit}" @click="edit = !edit"
               style="margin-left: 5px;cursor: pointer;"></i>
           </div>
+
           <draggable :options="{animation:380}" group="itxst" v-model="arr2" class="infinite-list" @end="end2"
             @add="ComeHere" :style="{'height':contentHeight-60+'px'}" style="overflow:auto;padding-top: 10px;">
             <li v-for="i in arr2" class="infinite-list-item">
@@ -38,6 +41,8 @@
             </li>
             </li>
           </draggable>
+
+
         </div>
       </el-col>
       <el-col :span="8" :style="{'height':contentHeight+'px'}">
@@ -56,7 +61,7 @@
               <span style="margin-right: 10px;">主观题：{{TestPaper.SubjectiveNumber}}</span>
             </el-form-item>
             <el-form-item label="题目总分:" class="el-form-item-custom">
-              {{TestPaper.TotalScore}}
+              {{TestPaper.TotalScore || ''}}
             </el-form-item>
 
 
@@ -114,6 +119,7 @@
 <script>
   import draggable from "vuedraggable";
   import { getQuestionClassList, getQuestionList } from "@/api/QuestionBank";
+  import { GetQuestionClassByType } from "@/api/QuestionClass";
   import { EditTestPaper, GetToplevel } from "@/api/TestPaper";
   import { formatTime } from '@/utils/util'
   export default {
@@ -123,6 +129,7 @@
     },
     data() {
       return {
+        loadingType:false,
         activeTab: "6",
         parameter: {
           pageIndex: 0,
@@ -138,6 +145,7 @@
         edit: false,
         arr1: [],
         arr2: [],
+        classarr: [],
         moveId: -1,
         TestPaper: {
           TestPaperTitle: "未命名试卷标题",
@@ -215,7 +223,7 @@
     methods: {
       changetimestartend(val, aa) {
         this.TestPaper.EffectiveStartTime = formatTime(val[0])
-        this.TestPaper.EffectiveEndTime = formatTime(val[1]) 
+        this.TestPaper.EffectiveEndTime = formatTime(val[1])
       },
       search() {
         this.parameter.pageIndex = 1;
@@ -223,6 +231,7 @@
         this.GetList();
       },
       SubmitTestPaper() {
+        var d = this.TestPaper;
         if (this.arr2.length > 0) {
           EditTestPaper(this.TestPaper).then((res) => {
             if (res.data.code == 200) {
@@ -242,16 +251,32 @@
         this.loading = false;
       },
       GetList() {
-        getQuestionList(this.parameter).then((res) => {
-          if (this.parameter.pageIndex == 1) {
-            this.arr1 = [];
-          }
-          res.data.data.rows.forEach((item, i) => {
-            this.arr1.push(item);
+       
+        if (this.parameter.QuestionClassId == '1') {
+          if(!this.loadingType)
+          GetQuestionClassByType({ ClassType: 2 }).then(res => {
+            var classarr = res.data.data || [];
+            this.arr1 = classarr.map(rs => {
+              rs.subject = rs.subjectName = rs.ClassificationName;
+              rs.type = 'wd';
+              rs.subjectContent = "[]";
+              return rs;
+            });
+            this.loadingType = true;
           });
-          this.count = res.data.data.total;
-          this.$forceUpdate();
-        });
+        }
+        else {
+          getQuestionList(this.parameter).then((res) => {
+            if (this.parameter.pageIndex == 1) {
+              this.arr1 = [];
+            }
+            res.data.data.rows.forEach((item, i) => {
+              this.arr1.push(item);
+            });
+            this.count = res.data.data.total;
+            this.$forceUpdate();
+          });
+        }
       },
       end1(e) {
         var that = this;
@@ -287,6 +312,7 @@
       },
       //从左边添加到右边
       ComeHere(e) {
+        var d = e.item._underlying_vm_;
         if (e.item._underlying_vm_.subjectType == 1) {
           this.TestPaper.SingleNumber += 1;
         }
@@ -299,6 +325,33 @@
         this.TestPaper.TotalScore += e.item._underlying_vm_.fraction;
 
         this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
+
+        if (d.type == 'wd') {
+          getQuestionList({
+            QuestionClassId: d.id,
+            PageIndex: 1,
+            PageSize: 1000,
+          }).then(res => {
+            var data = res.data.data.rows || [];
+            this.arr2 = this.arr2.filter(o => o.type != 'wd');
+            // this.arr1.splice(this.arr1.findIndex(o=>o.id == d.id),1)
+            this.classarr.push(d.id);
+            // var  test = this.arr2;
+            this.arr2.push(...data);
+            data.forEach(rs => { 
+              if (rs.subjectType == 1) {
+                this.TestPaper.SingleNumber += 1;
+              }
+              if (rs.subjectType == 2) {
+                this.TestPaper.MultipleNumber += 1;
+              }
+              if (rs.subjectType == 3) {
+                this.TestPaper.SubjectiveNumber += 1;
+              }
+            });
+
+          });
+        }
       },
       //右边往左边拖动时的事件
       end2(e) {
diff --git a/src/views/TestPaper/TestPaperClass.vue b/src/views/TestPaper/TestPaperClass.vue
index ed2837c..7d8863b 100644
--- a/src/views/TestPaper/TestPaperClass.vue
+++ b/src/views/TestPaper/TestPaperClass.vue
@@ -53,7 +53,7 @@
           <el-input v-model="TestPaperClassInfo.ClassTitle" placeholder="请输入分类名称"></el-input>
         </el-form-item>
       </el-form>
-      <el-button @click="CreateTestPaperClassHealder" style="margin: 10px 0 0 0 ;float:right" type="primary">确定
+      <el-button @click="CreateTestPaperClassHealder" style="margin: 10px 0 0 0 ;float:right" type="primary" :disabled="loading">确定
       </el-button>
       <div style="clear: both;"></div>
     </el-dialog>
@@ -74,6 +74,7 @@
   export default {
     data() {
       return {
+        loading:false,
         parameter: {
           pageIndex: 1,
           pageSize: 20,
@@ -110,6 +111,7 @@ this.getTestPaperClassListHeadler();
     },
     methods: {
       CreateTestPaperClassHealder() {
+        this.loading = true;
         if (this.TestPaperClassInfo.id == 0) {
           this.TestPaperClassInfo.Addtime = parseTime(new Date(), "");
           this.TestPaperClassInfo.Addtime = parseTime(new Date(), "");
@@ -119,6 +121,9 @@ this.getTestPaperClassListHeadler();
              this.dialogClassIVIsible=false
             this.getTestPaperClassListHeadler();
 
+          setTimeout(()=>{
+              this.loading = false;
+            },1000);
           })
         } else {
           UpdateTestPaperClass(this.TestPaperClassInfo).then(res => {
@@ -126,7 +131,9 @@ this.getTestPaperClassListHeadler();
             this.dialogClassIVIsible=false
              this.TestPaperClassInfo = {};
             this.getTestPaperClassListHeadler();
-
+            setTimeout(()=>{
+              this.loading = false;
+            },1000);
           });
         }
       },
diff --git a/src/views/TestPaper/TestPaperList.vue b/src/views/TestPaper/TestPaperList.vue
index 75b3434..f93231b 100644
--- a/src/views/TestPaper/TestPaperList.vue
+++ b/src/views/TestPaper/TestPaperList.vue
@@ -69,7 +69,7 @@
             </span>
             <template #dropdown>
               <el-dropdown-menu>
-                <el-dropdown-item command="addquestion">题目维护</el-dropdown-item>
+                <!-- <el-dropdown-item command="addquestion">题目维护</el-dropdown-item> -->
                 <el-dropdown-item command="update">编辑</el-dropdown-item>
                 <!-- <el-dropdown-item command="b">锁定</el-dropdown-item> -->
                 <el-dropdown-item command="del">删除</el-dropdown-item>
@@ -152,8 +152,10 @@
     GetToplevel,
     EditTestPaper,
     TestPaperUpdate,
-    getTestPaperClassList
+    getTestPaperClassList,
+    DeleteTestPaper
   } from '@/api/TestPaper'
+  import {formatTime} from '@/utils/util'
   let that
   export default { 
     data() {
@@ -161,8 +163,8 @@
         parameter: {
           pageIndex: 1,
           pageSize: 12,
-          sort: "id",
-          sortOrder: 1,
+          // sort: "id",
+          // sortOrder: 1,
           keyword: "",
           QuestionClassId: 0,
           status: 1
@@ -200,8 +202,8 @@
       let parameter = {
         pageIndex: 1,
         pageSize: 10000,
-        sort: "id",
-        sortOrder: 1,
+        // sort: "id",
+        // sortOrder: 1,
         keyword: ""
       }
       getTestPaperClassList(parameter).then(res => {
@@ -229,7 +231,7 @@
       this.getQuestionClassListHeadler();
     },
     methods: {
-      changetimestartend(val, aa) {
+      changetimestartend(val, aa) { 
         this.TestPaper.EffectiveStartTime = formatTime(val[0])
         this.TestPaper.EffectiveEndTime = formatTime(val[1]) 
       },
@@ -331,6 +333,14 @@
             }
           this.TestPaper = val
         }
+        else if (value == 'del') {
+          DeleteTestPaper(val.id).then(rs=>{
+            this.$message.success('删除成功！');
+            this.getTestPaperListHeadler();
+          })
+        
+        }
+
       }
     }
   }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c9ca127..eeab3d8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -11,7 +11,7 @@
 				<span class="svg-container">
 					<svg-icon icon-class="user" />
 				</span>
-				<el-input ref="username" v-model="loginForm.username" placeholder="Username" name="username" type="text"
+				<el-input ref="username" v-model="loginForm.username" placeholder="用户名" name="username" type="text"
 					tabindex="1" auto-complete="on" />
 			</el-form-item>
 
@@ -20,7 +20,7 @@
 					<svg-icon icon-class="password" />
 				</span>
 				<el-input :key="passwordType" ref="password" v-model="loginForm.password" :type="passwordType"
-					placeholder="Password" name="password" tabindex="2" auto-complete="on"
+					placeholder="密码" name="password" tabindex="2" auto-complete="on"
 					@keyup.enter.native="handleLogin" />
 				<span class="show-pwd" @click="showPwd">
 					<svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
@@ -28,7 +28,7 @@
 			</el-form-item>
 
 			<el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;"
-				@click.native.prevent="handleLogin">Login</el-button>
+				@click.native.prevent="handleLogin">登录</el-button>
 			<div style="text-align: center;color: #FFF;">技术支持：成都安第斯信息技术有限公司</div>
 
 			<!-- 	<div class="tips">
diff --git a/src/views/user/userlist.vue b/src/views/user/userlist.vue
index 86951cc..c8508e4 100644
--- a/src/views/user/userlist.vue
+++ b/src/views/user/userlist.vue
@@ -83,9 +83,10 @@
 
             <el-table-column prop="date" label="近期测试">
               <template slot-scope="{row}">
-                <span>{{row.TestPaperTitle || '无'}}</span>
                 <el-button v-if="row.TestPaperTitle || 1==1" type="text" icon="el-icon-star-off"
                   @click="handleTestHitory(row)"></el-button>
+                <span>{{row.TestPaperTitle || '无'}}</span>
+
               </template>
             </el-table-column>
             <el-table-column prop="date" label="电话号码">
@@ -139,6 +140,10 @@
               '未命名')}}</el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="允许测评次数">
+          <el-input v-model="form.NumberOfAnswers" type="number" placeholder="请输入允许测评次数" style="width:30%"/>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -148,6 +153,7 @@
 
     <el-dialog title="测试历史记录" :visible.sync="dialogTableVisible" @close=" gridData =[]" height="400">
       <el-table :data="gridData" height="400">
+        <el-table-column property="TestPaperTitle" label="试卷" sortable></el-table-column>
         <el-table-column property="AnswerTime" label="测试时间" width="180" sortable>
           <template slot-scope="scope">
             <span>{{ scope.row.AnswerTime.replace("T", " ") }}</span>
@@ -165,10 +171,11 @@
           </template>
         </el-table-column>
         <el-table-column property="Achievement" label="成绩" sortable></el-table-column>
+
       </el-table>
 
       <div style="text-align:right;margin-top:20px">
-   
+
         <el-button type="primary" @click="dialogTableVisible = false">
           确定
         </el-button>
@@ -177,21 +184,19 @@
 
 
 
-    <el-dialog :visible.sync="dialogVisiblecat" :title="dialogTypecat === 'update' ? '修改' : '新增'" width="455px">
-      <el-form ref="dataForm" :model="temp" label-width="120px" label-position="right">
+    <el-dialog :visible.sync="dialogVisiblecat" :title="dialogTypecat === 'update' ? '修改' : '新增'" width="455px" >
+      <el-form ref="dataForm" :model="temp" label-width="120px" label-position="right" >
 
         <el-form-item label="分类名称">
           <el-input v-model="temp.ClassTitle" placeholder="请输入名称" />
         </el-form-item>
-        <!-- <el-form-item label="备注">
-          <el-input v-model="temp.exid1" placeholder="请输入备注" />
-        </el-form-item> -->
+    
       </el-form>
       <div style="text-align:right;">
         <el-button type="danger" @click="dialogVisiblecat = false">
           取消
         </el-button>
-        <el-button type="primary" @click="submitcat">
+        <el-button type="primary" @click="submitcat" :disabled="loading">
           确定
         </el-button>
       </div>
@@ -247,7 +252,7 @@
 </template>
 
 <script>
-  import { ImportUserByExcel, GetUserList } from "@/api/user";
+  import { ImportUserByExcel, GetUserList, AddInvitationAnswerMultiple } from "@/api/user";
   import { GetUserClassList, UserClassCreate, UserClassUpdate, UserClassDelete } from "@/api/userclass";
   import { GetHistoryList } from '@/api/HistoryAnswer'
 
@@ -257,11 +262,15 @@
   export default {
     data() {
       return {
+        loading:false,
         dialogFormVisible: false,
         dialogTableVisible: false,
         dialogTypecat: 'create',
         testpaperlist: [],
-        form: {},
+        form: {
+
+          NumberOfAnswers: 3
+        },
         userList: [],
         data: [],
         dialogVisiblecat: false,
@@ -331,10 +340,11 @@
       },
       handleShareSend() {
         var rows = this.$refs.userList.selection;
-        var ids = rows.map(o => o.id) || [];
+        var ids = rows.map(o => { return { UserId: o.id } }) || [];
         var postData = {
           TestPaperId: this.form.TestPaperId,
-          UserList: ids
+          NumberOfAnswers: this.form.NumberOfAnswers || 1,
+          Users: ids
         };
         if (!ids || ids.length < 1) {
           this.$message.warning('请至少选择一个用户进行发送！');
@@ -351,7 +361,7 @@
           callback: (action) => {
             if (action == "confirm") {
 
-              SendUserMessage(postData).then(res => {
+              AddInvitationAnswerMultiple(postData).then(res => {
                 if (res.data.code == 200) {
                   this.$message.success('发送成功');
                   this.form = {};
@@ -401,10 +411,11 @@
         this.dialogVisible_content = true;
       },
       submitcat() {
-        // if (this.loading) {
-        //   return
-        // }
-        this.loading = true
+        // this.$loading({lock:true,text:'保存中...'});
+        if (this.loading) {
+          return
+        }
+        this.loading = true 
         var postData = this.temp;
         if (this.dialogTypecat == 'update') {
           if (postData.AddTime == '0001-01-01T00:00:00') postData.AddTime = new Date();
@@ -414,6 +425,9 @@
               type: 'success'
             })
             this.dialogVisiblecat = false;
+            setTimeout(()=>{
+              this.loading = false;
+            },1000);
           });
 
         }
@@ -429,6 +443,10 @@
             this.dialogVisiblecat = false
 
             this.loadTree();
+            setTimeout(()=>{
+              this.loading = false;
+            },1000);
+
           });
         }
       },