diff --git a/src/api/HistoryAnswer.js b/src/api/HistoryAnswer.js
new file mode 100644
index 0000000..19f24f6
--- /dev/null
+++ b/src/api/HistoryAnswer.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+ 
+export function GetHistoryList(params) {
+	return request({
+		url: `/HistoryAnswerInfo/GetHistoryAnswerListByUser`,
+		method: 'get',
+		params
+	})
+}
+ 
\ No newline at end of file
diff --git a/src/api/userclass.js b/src/api/userclass.js
new file mode 100644
index 0000000..fd01c25
--- /dev/null
+++ b/src/api/userclass.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+ 
+  
+export function GetUserClassList(params) {
+  return request({
+    url: `/tb_userClass/List`,
+    method: 'get',
+    params
+  })
+}
+export function UserClassCreate(data) {
+  return request({
+    url: `/tb_userClass/Create`,
+    method: 'post',
+    data
+  })
+}
+
+export function UserClassUpdate(data) {
+  return request({
+    url: `/tb_userClass/Update`,
+    method: 'post',
+    data
+  })
+}
+
+export function UserClassDelete(data) {
+  return request({
+    url: `/tb_userClass/Delete`,
+    method: 'post',
+    params: data
+  })
+}
+ 
\ No newline at end of file
diff --git a/src/views/user/picuserimport.vue b/src/views/user/picuserimport.vue
index 19bb420..f49d8d4 100644
--- a/src/views/user/picuserimport.vue
+++ b/src/views/user/picuserimport.vue
@@ -29,7 +29,7 @@
 
           <el-form-item>
             <el-button type="success" @click="search">搜索</el-button>
-            <el-button size="mini" @click="handleshare()" type="primary">批量确认</el-button>
+            <el-button size="mini" @click="handleshare()" type="primary">批量入库</el-button>
             <el-button size="mini" @click="handleAdd()" type="primary">新增一行</el-button>
           </el-form-item>
         </el-form>
@@ -73,7 +73,7 @@
           </div>
           <!-- 全局控制删除 -->
           <el-button size="mini" v-if="is_delete&&scope.row.add==undefined" :plain="true" type="warning"
-            style="margin-left:10px" @click="handleshare(scope.$index, scope.row)">确认信息</el-button>
+            style="margin-left:10px" @click="handleshare(scope.$index, scope.row)">确认入库</el-button>
           <el-button size="mini" v-if="is_delete&&scope.row.add==undefined" :plain="true" type="danger"
             style="margin-left:10px" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
         </template>
diff --git a/src/views/user/userlist.vue b/src/views/user/userlist.vue
index d3978fc..86951cc 100644
--- a/src/views/user/userlist.vue
+++ b/src/views/user/userlist.vue
@@ -24,166 +24,521 @@
 
           <el-form-item>
             <el-button type="success" @click="search">搜索</el-button>
-            <el-button v-if="selectedList.length" type="primary" @click="handleInviteInterview"
-              >邀请面试</el-button
-            >
+            <el-button type="success" @click="resetSearch">重置</el-button>
+            <el-button v-if="selectedList.length" type="primary" @click="handleInviteInterview">邀请面试</el-button>
           </el-form-item>
         </el-form>
 
- 
+
+
       </div>
-      <el-upload
-        class="upload-demo"
-        action="/api/Account/importUsers?UserClassId=0"
-        multiple
-        :limit="1"
-        :show-file-list="false"
-        :on-exceed="handleExceed"
-        :on-success="handleSuccess"
-        :file-list="fileList"
-      >
+
+      <el-upload class="upload-demo" action="/api/Account/importUsers?UserClassId=0" multiple :limit="1"
+        :show-file-list="false" :on-exceed="handleExceed" :on-success="handleSuccess" :file-list="fileList">
         <el-button size="small" type="primary">导入用户</el-button>
       </el-upload>
     </div>
-    <el-table
-      :data="userList"
-      id="QuestionTable"
-      border
-      style="
-        width: 100%;
-        border-radius: 5px;
-        box-shadow: 0 0 10px #efefef;
-        margin-top: 10px;
-      "
-      @selection-change="handleSelectionChange"
-      :stripe="true"
-    >
-      <el-table-column type="selection" width="55"> </el-table-column>
-      <el-table-column
-        type="index"
-        prop="date"
-        width="50"
-        align="center"
-      ></el-table-column>
-      <el-table-column prop="date" label="姓名">
-        <template slot-scope="scope">
-          <span>{{ scope.row.fullName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="date" label="电话号码">
-        <template slot-scope="scope">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="scope.row.phone"
-            placement="top-start"
-          >
-            <span>{{ scope.row.phone1 }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="date" label="性别">   </el-table-column>
-      <el-table-column prop="date" label="毕业院校">   </el-table-column>
-      <el-table-column prop="date" label="最高学历">   </el-table-column>专业
-      <el-table-column prop="date" label="专业">   </el-table-column>
-
-      
-      <el-table-column prop="date" label="注册时间">
-        <template slot-scope="scope">
-          <span>{{ scope.row.addTime.replace("T", " ") }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      background
-      @current-change="currentchange"
-      style="position: static; bottom: 3px; text-align: center; margin-top: 5px"
-      :page-size="this.query.PageSize"
-      layout="total,prev, pager, next"
-      :total="Count"
-    >
-    </el-pagination>
+    <el-container style="  border: 1px solid #eee;">
+      <el-aside width="255px"
+        style="width: 255px;background-color: #fff;padding: 10px;border-right: 1px solid #dcdfe6;">
+        <div style="float:left">
+          所属分类
+        </div>
+        <div style="text-align:right;">
+          <el-button size="mini" type="primary" icon="el-icon-plus" circle @click="addcat"></el-button>
+          <el-button size="mini" type="warning" icon="el-icon-edit" circle @click="editcat"></el-button>
+          <el-button size="mini" type="danger" icon="el-icon-delete" @click="delcat" circle></el-button>
+        </div>
+        <el-input size="small " placeholder="分类筛选" v-model="filterText" style="margin-bottom:10px;margin-top:10px;">
+        </el-input>
+        <el-tree :data="data" :props="props" ref="tree" :filter-node-method="filterNode" @node-click="handleNodeClick">
+        </el-tree>
+
+      </el-aside>
+
+      <el-main>
+
+
+        <div class="filter-container">
+          <el-table ref="userList" :data="userList" id="QuestionTable" border style="
+          width: 100%;
+          border-radius: 5px;
+          box-shadow: 0 0 10px #efefef;
+          margin-top: 10px;
+        " @selection-change="handleSelectionChange" :stripe="true">
+            <el-table-column type="selection" width="55"> </el-table-column>
+            <el-table-column type="index" prop="date" width="50" align="center"></el-table-column>
+            <el-table-column prop="date" label="姓名">
+              <template slot-scope="scope">
+                <span>{{ scope.row.fullName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="date" label="电话号码">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" :content="scope.row.phone" placement="top-start">
+                  <span>{{ scope.row.phone1 }}</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+
+            <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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="date" label="电话号码">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" :content="scope.row.phone" placement="top-start">
+                  <span>{{ scope.row.phone1 }}</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+
+
+            <el-table-column prop="date" label="性别" sortable> </el-table-column>
+            <el-table-column prop="date" label="民族" sortable> </el-table-column>
+            <el-table-column prop="date" label="专业" sortable> </el-table-column>
+            <el-table-column prop="date" label="毕业院校" sortable> </el-table-column>
+            <el-table-column prop="date" label="最高学历" sortable> </el-table-column>
+
+
+
+            <el-table-column prop="addTime" label="录入时间" sortable>
+              <template slot-scope="scope">
+                <span>{{ scope.row.addTime.replace("T", " ") }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="date" label="操作" width="180">
+              <template slot-scope="scope">
+                <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)" circle>编辑</el-button>
+                <el-button type="text" icon="el-icon-delete" circle>删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination background @current-change="currentchange"
+            style="position: static; bottom: 3px; text-align: center; margin-top: 5px" :page-size="this.query.PageSize"
+            layout="total,prev, pager, next" :total="Count">
+          </el-pagination>
+        </div>
+
+      </el-main>
+
+    </el-container>
+
+    <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">{{'['+item.id+'] '+(item.TestPaperTitle ||
+              '未命名')}}</el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleShareSend">确认发送</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="测试历史记录" :visible.sync="dialogTableVisible" @close=" gridData =[]" height="400">
+      <el-table :data="gridData" height="400">
+        <el-table-column property="AnswerTime" label="测试时间" width="180" sortable>
+          <template slot-scope="scope">
+            <span>{{ scope.row.AnswerTime.replace("T", " ") }}</span>
+          </template>
+
+        </el-table-column>
+        <el-table-column property="StartTime" label="开始时间" width="180" sortable>
+          <template slot-scope="scope">
+            <span>{{ scope.row.StartTime.replace("T", " ") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column property="address" label="结束时间" width="180" sortable>
+          <template slot-scope="scope">
+            <span>{{ scope.row.EndTime.replace("T", " ") }}</span>
+          </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>
+      </div>
+    </el-dialog>
+
+
+
+    <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>
+      </div>
+    </el-dialog>
+
+
+    <el-dialog title="人才用户信息" :visible.sync="dialogClassIVIsible" width="450">
+      <el-form ref="adminUserInfo" :model="adminUserInfo" label-width="90px" style="margin-left: 40px;">
+        <el-form-item label="名称" prop="fullName">
+          <el-input v-model="adminUserInfo.fullName " placeholder="请输入姓名" style="width: 40%;"></el-input>
+        </el-form-item>
+        <el-form-item label="电话号码">
+          <el-input v-model="adminUserInfo.phone " placeholder="请输入电话号码" style="width: 40%;" maxlength="11"></el-input>
+        </el-form-item>
+        <el-form-item label="最高学历">
+          <el-select v-model="adminUserInfo.xueli" placeholder="最高学历">
+            <el-option label="大专" value="shanghai"></el-option>
+            <el-option label="本科" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="民族">
+          <el-select v-model="adminUserInfo.minzu" placeholder="民族">
+            <el-option v-for="item in mzlist" :label="item" :value="item"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="性别">
+          <el-select v-model="adminUserInfo.sex" placeholder="性别">
+            <el-option label="男" value="1"></el-option>
+            <el-option label="女" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="专业" style="margin-top: 40px;" prop="username">
+          <el-input v-model="adminUserInfo.zhuanye" placeholder="请输入专业" style="width: 40%;"></el-input>
+        </el-form-item>
+        <el-form-item label="毕业院校" style="margin-top: 40px;" prop="username">
+          <el-input v-model="adminUserInfo.byyx" placeholder="请输入毕业院校" style="width: 40%;"></el-input>
+        </el-form-item>
+
+        <!-- <el-form-item label="密码" prop="password" >
+          <el-input v-model="adminUserInfo.password " placeholder="请输入密码 不填默认不修改" show-password style="width: 40%;"></el-input>
+        </el-form-item> -->
+        <el-form-item style="text-align: right;">
+          <el-button @click="dialogClassIVIsible=false">取消</el-button>
+          <el-button type="primary" @click="submitForm('adminUserInfo')">提交</el-button>
+        </el-form-item>
+      </el-form>
+
+      <div style="clear: both;"></div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { ImportUserByExcel, GetUserList } from "@/api/user";
-export default {
-  data() {
-    return {
-      userList: [],
-      Count: 0,
-      type: "1",
-      query: {
-        UserTypeEnum: 1, //0：管理员，1普通用户
-        PageIndex: 1,
-        PageSize: 10,
-        keyword:''
-      },
-      fileList:[],
-      selectedList: [],
-    };
-  },
-  created() {
-    this.GetUser();
-  },
-  methods: {
-    search(){
-      this.GetUser();
+  import { ImportUserByExcel, GetUserList } from "@/api/user";
+  import { GetUserClassList, UserClassCreate, UserClassUpdate, UserClassDelete } from "@/api/userclass";
+  import { GetHistoryList } from '@/api/HistoryAnswer'
+
+  import {
+    getTestPaperList
+  } from '@/api/TestPaper'
+  export default {
+    data() {
+      return {
+        dialogFormVisible: false,
+        dialogTableVisible: false,
+        dialogTypecat: 'create',
+        testpaperlist: [],
+        form: {},
+        userList: [],
+        data: [],
+        dialogVisiblecat: false,
+        filterText: '',
+        gridData: [],
+        Count: 0,
+        adminUserInfo: {},
+        temp: {
+          ParentId: 0
+        },
+        mzlist: ['汉族',
+          '蒙古族 ', '羌族 ', '僳僳族 ', '哈尼族',
+          '回族', '布朗族', '佤族', '哈萨克族',
+          '藏族', '撒拉族', '畲族', '傣族',
+          '维吾尔族', '毛南族', '高山族', '德昂族',
+          '苗族', '仡佬族', '拉祜族', '保安族',
+          '彝族', '锡伯族', '水族', '裕固族',
+          '壮族', '阿昌族', '东乡族', '京族',
+          '布依族', '普米族', '纳西族', '独龙族',
+          '朝鲜族', '塔吉克族', '景颇族', '鄂伦春族',
+          '满族', '怒族', '柯尔克孜族', '赫哲族',
+          '侗族', '乌孜别克族', '土族', '门巴族',
+          '瑶族', '俄罗斯族', '达斡尔族', '珞巴族',
+          '白族', '鄂温克族', '塔塔尔族', '基诺族'
+        ],
+        type: "1",
+        dialogClassIVIsible: false,
+        query: {
+          UserTypeEnum: 1, //0：管理员，1普通用户
+          PageIndex: 1,
+          PageSize: 10,
+          keyword: ''
+        },
+        fileList: [],
+        selectedList: [],
+        props: {
+          label: 'ClassTitle',
+          children: 'children'
+        },
+      };
     },
-    handleSuccess(){
-      this.$message.success('导入完成！');
-      this.GetUser();
+    watch: {
+      filterText(val) {
+        this.$refs.tree.filter(val);
+      }
     },
-    handleInviteInterview() {},
-    handleSelectionChange(val) {
-      console.log(val);
-      this.selectedList = val;
+
+    created() {
+      this.GetUser();
+      this.forceTestPaper();
+      this.loadTree();
     },
-    handleExceed(){},
-    ImportUser() {},
-    GetUser() {
-      GetUserList(this.query).then((res) => {
-        this.userList = res.data.data.rows.map((t) => {
-          if (t.phone) {
-            t.phone1 = t.phone.replace(t.phone.substring(3, 7), "****");
-          }
-          return t;
+    methods: {
+      submitForm() {
+        this.dialogClassIVIsible = false;
+      },
+      handleEdit(data) {
+        this.dialogClassIVIsible = true;
+        this.adminUserInfo = data;
+      },
+      handleTestHitory(row) {
+        GetHistoryList({ UserId: row.id }).then(res => {
+          this.gridData = res.data.data;
+          this.dialogTableVisible = true;
         });
-        this.Count = res.data.data.total;
-      });
-    },
-    currentchange(page) {
-      this.query.PageIndex = page;
-      this.GetUser();
+
+      },
+      handleShareSend() {
+        var rows = this.$refs.userList.selection;
+        var ids = rows.map(o => o.id) || [];
+        var postData = {
+          TestPaperId: this.form.TestPaperId,
+          UserList: ids
+        };
+        if (!ids || ids.length < 1) {
+          this.$message.warning('请至少选择一个用户进行发送！');
+          return;
+        }
+        if (!this.form.TestPaperId) {
+
+          this.$message.warning('请选择试卷后再发送！');
+          return;
+        }
+        this.$confirm('确认向选择的' + ids.length + '个用户发送试卷连接进行测试吗？', '提示消息', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          callback: (action) => {
+            if (action == "confirm") {
+
+              SendUserMessage(postData).then(res => {
+                if (res.data.code == 200) {
+                  this.$message.success('发送成功');
+                  this.form = {};
+                  this.dialogFormVisible = false;
+                  this.GetUser();
+                }
+                else {
+                  this.$message.error('发送失败');
+                }
+              });
+            }
+          },
+        })
+      },
+      forceTestPaper() {
+        let parameter = {
+          pageIndex: 1,
+          pageSize: 10000,
+          sort: "id",
+          sortOrder: 1,
+          keyword: ""
+        }
+        getTestPaperList(parameter).then(res => {
+          this.testpaperlist = res.data.data;
+        });
+      },
+      search() {
+        this.GetUser();
+      },
+      handleSuccess() {
+        this.$message.success('导入完成！');
+        this.GetUser();
+      },
+      handleInviteInterview() {
+        this.dialogFormVisible = true;
+      },
+      handleSelectionChange(val) {
+        console.log(val);
+        this.selectedList = val;
+      },
+      handleExceed() { },
+      ImportUser() { },
+
+
+      showcontent(c, row) {
+        this.showbody = c;
+        this.dialogVisible_content = true;
+      },
+      submitcat() {
+        // 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();
+          UserClassUpdate(postData).then(o => {
+            this.$message({
+              message: '提交成功',
+              type: 'success'
+            })
+            this.dialogVisiblecat = false;
+          });
+
+        }
+        else {
+
+          UserClassCreate(postData).then(o => {
+
+            this.$message({
+              message: '提交成功',
+              type: 'success'
+            })
+
+            this.dialogVisiblecat = false
+
+            this.loadTree();
+          });
+        }
+      },
+      editclose(data) {
+        // this.dialogVisible_step = false;
+        this.fetchData()
+      },
+      loadTree() {
+        GetUserClassList({ ParentId: 0 }).then(res => {
+          this.data = res.data.data
+        })
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data.ClassTitle.indexOf(value) !== -1
+      },
+      addcat() {
+        this.temp = { AddTime: new Date() }
+        this.dialogVisiblecat = true
+      },
+      editcat() {
+        this.dialogTypecat = 'update';
+        if (!this.temp.id) {
+          this.$message({
+            message: '请选择一个分类进行操作！',
+            type: 'warning'
+          })
+          return;
+        }
+        this.dialogVisiblecat = true;
+      },
+      delcat() {
+        if (!this.temp.id) {
+          this.$message({
+            message: '请选择一个分类进行操作！',
+            type: 'warning'
+          })
+          return;
+        }
+        this.$confirm('确认删除该分类吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          UserClassDelete({ ids: this.temp.id }).then(o => {
+            this.loadTree();
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
+          });
+
+        })
+      },
+      handleNodeClick(data, checked, indeterminate) {
+        this.query.userClassId = data.id;
+        this.temp = data;
+        this.GetUser()
+      },
+
+      resetSearch() {
+        this.query = {
+          UserTypeEnum: 1, //0：管理员，1普通用户
+          PageIndex: 1,
+          PageSize: 10,
+          keyword: ''
+        };
+        this.GetUser();
+      },
+      GetUser() {
+        GetUserList(this.query).then((res) => {
+          this.userList = res.data.data.rows.map((t) => {
+            if (t.phone) {
+              t.phone1 = t.phone.replace(t.phone.substring(3, 7), "****");
+            }
+            return t;
+          });
+          this.Count = res.data.data.total;
+        });
+      },
+      currentchange(page) {
+        this.query.PageIndex = page;
+        this.GetUser();
+      },
     },
-  },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.seetingsDiv {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  padding-top:10px;
-  padding-left:10px;
-  /* height: 60px; */
-  background: #efefef;
-  /* line-height: 60px; */
-  border-radius: 5px;
-  box-shadow: 0 0 5px #cdcdcd;
-  justify-content: space-between;
-}
-
-.seetingsDiv button {
-  height: 40px;
-  background-color: #304156;
-  border: 0px;
-  margin-left: 10px;
-  box-shadow: 0 0 5px #cdcdcd;
-  float: none;
-  margin-right: 10px;
-}
-</style>
+  .seetingsDiv {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    padding-top: 10px;
+    padding-left: 10px;
+    /* height: 60px; */
+    background: #efefef;
+    /* line-height: 60px; */
+    border-radius: 5px;
+    box-shadow: 0 0 5px #cdcdcd;
+    justify-content: space-between;
+  }
+
+  .seetingsDiv button {
+    height: 40px;
+    background-color: #304156;
+    border: 0px;
+    margin-left: 10px;
+    box-shadow: 0 0 5px #cdcdcd;
+    float: none;
+    margin-right: 10px;
+  }
+</style>
\ No newline at end of file