diff --git a/src/api/log.js b/src/api/log.js
new file mode 100644
index 0000000..9dd9c2f
--- /dev/null
+++ b/src/api/log.js
@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+
+ 
+ 
+//用户列表
+export function GetList(params) {
+    return request({
+        url: `/SystemLogs/List`,
+        method: 'get',
+        params
+    }) 
+} 
+ 
+
+
+export function ChangeClass(id,type) {
+    return request({
+        url: `/Users/ChangeClass?id=${id}&type=${type}`,
+        method: 'post',
+    })
+}
\ No newline at end of file
diff --git a/src/api/role.js b/src/api/role.js
new file mode 100644
index 0000000..ba6bda4
--- /dev/null
+++ b/src/api/role.js
@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+ 
+export function GetInfo(id) {
+    return request({
+        url: `/role/Get?id=${id}`,
+        method: 'get',
+    })
+}
+
+ 
+export function GetUserList(param) {
+    return request({
+        url: `/role/List`,
+        method: 'get',
+        param
+    })
+}
+export function UsersCreate(data) {
+    return request({
+        url: `/role/Create`,
+        method: 'post',
+        data
+    })
+}
+
+export function UsersUpdate(data) {
+    return request({
+        url: `/role/Update`,
+        method: 'post',
+        data
+    })
+}
+
+export function UsersDelete(data) {
+    return request({
+        url: `/role/Delete`,
+        method: 'post',
+        params: data
+    })
+}
+ 
+
+//权限菜单列表
+export async function GetMenueRole() {
+    return request({
+        url: `/role/GetMenueRole`,
+        method: 'get' 
+    })  
+} 
+
+ //权限菜单列表
+export function GetMenue() {
+    return request({
+        url: `/role/GetMenue`,
+        method: 'get' 
+    })  
+} 
+
+ 
\ No newline at end of file
diff --git a/src/api/setting.js b/src/api/setting.js
new file mode 100644
index 0000000..0edcbc2
--- /dev/null
+++ b/src/api/setting.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+ 
+export function GetInfo(id) {
+    return request({
+        url: `/Setting/Get?id=${id}`,
+        method: 'get',
+    })
+}
+ 
+export function  Create(data) {
+    return request({
+        url: `/Setting/Create`,
+        method: 'post',
+        data
+    })
+}
+
+export function  Update(data) {
+    return request({
+        url: `/Setting/Update`,
+        method: 'post',
+        data
+    })
+}
+
+export function  Delete(data) {
+    return request({
+        url: `/Setting/Delete`,
+        method: 'post',
+        params: data
+    })
+}
+ 
+ 
\ No newline at end of file
diff --git a/src/api/user.js b/src/api/user.js
index e0dcabb..970d48a 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -87,6 +87,15 @@ export function GetUserListByAdmin(data) {
         data
     })
 }
+
+
+export function GetUserListByAdminSimple(data) {
+    return request({
+        url: `/Users/GetUserListByAdminSimple`,
+        method: 'post',
+        data
+    })
+}
 //修改管理员密码
 export function UpdateCurrentPasswordById(data) {
     return request({
diff --git a/src/permission.js b/src/permission.js
index fa1ea19..3e0c1f2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -19,7 +19,6 @@ router.beforeEach(async(to, from, next) => {
 
   // determine whether the user has logged in
   const hasToken = getToken()
-
   if (hasToken) {
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
diff --git a/src/router/index.js b/src/router/index.js
index d67c437..654df71 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,9 +30,9 @@ import { getRoutes } from "@/utils/routerList.js"
  * constantRoutes
  * a base page that does not have permission requirements
  * all roles can be accessed
- */
-export const constantRoutes = getRoutes();
-
+ */  
+export const constantRoutes =    getRoutes();
+ 
 const createRouter = () => new Router({
   // mode: 'history', // require service support
   scrollBehavior: () => ({
diff --git a/src/utils/request.js b/src/utils/request.js
index 634670d..9c9d8df 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,13 +19,16 @@ const service = axios.create({
 service.interceptors.request.use(
 	config => {
 		// do something before request is sent
-
-		if (store.getters.token) {
+ 
+		if (store && store.getters && store.getters.token) {
 			// let each request carry token
 			// ['X-Token'] is a custom headers key
 			// please modify it according to the actual situation
 			config.headers['Authorization'] = getToken()
 		}
+		else if(localStorage.token){
+			config.headers['Authorization'] = localStorage.token
+		}
 		return config
 	},
 	error => {
diff --git a/src/utils/routerList.js b/src/utils/routerList.js
index 71efe4a..2379523 100644
--- a/src/utils/routerList.js
+++ b/src/utils/routerList.js
@@ -1,18 +1,17 @@
 import Layout from '@/layout'
 import { getInfo } from '../store/modules/user.js'
+import {GetMenueRole} from '@/api/role'
 
-
-export function getRoutes(permissions) {
+export   function getRoutes(permissions) {
     let userInfo = {}
     if (localStorage.userinfo) {
         userInfo = JSON.parse(localStorage.userinfo)
     }
     var permissions = userInfo.permissions || [];
-
-
-
-
-    console.log(userInfo)
+ 
+// var roles = await GetMenueRole();
+//  roles = roles.data.map(o=>o.code);
+ 
     let constantRoutes1 = []
     if (userInfo.UserId == 1 || 1 == 1) {
         constantRoutes1 = [{
@@ -39,6 +38,7 @@ export function getRoutes(permissions) {
 
 
         {
+            code:'home',
             path: '/',
             component: Layout,
             redirect: '/dashboard',
@@ -65,6 +65,7 @@ export function getRoutes(permissions) {
         },
 
         {
+            code:'example',
             path: '/example',
             component: Layout,
             redirect: '/example/table',
@@ -75,6 +76,7 @@ export function getRoutes(permissions) {
                 permissions: ['admin']
             },
             children: [{
+                code:'题库',
                 path: 'QuestionBank',
                 name: 'Table',
                 component: () =>
@@ -129,6 +131,7 @@ export function getRoutes(permissions) {
         // },
 
         {
+            code:'试卷管理',
             path: '/views',
             component: Layout,
             redirect: '/views/TestPaper',
@@ -138,6 +141,7 @@ export function getRoutes(permissions) {
                 icon: 'el-icon-s-help'
             },
             children: [{
+                code:'试卷列表',
                 path: 'TestPaperList',
                 name: 'Table',
                 component: () =>
@@ -159,6 +163,7 @@ export function getRoutes(permissions) {
                 }
             },
             {
+                code:'组卷',
                 path: 'ManualTestPaper',
                 name: 'Table',
                 component: () =>
@@ -199,6 +204,7 @@ export function getRoutes(permissions) {
         //     }]
         // },
         {
+            code:'用户管理',
             path: '/user',
             component: Layout,
             redirect: '/',
@@ -208,6 +214,7 @@ export function getRoutes(permissions) {
                 icon: 'el-icon-s-help' 
             },
             children: [{
+                code:'人才库',
                 path: 'user',
                 name: 'User',
                 component: () =>
@@ -217,6 +224,7 @@ export function getRoutes(permissions) {
                 }
             },
             {
+                code:'面试时间表',
                 path: 'interviewSchedule',
                 name: 'interviewSchedule',
                 component: () =>
@@ -227,6 +235,7 @@ export function getRoutes(permissions) {
             },
 
             {
+                code:'importuser',
                 path: 'importuser',
                 name: 'importuser',
 
@@ -237,6 +246,7 @@ export function getRoutes(permissions) {
                 }
             },
             {
+                code: 'admin',
                 path: 'admin',
                 name: 'admin',
                 component: () =>
@@ -249,7 +259,8 @@ export function getRoutes(permissions) {
 
             ]
         }, {
-            path: '/password',
+            code:'系统管理',
+            path: '/system',
             component: Layout,
             redirect: '/',
             name: 'password',
@@ -259,6 +270,7 @@ export function getRoutes(permissions) {
             },
             children: [
                 {
+                    code: 'userdimset',
                     path: 'userdimset',
                     name: 'impouserdimsetrtuser',
 
@@ -277,7 +289,19 @@ export function getRoutes(permissions) {
                     meta: {
                         title: '忘记密码',
                     }
-                }, {
+                },
+                {
+                    code:'settings',
+                    path: 'settings',
+                    name: 'settings',
+                    component: () =>
+                        import('@/views/settings/index'),
+                    meta: {
+                        title: '系统设置',
+                    }
+                },
+                {
+                    code:'TestPaperClass',
                     path: 'TestPaperClass',
                     name: 'Table',
                     component: () =>
@@ -287,6 +311,7 @@ export function getRoutes(permissions) {
                         permissions:['admin' ]
                     }
                 }, {
+                    code: 'carousel',
                     path: 'carousel',
                     name: 'carousel',
                     component: () =>
@@ -296,6 +321,7 @@ export function getRoutes(permissions) {
                         permissions:['admin' ]
                     }
                 }, {
+                    code: 'new',
                     path: 'new',
                     name: 'new',
                     component: () =>
@@ -304,7 +330,32 @@ export function getRoutes(permissions) {
                         title: '最新资讯',
                         permissions:['admin']
                     }
-                }]
+                }
+                , {
+                    code: 'rolelist',
+                    path: 'role',
+                    name: 'rolelist',
+                    component: () =>
+                        import('@/views/user/rolelist'),
+                    meta: {
+                        title: '角色权限',
+                        permissions:['admin']
+                    }
+                },
+                {
+                    code:'logs',
+                    path: 'logs',
+                    name: 'logs',
+    
+                    component: () =>
+                        import('@/views/user/loglist'),
+                    meta: {
+                        title: '系统日志',
+                    }
+                },
+
+
+            ]
         },
         // 404 page must be placed at the end !!!
         {
@@ -562,7 +613,8 @@ export function getRoutes(permissions) {
         const finallyRoutes = [];
         routes.forEach((route) => {
             const item = { ...route };
-            if (hasPermission(permissions, item)) {
+            // if (hasPermission(permissions, item)) {
+                if (permissions.includes(item.code) || !item.code) {
                 if (item.children) {
                     item.children = filterAsyncRoutes(item.children, permissions);
                 }
@@ -572,6 +624,6 @@ export function getRoutes(permissions) {
         return finallyRoutes;
     } 
     constantRoutes1 = filterAsyncRoutes(constantRoutes1, permissions);
-
+ 
     return constantRoutes1;
 }
\ No newline at end of file
diff --git a/src/views/QuestionBank/components/EditDimension.vue b/src/views/QuestionBank/components/EditDimension.vue
index b0e00ba..e17d3b7 100644
--- a/src/views/QuestionBank/components/EditDimension.vue
+++ b/src/views/QuestionBank/components/EditDimension.vue
@@ -1,6 +1,20 @@
 <template>
   <el-dialog title="编辑" :visible.sync="dialogFormVisible" @closed="handleclose" width="75%">
     <el-form :model="data">
+      <el-form-item label="上级分类" style="padding-top: 5px">
+         
+
+        <el-cascader  filterable v-model="data.ParentId" style="width: 400px"
+        :props="{ emitPath: false ,checkStrictly:true}" :clearable="true" :options="QuestionClass">
+
+        <template slot-scope="{ node, data }">
+          <span>{{ data.label }}</span>
+          <span v-if="!node.isLeaf"> ({{ data.subjectCount || 0 }}) </span>
+        </template>
+
+
+      </el-cascader>
+      </el-form-item>
       <el-form-item label="名称">
         <el-input v-model="data.ClassificationName"></el-input>
  
@@ -100,7 +114,9 @@
     getQuestionClass,
 
   } from "@/api/QuestionClass";
-
+  import { 
+    getQuestionClassList
+  } from "@/api/QuestionBank";
 
   export default {
     components: {
@@ -124,7 +140,7 @@
         dialogFormVisible: false,
         form: {},
         level:0,
-     
+        QuestionClass: [],
         ruleOptions: [
           { label: '大于', value: '>' },
           { label: '小于', value: '<' },
@@ -158,8 +174,64 @@
     },
     created() {
       // this.show();
+
+    },
+    mounted(){
+    
     },
-    methods: {
+    methods: {    
+      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(node) {
+        var  classtype =  node.data.ClassType || 0;
+        let _this = this;
+        getQuestionClassList().then((res) => {
+          let list = [{id:0,ClassificationName:'顶级',ClassType : classtype}];
+       res.data.data.forEach(o=>{list.push(o);});
+          var rootlist = list.filter(o=> o.ClassType == classtype && (!o.ParentId ||  o.ParentId == 0 )).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 = rootlist;
+          var firstlist = rootlist.filter(o => o.ClassType == 0 && o.ParentId == 0).map(o => {
+            o.children = this.getSubTree(o.id, list);
+            return o;
+          });
+
+          var twolist = rootlist.filter(o => o.ClassType == 2 && o.ParentId == 0).map(o => {
+            o.children = this.getSubTree(o.id, list);
+            return o;
+
+          });
+          // _this.$nextTick(()=>{
+          //   if(_this.currentEditNode){
+          //     _this.$refs.tree.getNode(_this.currentEditNode.parent).loaded = false
+          //     _this.$refs.tree.getNode(_this.currentEditNode.parent).expand();
+          //     _this.$refs.tree.getNode(_this.currentEditNode.parent).expanded=true;
+          //     _this.$forceUpdate()
+
+          // }
+
+          // });
+
+          // this.firstTreeData = [firstClass];
+          // this.secondTreeData = [secondClass];
+        });
+      },
       handleclose(){
         this.dialogFormVisible = false; 
         this.$emit('close',this.data);
@@ -245,6 +317,8 @@
         } catch (e) { }
       },
       show(id,node) {
+        this.getQuestionClassListHeadler(node);
+
         if(node) this.level = node.level;
         this.data = {
             // id: Date.parse(new Date()) + '_' + Math.ceil(Math.random() * 99999),
@@ -270,7 +344,7 @@
  
             if (res) {
               var data = res.data.data;
-              if (!data.rules) {
+              if (!data.rules || data.rules.length <1) {
                 data.rules = [
                   {
                     QuestionClassId: 0,
diff --git a/src/views/QuestionBank/index.vue b/src/views/QuestionBank/index.vue
index 9062c2f..7f0fd07 100644
--- a/src/views/QuestionBank/index.vue
+++ b/src/views/QuestionBank/index.vue
@@ -18,10 +18,11 @@
               添加顶级
             </el-button>
             <el-tree :data="activeTab == 'first' ? firstTreeData : secondTreeData"
-              :default-expanded-keys="currentExpend" :props="activeTab == 'first' ? firstTreeData : secondTreeData"
-              @node-click="handleNodeClick" class="eltree" :expand-on-click-node="false" ref="tree">
+              :props="activeTab == 'first' ? firstTreeData : secondTreeData" @node-click="handleNodeClick"
+              class="eltree" :expand-on-click-node="false" node-key="value" :default-expanded-keys="defaultexpand"
+              @node-expand="handleNodeExpand" ref="tree">
               <span class="custom-tree-node" slot-scope="{ node, data }">
-                <span>{{ node.label }} ({{data.subjectCount || 0}})</span>
+                <span>[{{data.id}}] {{ node.label }} ({{data.subjectCount || 0}})</span>
                 <span style="">
                   <!-- v-if="activeTab == 'first'?true:node.level<2?true:false" -->
                   <el-button type="text" size="mini" @click="showClassDialog(node)" v-if="node.level <3">
@@ -50,8 +51,9 @@
             </el-button>
             <el-button type="danger" @click="handleChangeCat">批量修改分类
             </el-button>
-            <el-button type="danger" @click="handleChangeType">批量修改题型
-            </el-button>
+            <el-button type="danger" @click="dialogFormVisible = true">导入题目</el-button>
+            <!-- <el-button type="danger" @click="handleChangeType">批量修改题型
+            </el-button> -->
           </div>
           <div class="areadiv" :style="{ height: TableColHeight + 'px' }">
             <el-table :data="QuestList" id="QuestionTable" border style="
@@ -150,8 +152,12 @@
       :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-form-item>
+
+
+
       </el-form>
       <!-- {{QuestionClassInfo}} -->
       <el-button @click="CreateQuestionClassHealder" style="margin: 10px 0 0 0; float: right" type="primary">确定
@@ -169,7 +175,7 @@
           <el-input v-model="Dataform.subject" placeholder="请输入题目名称"></el-input>
         </el-form-item>
         <el-form-item label="分类" style="padding-top: 5px" prop="QuestionClassId">
- 
+
           <el-cascader @change="changequestionclass" filterable v-model="Dataform.QuestionClassId" style="width: 400px"
             :props="{ emitPath: false ,checkStrictly:true}" :clearable="true" :options="QuestionClass">
 
@@ -281,6 +287,59 @@
       </el-button>
       <div style="clear: both"></div>
     </el-dialog>
+
+
+
+
+
+    <el-dialog title="导入" :visible.sync="dialogFormVisible">
+
+
+
+
+      <el-upload class="upload-demo" style="width:80%" :headers="{Authorization:token}" drag
+      :on-success="handleSuccess"
+        action="/api/QuestionBank/import" :limit="1">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip">只能上传excel文件，条数尽量不要太多控制在1000内
+          <br>
+          <br>
+          <br>
+          <span style="color:red;line-height:20px;font-size:16px">
+            注意: 
+            <br>
+            1.导入每个选项格式 分为三段 用” @@ “ 隔开 选项内容@@选项分值@@选项权重（权重 分为三个 高 中 低） <br /> 例如:
+            <p>选项A 今天感觉怎么样@@10@@高</p>
+            <p>选项B 内容@@10@@高</p>
+            <p>选项C 内容@@5@@中</p>
+            <p>选项D 内容@@8@@低</p>
+
+          </span>
+
+          <br>
+          <span style="color:red;line-height:20px;font-size:16px">
+          2.分类编号  从后台题库管理左侧分类的名称前获取 [1] 只需填写中间的数字即可
+          </span>
+
+          <br>
+
+          <span style="color:red;line-height:20px;font-size:16px">
+            3.多选题  多选题选项 多个用 英文,隔开  如： A,B,C
+            </span>
+  
+            <br>
+          <el-link :href="BASE_URL + '/temp/题目导入模板.xlsx'" target="_blank" type="primary">点击下载导入模板</el-link>
+
+        </div>
+      </el-upload>
+
+
+
+
+    </el-dialog>
+
+
     <EditDimension ref="editDimensionDialog" :model="currentEditDimension" @close="closeEditDim" @save="saveEditDim">
     </EditDimension>
   </div>
@@ -297,6 +356,12 @@
   } from "@/api/QuestionBank";
   import { parseTime } from "@/utils/index.js";
   import EditDimension from "./components/EditDimension.vue";
+
+  import {
+    getToken
+  } from '@/utils/auth'
+
+
   export default {
     filters: {},
     components: {
@@ -304,9 +369,12 @@
     },
     data() {
       return {
+        token: getToken(),
+        dialogFormVisible: false,
         FormClassType: 0,
         loading: false,
         currentEditDimension: {},
+        defaultexpand: [],
         activeTab: "first",
         parameter: {
           pageIndex: 1,
@@ -394,7 +462,14 @@
     methods: {
       closeEditDim(data) {
       },
-
+      handleSuccess(res) {
+        var msg = '';
+        if(res.data.data){
+          msg = `导入完成  共:${res.data.data.tableCount}个题目  成功 ${res.data.data.SuccessCount}个题目`;
+        } 
+				this.$message.success(msg);
+				this.GetList();
+			},
       saveEditDim(data) {
         // if(this.currentEditNode && this.currentEditNode.parent)
         // this.currentExpend=[this.currentEditNode.parent.data.id];
@@ -448,8 +523,7 @@
       },
       handleChangeCat() {
         var rows = this.$refs.table.selection;
-        if (!rows || rows.length < 1) 
-        {
+        if (!rows || rows.length < 1) {
           this.$message.warning('至少选择一项进行操作！');
           return;
         }
@@ -524,14 +598,14 @@
           type: "warning",
         }).then(() => {
           this.API.deleteQuestionClass(data.value).then((res) => {
-            if(res.data.success){
-              this.getQuestionClassListHeadler();  
-              this.$message.success('操作成功！'); 
+            if (res.data.success) {
+              this.getQuestionClassListHeadler();
+              this.$message.success('操作成功！');
             }
-            else{
+            else {
               this.$message.error(res.data.message || '删除失败！');
             }
-           
+
           });
         });
 
@@ -586,7 +660,9 @@
         this.$forceUpdate();
         this.dialogClassIVIsible = true;
         console.log(node);
-        if (parent && parent == 0) this.QuestionClassInfo.ParentId = 0;
+        if (parent == 0) {
+          this.QuestionClassInfo.ParentId = 0;
+        }
         if (node)
           this.QuestionClassInfo.ParentId = node.data.value;
         if (type) this.QuestionClassInfo.ClassType = type;
@@ -654,11 +730,15 @@
           item.option = String.fromCharCode(64 + parseInt(index + 1));
         });
       },
+      handleNodeExpand(a, b, c) {
+        this.defaultexpand = [a.id];
+      },
       handleNodeClick(val) {
         if (this.loading) return;
         this.parameter.QuestionClassId = val.value;
         this.parameter.pageIndex = 1;
         this.Dataform.QuestionClassId = val.value;
+        this.defaultexpand = [val.value];
         this.GetList();
       },
       DelQuestionBankEventHeadler(id) {
@@ -677,7 +757,7 @@
           },
         });
       },
-      EditQuestionHeadler() { 
+      EditQuestionHeadler() {
         this.$refs['Dataform'].validate((valid) => {
           if (valid) {
 
diff --git a/src/views/TestPaper/ManualTestPaper copy.vue b/src/views/TestPaper/ManualTestPaper copy.vue
new file mode 100644
index 0000000..9c531ec
--- /dev/null
+++ b/src/views/TestPaper/ManualTestPaper copy.vue
@@ -0,0 +1,799 @@
+<template>
+  <div class="app-container">
+    <div id="id_test_video" style="width:100%; height:auto;"></div>
+    <el-row :gutter="20">
+      <el-col :span="6" :style="{'height':contentHeight+'px'}" v-show="TestPaper.FLevelCount && TestPaper.FLevelCount >0"> 
+        <div class="grid-content bg-purple">
+          <el-tabs v-model="activeTab" style="padding: 0 20px" :stretch="true">
+            <el-tab-pane label="专业类" name="6"></el-tab-pane>
+            <el-tab-pane label="测评类" name="1"></el-tab-pane>
+          </el-tabs>
+          <div style="padding:0 10px">
+            <el-input size="small" placeholder="输入关键字搜索" v-model="parameter.keyWord"></el-input>
+          </div>
+          <div style="padding:10.5px">
+            <el-button type="primary" @click="randomSubject" style="width:100%">随机抽题</el-button>
+          </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" 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>
+
+        </div>
+      </el-col>
+      <el-col :span="10" :style="{'height':contentHeight+'px'}">
+        <div class="grid-content bg-purple">
+          <div class="areahead">
+            <!-- <span v-show="!edit" style="font-weight: bold;">{{ TestPaper.TestPaperTitle }}</span> -->
+            <!-- <el-input v-show="edit" style="width: 400px;" v-model="TestPaper.TestPaperTitle"></el-input>
+            <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,index) in arr2" class="infinite-list-item">
+              <label> {{index+1}}. [{{i.subjectName}}]{{ i.subject }}</label>
+              <div v-for="item in JSON.parse(i.subjectContent)">
+                <p class="option-p">{{item.option}}:{{item.optionContent}}</p>
+              </div>
+            </li>
+            </li>
+          </draggable>
+
+
+        </div>
+      </el-col>
+      <el-col :span="8" :style="{'height':contentHeight+'px'}">
+        <div class="grid-content bg-purple">
+          <div class="areahead">组卷基本信息</div>
+          <el-form ref="form" class="testPaper-manager" :rules="rules" :model="TestPaper" label-width="100px">
+            <el-form-item label="试卷名称:"  prop="TestPaperTitle" required class="el-form-item-custom">
+              <el-input   v-model="TestPaper.TestPaperTitle"></el-input>
+            </el-form-item>
+            <el-form-item label="题目数量:" class="el-form-item-custom">
+         
+            </el-form-item>
+            <el-form-item label="题型数量:" class="el-form-item-custom">
+              <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 || ''}}
+            </el-form-item>
+
+            <el-form-item label="工种" prop="UserTypeOfWork" required class="el-form-item-custom"
+              style="margin-bottom: 20px !important;width:100%;">
+              <el-select v-model="TestPaper.UserTypeOfWork" placeholder="请选择工种" style="width:100%">
+                <el-option v-for="item in usertypelist" :label="item.name" :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="分类" class="el-form-item-custom" prop="QuestionClassId"  >
+              <el-cascader class="testpaper-input" v-model="TestPaper.QuestionClassId"
+                style="width:100%;margin-bottom: 20px;" :props="{emitPath:false}" :clearable=true
+                :options="QuestionClass">
+              </el-cascader>
+            </el-form-item>
+
+      <el-form-item label="级别" prop="FLevelCount"   class="el-form-item-custom"
+              style="margin-bottom: 20px !important;width:100%;"> 
+              <el-select v-model="TestPaper.FLevelCount" placeholder="请选择级别" @change="changelevel" style="width:100%">
+                <el-option v-for="item in levellist" :label="item.title" :value="item.f_count"></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="有效时间" required>
+              <el-form-item prop="date">
+                <el-date-picker v-model="TestPaper.date" @change="changetimestartend" type="datetimerange" 
+                  format="yyyy-MM-dd hh:mm:ss" range-separator="至" start-placeholder="开始时间" style="width:100%"
+                  end-placeholder="结束时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-form-item>
+            <el-form-item label="总时长控制" prop="AnswerTime">
+              <el-input class="testpaper-input" type="number" placeholder="总时长控制(分钟)" v-model="TestPaper.AnswerTime">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="试卷原价:" prop="OriginalPrice" v-show="false">
+              <el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
+                v-model="TestPaper.OriginalPrice" :precision="0">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="试卷价格:" prop="PresentPrice" v-show="false">
+              <el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
+                v-model="TestPaper.PresentPrice">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="会员价:" prop="MembershipPrice" v-show="false">
+              <el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
+                v-model="TestPaper.MembershipPrice">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="试卷简介:">
+              <el-input class="testpaper-input" :rows="10" type="textarea" v-model="TestPaper.Describe">
+              </el-input>
+            </el-form-item>
+            <el-button type="primary" style="float: right;" @click="SubmitTestPaper">保存
+            </el-button>
+          </el-form>
+        </div>
+      </el-col>
+    </el-row>
+
+
+
+    <el-dialog title="随机抽题" :visible.sync="dialogTableVisible">
+
+      <ul class="random-list">
+        <li v-for="(item,index) in randomSubjectList" :key="index">
+          <span>试题分类：</span>
+          <el-cascader :multiple="false" style="flex:1" @change="(a)=>{ changetype(a,item)}" v-model="item.QuestionClassId" :options="randomQuestionTypeList"
+            clearable>
+            <template slot-scope="{ node, data }">
+              <span>{{ data.label }}</span> 
+              <span v-if="data.subjectCount"> ({{ data.subjectCount || '0' }}) </span>
+            </template>
+          </el-cascader>
+          <span style="margin-left:10px;">试题数量：{{item.maxcount}}</span>
+          <el-input-number v-model="item.Count" :min="1" :max="item.maxcount" label="描述文字" style="margin-left:10px;">
+          </el-input-number>
+          <i class="el-icon-remove-outline" @click="changeSubjectCount(-1,index)"
+            style="margin-left:10px;color:#f56c6c;"></i>
+          <i class="el-icon-circle-plus" @click="changeSubjectCount(1)" style="margin-left:10px;color:#67C23A;"></i>
+        </li>
+      </ul>
+      <div slot="footer">
+        <el-button @click="randomCancel">取消</el-button>
+        <el-button type="primary" @click="randomSubmit">确定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+<style lang="scss" scoped>
+  .random-list {
+    display: flex;
+    flex-direction: column;
+
+    li {
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+
+      [class^="el-icon"] {
+        font-size: 24px;
+        cursor: pointer;
+      }
+    }
+  }
+</style>
+<script>
+  import draggable from "vuedraggable";
+  import { PostRandomGetQuestion, getQuestionList, getQuestionClassList } from "@/api/QuestionBank";
+  import { GetpaperLevelList } from "@/api/paperLevel";
+
+  
+  import { GetQuestionClassByType } from "@/api/QuestionClass";
+  import { EditTestPaper, GetToplevel } from "@/api/TestPaper";
+  import { formatTime } from "@/utils/util";
+  import {
+    GetTypeSetting
+  } from '@/api/user'
+  export default {
+    //注册draggable组件
+    components: {
+      draggable,
+    },
+    data() {
+      return {
+        randomSubjectList: [
+          {
+            QuestionClassId: "",
+            Count: "",
+          },
+          {
+            QuestionClassId: "",
+            Count: "",
+          },
+        ],
+        randomQuestionTypeList: [],
+        dynamicValidateForm: {
+          domains: [
+            {
+              value: "",
+            },
+          ],
+          email: "",
+        },
+        usertypelist: [], //工种
+        dialogTableVisible: false,
+        loadingType: false,
+        activeTab: "6",
+        parameter: {
+          pageIndex: 0,
+          pageSize: 20,
+          sort: "id",
+          sortOrder: 1,
+          keyWord: "",
+          QuestionClassId: 6,
+          status: 1,
+        },
+        contentHeight: 0,
+        count: 0,
+        edit: false,
+        arr1: [],
+        arr2: [],
+        classarr: [],
+        moveId: -1,
+        TestPaper: {
+          TestPaperTitle: "未命名试卷标题",
+          TestPaperClassId: 0,
+          TotalScore: 0,
+          Describe: "",
+          SingleNumber: 0,
+          MultipleNumber: 0,
+          SubjectiveNumber: 0,
+          VoiceNumber:0,
+          OriginalPrice: "0",
+          PresentPrice: "0",
+          MembershipPrice: "0",
+          QuestionBankIds: [],
+          FLevelCount:0
+        },
+        loading: false,
+        rules: {
+          OriginalPrice: [
+            {
+              required: true,
+              message: "不能为空",
+            },
+          ],   
+          PresentPrice: [
+            {
+              required: true,
+              message: "不能为空",
+            },
+          ],
+          UserTypeOfWork: [
+            {
+              required: true,
+              message: "请选择工种",
+            },
+          ], QuestionClassId: [
+            {
+              required: true,
+              message: "请选择分类", 
+            },
+          ],date: [
+            {
+              required: true,
+              message: "请选择时间段", 
+            },
+          ],
+          TestPaperTitle: [
+            {
+              required: true,
+              message: "请填写试卷名称", 
+            } 
+          ],
+
+          AnswerTime: [
+            {
+              required: true,
+              message: "请填写试总时长控制", 
+            },
+ 
+          ],
+        },
+        QuestionClass: [],
+        treeData: [
+          {
+            value: 0,
+            label: "全部",
+          },
+        ],
+        timeout: 0,
+        typelist:[],
+        levellist:[] //等级
+      };
+    },
+    watch: {
+      activeTab() {
+        console.log("activeTab watch");
+        this.search();
+      },
+      "parameter.keyWord": {
+        handler() {
+          clearTimeout(this.timeout);
+          this.timeout = setTimeout(() => {
+            this.search();
+          }, 200);
+        },
+      },
+    },
+    computed: {
+      noMore() {
+        return this.arr1.length >= this.count;
+      },
+      disabled() {
+        return this.loading || this.noMore;
+      },
+    },
+    created() {
+      this.getQuestionClassListHeadler();
+      this.getQuestionClassListHeadler2();
+
+
+      GetTypeSetting({}).then(res => {
+        if (res.data) {
+          this.usertypelist = res.data || [];
+        }
+      }); 
+      GetpaperLevelList({pageSize:1000,sortOrder:'asc'}).then(res => {
+        if (res.data) {
+          this.levellist = res.data.data || [];
+        }
+      });
+    },
+    mounted() {
+      //计算页面内容区域的高度
+      this.contentHeight = window.innerHeight - 90;
+      //this.GetList();
+    },
+    methods: {
+      changetype(a,item){
+        var type = this.typelist.find(o=>o.id ==  item.QuestionClassId[item.QuestionClassId.length-1]);
+        if(type) {
+          item.maxcount = type.subjectCount || 0;
+          if(item.Count > item.maxcount) item.Count = item.maxcount;
+        }
+      },
+
+      changelevel(v){ 
+        debugger;
+        var type = this.levellist.find(o=>o.f_count ==  v);
+        if(type) {
+          this.TestPaper.FLevelTitle = type.title || '';
+        }
+      },
+      getmaxid(item){ 
+        var type = this.randomQuestionTypeList.find(o=>o.id == item.QuestionClassId);
+        if(type) return type.subjectCount || 0;
+        else return 0;
+      },
+      getSubTree(id, list) {
+        let result = [];
+        result = list.filter((t) => t.ParentId == id);
+        if (result.length) {
+          result = result.map((item) => {
+            item.value = item.id;
+            item.label = item.ClassificationName;
+            item.children = this.getSubTree(item.id, list);
+            if (!item.children || !item.children.length) {
+              delete item.children;
+            }
+            return item;
+          });
+        }
+        return result;
+      },
+      getQuestionClassListHeadler2() {
+        let _this = this;
+        getQuestionClassList().then((res) => {
+          let alllist = res.data.data;
+          this.typelist = alllist;
+          let list = alllist.filter(t => !t.ParentId);
+          list = list.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            t.children = this.getSubTree(t.id, alllist);
+            if (!t.children || !t.children.length) {
+              delete t.children;
+            }
+            return t;
+          });
+          this.randomQuestionTypeList = list;
+        });
+      },
+      randomCancel() {
+        this.dialogTableVisible = false;
+      },
+      randomSubmit() {
+        var list = JSON.parse(JSON.stringify(this.randomSubjectList));
+        if (list.findIndex((t) => !t.QuestionClassId || !t.QuestionClassId.length || !t.Count) > -1) {
+          this.$message.warning("参数不完整");
+          return;
+        }
+
+        list = list.map(t => {
+          t.QuestionClassId = t.QuestionClassId.pop();
+          return t;
+        });
+        PostRandomGetQuestion(list).then((res) => {
+          let list = res.data.data;
+          this.arr2 = list;
+          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;
+          }
+        });
+      },
+      changeSubjectCount(type, index) {
+        if (type > 0) {
+          this.randomSubjectList.push({
+            QuestionClassId: "",
+            Count: "",
+          });
+        } else {
+          this.randomSubjectList.splice(index, 1);
+        }
+      },
+      randomSubject() {
+        this.dialogTableVisible = true;
+      },
+      submitForm(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            alert("submit!");
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
+      },
+      removeDomain(item) {
+        var index = this.dynamicValidateForm.domains.indexOf(item);
+        if (index !== -1) {
+          this.dynamicValidateForm.domains.splice(index, 1);
+        }
+      },
+      addDomain() {
+        this.dynamicValidateForm.domains.push({
+          value: "",
+          key: Date.now(),
+        });
+      },
+      changetimestartend(val, aa) {
+        this.TestPaper.EffectiveStartTime = formatTime(val[0]);
+        this.TestPaper.EffectiveEndTime = formatTime(val[1]);
+      },
+      search() {
+        this.parameter.pageIndex = 1;
+        this.parameter.QuestionClassId = Number(this.activeTab);
+        this.GetList();
+      },
+      SubmitTestPaper() {
+
+        this.$refs['form'].validate((valid) => {
+       
+          if(!this.TestPaper.TestPaperTitle){
+            this.$notify({
+                  title: '试卷标题必填！',
+                  // message: res.data.message,
+                  type: 'warning'
+                });
+            return;
+          }
+          if (valid) { 
+            this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
+            var d = this.TestPaper;
+            if (this.arr2.length > 0) {
+              EditTestPaper(this.TestPaper).then((res) => {
+                if (res.data.code == 200) {
+                  this.$notify({
+                  title: '组卷成功！',
+                  // message: res.data.message,
+                  type: 'success'
+                });
+                  this.$router.push({
+                    path: '/views/TestPaperList',
+                    query: { 
+                    }
+                  })
+                } else {
+                  this.$confirm("组卷失败！", "消息");
+                }
+              });
+            } else {
+              this.$confirm("试题没有题目！", "消息");
+            }
+          } else {
+
+            return false;
+          }
+        });
+
+
+
+      },
+      load() {
+        this.loading = true;
+        this.parameter.pageIndex++;
+        this.GetList();
+        this.loading = false;
+      },
+      GetList() {
+        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.subjectCount || 0)+')';
+                rs.type = "wd";
+                rs.subjectContent = "[]";
+                return rs;
+              });
+              this.loadingType = true;
+            });
+        } 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;
+        if (that.arr1.length < 10) {
+          this.load();
+        }
+
+        var items = this.arr2.filter(function (m) {
+          return m.id == that.moveId;
+        });
+
+        //如果左边
+        if (items.length < 2) return;
+        this.arr2.splice(e.newDraggableIndex, 1);
+
+        //	SingleNumber:0,
+        // MultipleNumber:0,
+        // SubjectiveNumber:0,
+      },
+      //从右边移除到左边
+      RemoveHere(e) {
+        if (e.item._underlying_vm_.subjectType == 1) {
+          this.TestPaper.SingleNumber -= 1;
+        }
+        if (e.item._underlying_vm_.subjectType == 2) {
+          this.TestPaper.MultipleNumber -= 1;
+        }
+        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);
+      },
+      //从左边添加到右边
+      ComeHere(e) {
+        var d = e.item._underlying_vm_;
+        if (e.item._underlying_vm_.subjectType == 1) {
+          this.TestPaper.SingleNumber += 1;
+        }
+        if (e.item._underlying_vm_.subjectType == 2) {
+          this.TestPaper.MultipleNumber += 1;
+        }
+        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);
+
+        if (d.type == "wd") {
+          getQuestionList({
+            QuestionClassId: d.id,
+            PageIndex: 1,
+            PageSize: this.TestPaper.FLevelCount ||  1000,
+          }).then((res) => {
+            var data = res.data.data.rows || [];
+            data = data.filter(o => !this.arr2.find(d => d.id == o.id));
+            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;
+              }
+              if (rs.subjectType == 4) {
+                this.TestPaper.VoiceNumber += 1;
+              }
+            });
+          });
+        }
+      },
+      //右边往左边拖动时的事件
+      end2(e) {
+        var that = this;
+        var items = this.arr1.filter(function (m) {
+          return m.id == that.moveId;
+        });
+        //如果左边
+        if (items.length < 2) return;
+        this.arr1.splice(e.newDraggableIndex, 1);
+      },
+      //move回调方法
+      onMove(e, originalEvent) {
+        //this.moveId = e.relatedContext.element.id;
+        return true;
+      },
+      getQuestionClassListHeadler() {
+        let _this = this;
+        GetToplevel().then((res) => {
+          var gettree = function (titem) {
+            titem.children = [];
+            let childrenList = res.data.data.filter(
+              (u) => u.ParentId == titem.value
+            );
+            if (childrenList.length == 0) titem.children = undefined;
+            res.data.data
+              .filter((u) => u.ParentId == titem.value)
+              .forEach((item, i) => {
+                var model = {
+                  value: item.id,
+                  label: item.ClassTitle,
+                };
+                gettree(model);
+                titem.children.push(model);
+              });
+          };
+          res.data.data
+            .filter((u) => u.ParentId == 0)
+            .forEach((item, i) => {
+              var model = {
+                value: item.id,
+                label: item.ClassTitle,
+              };
+              gettree(model);
+              _this.QuestionClass.push(model);
+              _this.treeData.push(model);
+            });
+        });
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .el-row {
+
+    /* margin-bottom: 20px; */
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .el-col {
+    border-radius: 4px;
+  }
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    background: #efefef;
+  }
+
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+    height: 100%;
+  }
+
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+
+  .infinite-list {
+    list-style: none;
+    margin: 0px;
+    padding: 0px;
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    //滚动条小方块
+    &::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background: #304156;
+    }
+
+    //滚动条轨道
+    &::-webkit-scrollbar-track {
+      // border-radius: 10px;
+      height: 100px;
+      background: #cdcdcd;
+    }
+
+    .infinite-list-item {
+      padding: 10px;
+      min-height: 60px;
+      width: 95%;
+      margin: auto;
+      background-color: #fff;
+      margin-bottom: 10px;
+      border-radius: 5px;
+      box-shadow: 0 0 5px #cdcdcd;
+
+      &:first-child {
+        margin-top: 10px;
+      }
+    }
+  }
+
+  .option-p {
+    line-height: 15px;
+  }
+
+  .areahead {
+    text-align: center;
+    height: 60px;
+    line-height: 60px;
+    border-bottom: 1px solid #cdcdcd;
+  }
+
+  .testPaper-manager {
+    margin: 10px 20px 10px 10px;
+  }
+
+  .testPaper-manager .el-form-item {
+    margin-bottom: 20px;
+  }
+
+  .el-form-item-custom {
+    margin-bottom: 0px !important;
+  }
+
+  .testpaper-input {
+    //max-width: 400px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/TestPaper/ManualTestPaper.vue b/src/views/TestPaper/ManualTestPaper.vue
index c87c6ec..1ed8187 100644
--- a/src/views/TestPaper/ManualTestPaper.vue
+++ b/src/views/TestPaper/ManualTestPaper.vue
@@ -1,66 +1,36 @@
 <template>
   <div class="app-container">
     <div id="id_test_video" style="width:100%; height:auto;"></div>
+  <div style="width: 100%;text-align: right;background: #efefef;height: 60px;vertical-align: middle;line-height: 60px;padding-right: 10px;">
+ 
+    <el-button style="margin-top: 12px;" @click="next" v-if="active==1">下一步</el-button>
+    <el-button style="margin-top: 12px;z-index:888888888" @click="next" v-if="active==2">编辑基本信息</el-button>
+    <el-button type="primary" style=""  v-if="active==2" @click="SubmitTestPaper">保存
+    </el-button>
+  </div>
     <el-row :gutter="20">
-      <el-col :span="6" :style="{'height':contentHeight+'px'}">
-        <div class="grid-content bg-purple">
-          <el-tabs v-model="activeTab" style="padding: 0 20px" :stretch="true">
-            <el-tab-pane label="专业类" name="6"></el-tab-pane>
-            <el-tab-pane label="测评类" name="1"></el-tab-pane>
-          </el-tabs>
-          <div style="padding:0 10px">
-            <el-input size="small" placeholder="输入关键字搜索" v-model="parameter.keyWord"></el-input>
-          </div>
-          <div style="padding:10.5px">
-            <el-button type="primary" @click="randomSubject" style="width:100%">随机抽题</el-button>
-          </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" 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>
+      <el-steps :active="active" finish-status="success" simple style="margin:0px 10px">
+        <el-step title="基本信息"></el-step>
+        <el-step title="组卷"></el-step>
+      </el-steps>
 
-        </div>
-      </el-col>
-      <el-col :span="10" :style="{'height':contentHeight+'px'}">
-        <div class="grid-content bg-purple">
-          <div class="areahead">
-            <!-- <span v-show="!edit" style="font-weight: bold;">{{ TestPaper.TestPaperTitle }}</span> -->
-            <!-- <el-input v-show="edit" style="width: 400px;" v-model="TestPaper.TestPaperTitle"></el-input>
-            <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,index) in arr2" class="infinite-list-item">
-              <label> {{index+1}}. [{{i.subjectName}}]{{ i.subject }}</label>
-              <div v-for="item in JSON.parse(i.subjectContent)">
-                <p class="option-p">{{item.option}}:{{item.optionContent}}</p>
-              </div>
-            </li>
-            </li>
-          </draggable>
 
+      <el-col :span="8" :style="{'height':contentHeight+'px'}" class="jinyongtop">
+        <div class="jinyong" v-if="active!=1">
 
         </div>
-      </el-col>
-      <el-col :span="8" :style="{'height':contentHeight+'px'}">
         <div class="grid-content bg-purple">
           <div class="areahead">组卷基本信息</div>
           <el-form ref="form" class="testPaper-manager" :rules="rules" :model="TestPaper" label-width="100px">
-            <el-form-item label="试卷名称:"  prop="TestPaperTitle" required class="el-form-item-custom">
-              <el-input   v-model="TestPaper.TestPaperTitle"></el-input>
-            </el-form-item>
-            <el-form-item label="题目数量:" class="el-form-item-custom">
-         
+            <el-form-item label="试卷名称:" prop="TestPaperTitle" required class="el-form-item-custom">
+              <el-input v-model="TestPaper.TestPaperTitle"></el-input>
             </el-form-item>
+            <!-- <el-form-item label="题目数量:" class="el-form-item-custom">
+
+            </el-form-item> -->
             <el-form-item label="题型数量:" class="el-form-item-custom">
               <span style="margin-right: 10px;">单选题：{{TestPaper.SingleNumber}}</span>
               <span style="margin-right: 10px;">多选题：{{TestPaper.MultipleNumber}}</span>
@@ -77,15 +47,15 @@
                 <el-option v-for="item in usertypelist" :label="item.name" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="分类" class="el-form-item-custom" prop="QuestionClassId"  >
+            <el-form-item label="分类" class="el-form-item-custom" prop="QuestionClassId">
               <el-cascader class="testpaper-input" v-model="TestPaper.QuestionClassId"
                 style="width:100%;margin-bottom: 20px;" :props="{emitPath:false}" :clearable=true
                 :options="QuestionClass">
               </el-cascader>
             </el-form-item>
 
-      <el-form-item label="级别" prop="FLevelCount"   class="el-form-item-custom"
-              style="margin-bottom: 20px !important;width:100%;"> 
+            <el-form-item label="级别" prop="FLevelCount" class="el-form-item-custom"
+              style="margin-bottom: 20px !important;width:100%;">
               <el-select v-model="TestPaper.FLevelCount" placeholder="请选择级别" @change="changelevel" style="width:100%">
                 <el-option v-for="item in levellist" :label="item.title" :value="item.f_count"></el-option>
               </el-select>
@@ -93,7 +63,7 @@
 
             <el-form-item label="有效时间" required>
               <el-form-item prop="date">
-                <el-date-picker v-model="TestPaper.date" @change="changetimestartend" type="datetimerange" 
+                <el-date-picker v-model="TestPaper.date" @change="changetimestartend" type="datetimerange"
                   format="yyyy-MM-dd hh:mm:ss" range-separator="至" start-placeholder="开始时间" style="width:100%"
                   end-placeholder="结束时间">
                 </el-date-picker>
@@ -126,24 +96,79 @@
               <el-input class="testpaper-input" :rows="10" type="textarea" v-model="TestPaper.Describe">
               </el-input>
             </el-form-item>
-            <el-button type="primary" style="float: right;" @click="SubmitTestPaper">保存
-            </el-button>
+
           </el-form>
         </div>
       </el-col>
+      <el-col :span="6" :style="{'height':contentHeight+'px'}" class="jinyongtop">
+        <div class="jinyong" v-if="active==1">
+
+        </div>
+        <div class="grid-content bg-purple">
+          <el-tabs v-model="activeTab" style="padding: 0 20px" :stretch="true">
+            <el-tab-pane label="专业类" name="6"></el-tab-pane>
+            <el-tab-pane label="测评类" name="1"></el-tab-pane>
+          </el-tabs>
+          <div style="padding:0 10px">
+            <el-input size="small" placeholder="输入关键字搜索" v-model="parameter.keyWord"></el-input>
+          </div>
+          <div style="padding:10.5px">
+            <el-button type="primary" @click="randomSubject" style="width:100%">随机抽题</el-button>
+          </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" 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>
+
+        </div>
+      </el-col>
+      <el-col :span="10" :style="{'height':contentHeight+'px'}" class="jinyongtop">
+        <div class="jinyong" v-if="active==1">
+
+        </div>
+        <div class="grid-content bg-purple">
+          <div class="areahead">
+            <!-- <span v-show="!edit" style="font-weight: bold;">{{ TestPaper.TestPaperTitle }}</span> -->
+            <!-- <el-input v-show="edit" style="width: 400px;" v-model="TestPaper.TestPaperTitle"></el-input>
+            <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,index) in arr2" class="infinite-list-item">
+              <label> {{index+1}}. [{{i.subjectName}}]{{ i.subject }}</label>
+              <div v-for="item in JSON.parse(i.subjectContent)">
+                <p class="option-p">{{item.option}}:{{item.optionContent}}</p>
+              </div>
+            </li>
+            </li>
+          </draggable>
+
+
+        </div>
+      </el-col>
+
     </el-row>
 
 
 
-    <el-dialog title="随机抽题" :visible.sync="dialogTableVisible">
+    <el-dialog title="随机抽题" :visible.sync="dialogTableVisible" style="margin-left:30%;">
 
       <ul class="random-list">
         <li v-for="(item,index) in randomSubjectList" :key="index">
           <span>试题分类：</span>
-          <el-cascader :multiple="false" style="flex:1" @change="(a)=>{ changetype(a,item)}" v-model="item.QuestionClassId" :options="randomQuestionTypeList"
-            clearable>
+          <el-cascader :multiple="false" style="flex:1" @change="(a)=>{ changetype(a,item)}"
+            v-model="item.QuestionClassId" :options="randomQuestionTypeList" clearable>
             <template slot-scope="{ node, data }">
-              <span>{{ data.label }}</span> 
+              <span>{{ data.label }}</span>
               <span v-if="data.subjectCount"> ({{ data.subjectCount || '0' }}) </span>
             </template>
           </el-cascader>
@@ -179,13 +204,31 @@
       }
     }
   }
+
+  .jinyongtop {
+    position: relative;
+  }
+
+  .jinyong {
+    width: 100%;
+    position: absolute;
+    width: 100%;
+    top: 0px;
+    left: opx;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    z-index: 8888;
+    opacity: 0.1;
+    background:black;
+  }
 </style>
 <script>
   import draggable from "vuedraggable";
   import { PostRandomGetQuestion, getQuestionList, getQuestionClassList } from "@/api/QuestionBank";
   import { GetpaperLevelList } from "@/api/paperLevel";
 
-  
+
   import { GetQuestionClassByType } from "@/api/QuestionClass";
   import { EditTestPaper, GetToplevel } from "@/api/TestPaper";
   import { formatTime } from "@/utils/util";
@@ -199,6 +242,7 @@
     },
     data() {
       return {
+        active: 1,
         randomSubjectList: [
           {
             QuestionClassId: "",
@@ -246,12 +290,12 @@
           SingleNumber: 0,
           MultipleNumber: 0,
           SubjectiveNumber: 0,
-          VoiceNumber:0,
+          VoiceNumber: 0,
           OriginalPrice: "0",
           PresentPrice: "0",
           MembershipPrice: "0",
           QuestionBankIds: [],
-          FLevelCount:0
+          FLevelCount: null
         },
         loading: false,
         rules: {
@@ -260,7 +304,7 @@
               required: true,
               message: "不能为空",
             },
-          ],   
+          ],
           PresentPrice: [
             {
               required: true,
@@ -275,27 +319,38 @@
           ], QuestionClassId: [
             {
               required: true,
-              message: "请选择分类", 
+              message: "请选择分类",
             },
-          ],date: [
+          ]
+
+          , FLevelCount: [
+            {
+              required: true,
+              message: "请选择级别",
+            },
+          ]
+
+
+
+          , date: [
             {
               required: true,
-              message: "请选择时间段", 
+              message: "请选择时间段",
             },
           ],
           TestPaperTitle: [
             {
               required: true,
-              message: "请填写试卷名称", 
-            } 
+              message: "请填写试卷名称",
+            }
           ],
 
           AnswerTime: [
             {
               required: true,
-              message: "请填写试总时长控制", 
+              message: "请填写试总时长控制",
             },
- 
+
           ],
         },
         QuestionClass: [],
@@ -306,8 +361,8 @@
           },
         ],
         timeout: 0,
-        typelist:[],
-        levellist:[] //等级
+        typelist: [],
+        levellist: [] //等级
       };
     },
     watch: {
@@ -341,8 +396,8 @@
         if (res.data) {
           this.usertypelist = res.data || [];
         }
-      }); 
-      GetpaperLevelList({pageSize:1000,sortOrder:'asc'}).then(res => {
+      });
+      GetpaperLevelList({ pageSize: 1000, sortOrder: 'asc' }).then(res => {
         if (res.data) {
           this.levellist = res.data.data || [];
         }
@@ -354,23 +409,40 @@
       //this.GetList();
     },
     methods: {
-      changetype(a,item){
-        var type = this.typelist.find(o=>o.id ==  item.QuestionClassId[item.QuestionClassId.length-1]);
-        if(type) {
+      next() {
+        var _this = this;
+        console.log(this.active);
+        if(this.active == 1)
+        {
+          _this.$refs['form'].validate((valid) => {
+            if(valid){
+               this.active = 2;
+            }     
+          });
+        } 
+        else{
+          if (this.active++ >=2) this.active = 1;
+
+        }
+    
+      },
+      changetype(a, item) {
+        var type = this.typelist.find(o => o.id == item.QuestionClassId[item.QuestionClassId.length - 1]);
+        if (type) {
           item.maxcount = type.subjectCount || 0;
-          if(item.Count > item.maxcount) item.Count = item.maxcount;
+          if (item.Count > item.maxcount) item.Count = item.maxcount;
         }
       },
 
-      changelevel(v){ 
-        var type = this.levellist.find(o=>o.f_count ==  v);
-        if(type) {
+      changelevel(v) {
+        var type = this.levellist.find(o => o.f_count == v);
+        if (type) {
           this.TestPaper.FLevelTitle = type.title || '';
         }
       },
-      getmaxid(item){ 
-        var type = this.randomQuestionTypeList.find(o=>o.id == item.QuestionClassId);
-        if(type) return type.subjectCount || 0;
+      getmaxid(item) {
+        var type = this.randomQuestionTypeList.find(o => o.id == item.QuestionClassId);
+        if (type) return type.subjectCount || 0;
         else return 0;
       },
       getSubTree(id, list) {
@@ -427,11 +499,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;
+          } 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;
           }
         });
       },
@@ -485,29 +557,29 @@
       SubmitTestPaper() {
 
         this.$refs['form'].validate((valid) => {
-       
-          if(!this.TestPaper.TestPaperTitle){
+
+          if (!this.TestPaper.TestPaperTitle) {
             this.$notify({
-                  title: '试卷标题必填！',
-                  // message: res.data.message,
-                  type: 'warning'
-                });
+              title: '试卷标题必填！',
+              // message: res.data.message,
+              type: 'warning'
+            });
             return;
           }
-          if (valid) { 
+          if (valid) {
             this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
             var d = this.TestPaper;
             if (this.arr2.length > 0) {
               EditTestPaper(this.TestPaper).then((res) => {
                 if (res.data.code == 200) {
                   this.$notify({
-                  title: '组卷成功！',
-                  // message: res.data.message,
-                  type: 'success'
-                });
+                    title: '组卷成功！',
+                    // message: res.data.message,
+                    type: 'success'
+                  });
                   this.$router.push({
                     path: '/views/TestPaperList',
-                    query: { 
+                    query: {
                     }
                   })
                 } else {
@@ -538,7 +610,7 @@
             GetQuestionClassByType({ ClassType: 2 }).then((res) => {
               var classarr = res.data.data || [];
               this.arr1 = classarr.map((rs) => {
-                rs.subject = rs.subjectName = rs.ClassificationName+'('+(rs.subjectCount || 0)+')';
+                rs.subject = rs.subjectName = rs.ClassificationName + '(' + (rs.subjectCount || 0) + ')';
                 rs.type = "wd";
                 rs.subjectContent = "[]";
                 return rs;
@@ -590,7 +662,7 @@
         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);
       },
@@ -617,7 +689,7 @@
           getQuestionList({
             QuestionClassId: d.id,
             PageIndex: 1,
-            PageSize: this.TestPaper.FLevelCount ||  1000,
+            PageSize: this.TestPaper.FLevelCount || 1000,
           }).then((res) => {
             var data = res.data.data.rows || [];
             data = data.filter(o => !this.arr2.find(d => d.id == o.id));
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 4d5fffd..a17e6a8 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -4,10 +4,11 @@
 			style="background-color: #334056;border-radius: 5px;color: #FFF;font-size: 16px;padding: 5px 5px 5px 15px;">
 			<div style="font-size: 20px;">欢迎使用面试考试系统后台</div>
 		</div>
-		<el-row :gutter="20">
+		<el-row :gutter="20" v-if="isAdmin">
 			<el-col :span="6">
 				<div class="grid-content bg-purple">
-					<label class="grid-content-number">{{total.PriceNumber/100}}<span style="font-size: 16px;">元</span></label>
+					<label class="grid-content-number">{{total.PriceNumber/100}}<span
+							style="font-size: 16px;">元</span></label>
 					<div>总收益</div>
 				</div>
 			</el-col>
@@ -30,6 +31,10 @@
 				</div>
 			</el-col>
 		</el-row>
+
+		<div style="width:100%">
+			<el-image :src="imageUrl"  style="width:100%"></el-image> 
+		</div>
 	</div>
 </template>
 
@@ -38,31 +43,41 @@
 		GetQuestionTotal,
 		GetTestPaperTotal
 	} from '@/api/index'
-  import {
-    OrderGetPriceNumber
-  } from '@/api/order.js'
+	import {
+		OrderGetPriceNumber
+	} from '@/api/order.js'
 	import {
 		mapGetters
 	} from 'vuex'
-import {
-    GetUserList
-  } from '@/api/user'
+	import {
+		GetUserList
+	} from '@/api/user'
+
+
+	import {
+		GetInfo
+	} from '@/api/setting'
+
+
+
 	export default {
 		name: '安第斯考试系统',
 		data() {
 			return {
+				isAdmin: false,
+				imageUrl: '',
 				total: {
 					questiontotal: 0,
-					testpapertotal:0,
-          PriceNumber:0,
-          Count:0,
+					testpapertotal: 0,
+					PriceNumber: 0,
+					Count: 0,
 				},
-        query: {
-          UserTypeEnum: 1, //0：管理员，1普通用户
-          PageIndex: 1,
-          PageSize: 10,
-        
-        }
+				query: {
+					UserTypeEnum: 1, //0：管理员，1普通用户
+					PageIndex: 1,
+					PageSize: 10,
+
+				}
 			}
 		},
 		computed: {
@@ -74,22 +89,37 @@ import {
 
 		},
 		mounted() {
+			try {
+				if (this.$store.state.user.userInfo.UserType == 0) this.isAdmin = true;
+			} catch { }
+			this.init();
 			this.GetTotalHeadler();
 		},
 		methods: {
+			init() {
+				var _this = this;
+				GetInfo(1).then(res => {
+					var d = res.data;
+					if (d && d.data) {
+						if (d.data.home_images) {
+							_this.imageUrl = _this.BASE_URL + d.data.home_images;
+						}
+					}
+				});
+			},
 			GetTotalHeadler() {
 				GetQuestionTotal().then(res => {
 					this.total.questiontotal = res.data.data;
 				});
-				GetTestPaperTotal().then(res=>{
+				GetTestPaperTotal().then(res => {
 					this.total.testpapertotal = res.data.data;
 				});
-        OrderGetPriceNumber().then(res=>{
-          this.total.PriceNumber = res.data.data;
-        })
-        GetUserList(this.query).then(res => {
-          this.total.Count = res.data.data.total
-        })
+				OrderGetPriceNumber().then(res => {
+					this.total.PriceNumber = res.data.data;
+				})
+				GetUserList(this.query).then(res => {
+					this.total.Count = res.data.data.total
+				})
 			}
 		}
 	}
@@ -100,48 +130,59 @@ import {
 		&-container {
 			margin: 30px;
 		}
+
 		&-text {
 			font-size: 30px;
 			line-height: 46px;
 		}
 	}
+
 	.el-row {
 		margin-bottom: 20px;
 		margin-top: 20px;
+
 		&:last-child {
 			margin-bottom: 0;
 		}
 	}
+
 	.el-col {
 		border-radius: 5px;
 	}
+
 	.bg-purple-dark {
 		background: #99a9bf;
 	}
+
 	.bg-purple {
 		background: #d3dce6;
 		box-shadow: 0 0 10px #cdcdcd;
 	}
+
 	.bg-purple-light {
 		background: #e5e9f2;
 	}
+
 	.grid-content {
 		border-radius: 5px;
 		min-height: 36px;
 		text-align: center;
 		padding-top: 20px;
 		padding-bottom: 20px;
+
 		.grid-content-number {
 			font-size: 40px;
 			color: red;
 		}
+
 		div {
 			font-size: 20px;
 			margin-top: 10px;
 		}
 	}
+
 	.row-bg {
 		padding: 10px 0;
 		background-color: #f9fafc;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bdbc394..f4a2f6f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -88,8 +88,8 @@
 			$route: {
 				handler: function (route) {
 					this.redirect = route.query && route.query.redirect
-					if (this.redirect.indexOf('404') != -1)
-						this.redirect = this.redirect.replace('404', 'dashboard')
+					// if (this.redirect.indexOf('404') != -1)
+					// 	this.redirect = this.redirect.replace('404', 'dashboard')
 				},
 				immediate: true
 			}
@@ -109,12 +109,11 @@
 			},
 			handleLogin() {
 				this.$refs.loginForm.validate(valid => {
-
 					if (valid) {
 						this.loading = true
 						this.$store.dispatch('user/login', this.loginForm).then(() => {
 							this.$router.push({
-								path: '/'
+								path: this.redirect || '/'
 							})
 							this.loading = false
 						}).catch((ret) => {
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
new file mode 100644
index 0000000..2052526
--- /dev/null
+++ b/src/views/settings/index.vue
@@ -0,0 +1,156 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" label-width="180px" style="width:50%">
+      <el-form-item label="系统名称">
+        <el-input v-model="form.name"></el-input>
+      </el-form-item>
+
+
+   <el-form-item label="首页广告图">
+      <el-upload :headers="{Authorization:token}" 
+      class="avatar-uploader"
+      :action="BASE_URL + '/api/upload/single'"
+      :show-file-list="false"
+      :on-success="handleAvatarSuccess"
+ >
+      <img v-if="imageUrl" :src="imageUrl" class="avatar">
+      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+    </el-upload>
+
+      </el-form-item>
+
+
+      
+      <!-- <el-form-item label="活动区域">
+        <el-select v-model="form.region" 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-col :span="11">
+          <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+        </el-col>
+        <el-col class="line" :span="2">-</el-col>
+        <el-col :span="11">
+          <el-time-picker placeholder="选择时间" v-model="form.date2" style="width: 100%;"></el-time-picker>
+        </el-col>
+      </el-form-item>
+      <el-form-item label="即时配送">
+        <el-switch v-model="form.delivery"></el-switch>
+      </el-form-item>
+      <el-form-item label="活动性质">
+        <el-checkbox-group v-model="form.type">
+          <el-checkbox label="美食/餐厅线上活动" name="type"></el-checkbox>
+          <el-checkbox label="地推活动" name="type"></el-checkbox>
+          <el-checkbox label="线下主题活动" name="type"></el-checkbox>
+          <el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="特殊资源">
+        <el-radio-group v-model="form.resource">
+          <el-radio label="线上品牌商赞助"></el-radio>
+          <el-radio label="线下场地免费"></el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="活动形式">
+        <el-input type="textarea" v-model="form.desc"></el-input>
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+    
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+  
+import {
+    getToken
+  } from '@/utils/auth'
+
+
+
+  import {
+    GetInfo,
+    Update
+  } from '@/api/setting'
+   export default {
+      data() {
+ 
+        return {
+          token:getToken(),
+          imageUrl:'',
+          form: {
+            pass: '',
+            checkPass: '',
+          },
+          rules: { 
+          }
+        };
+      },
+      created(){
+        var _this = this;
+        GetInfo(1).then(res=>{
+          _this.form = res.data.data;  
+          if(_this.form.home_images){
+            _this.imageUrl = _this.BASE_URL+_this.form.home_images;
+          }
+        });
+      },
+
+      methods: {
+        handleAvatarSuccess(res, file) {
+        this.imageUrl = URL.createObjectURL(file.raw);
+        this.form.home_images = res.data.data.src || '';
+      },
+
+        submitForm(formName) {
+          Update(this.form).then(res=>{
+                if (res.data.code==200) {
+                  this.$notify({
+                    title: '提示',
+                    message: '保存成功',
+                    type: 'success',
+                    duration: 1000
+                  })
+                
+                }
+              })
+        },
+        resetForm(formName) {
+          this.$refs[formName].resetFields();
+        }
+      }
+    }
+</script>
+
+<style>
+</style>
+<style scoped>
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/user/loglist.vue b/src/views/user/loglist.vue
new file mode 100644
index 0000000..a549d78
--- /dev/null
+++ b/src/views/user/loglist.vue
@@ -0,0 +1,287 @@
+<template>
+	<div style="padding: 10px">
+		<div class="seetingsDiv" style="">
+			<div class="flex" style="margin-top: 10px">
+				<el-form :inline="true" class="demo-form-inline">
+					<el-form-item label="关键字">
+						<el-input placeholder="输入关键字搜索" v-model="queryModel.keyword"></el-input>
+					</el-form-item>
+					<el-form-item label="用户">
+						<el-input placeholder="用户" v-model="queryModel.username"></el-input>
+					</el-form-item>
+					<el-form-item label="日志类型">
+						<el-select v-model="queryModel.type" placeholder="日志类型">
+							<el-option label="全部" value=""></el-option>
+							<el-option label="用户操作" value="1"></el-option>
+							<el-option label="系统操作" value="2"></el-option>
+							<el-option label="系统信息" value="3"></el-option>
+							<el-option label="底层信息" value="4"></el-option>
+						</el-select>
+					</el-form-item>
+
+				</el-form>
+				<el-button type="success" @click="search">搜索</el-button>
+			</div>
+			<div class="flex align-center" style="margin-top: 10px">
+				
+
+			</div>
+		</div>
+		<div class="main-box">
+			<el-table ref="mytable" :data="table_data" style="width: 100%;height:calc(100vh - 260px)" border
+				@selection-change="handleSelectionChange">
+				<el-table-column v-if="radio" type="index" width="50"></el-table-column>
+				<el-table-column v-if="selection" type="selection" width="55"></el-table-column>
+
+
+				<el-table-column align="center" width="120" label="类型">
+					<template slot-scope="scope"> 
+ 
+						 <div>
+							    <span v-if="scope.row.TypeEnum == 1">用户操作</span>
+								<span v-else-if="scope.row.TypeEnum == 2">系统操作</span>
+								<span v-else-if="scope.row.TypeEnum == 3">系统信息</span>
+								<span v-else-if="scope.row.TypeEnum == 4">底层信息</span>
+								<span v-else >系统</span> 
+						 </div>
+					</template>
+				</el-table-column>
+				<el-table-column align="center" v-for="(item, index, key) in table_columns" :width="item.width"
+					:item="item" :key="key" :index="index" :label="item.label">
+					<template slot-scope="scope">
+						<el-input v-if="scope.row.edit" size="small" v-model="scope.row[item.prop]"
+							:placeholder="'请输入' + item.label">
+						</el-input>
+						<span v-if="!scope.row.edit">{{ scope.row[item.prop] }}</span>
+					</template>
+				</el-table-column>
+
+			</el-table>
+
+		</div>
+
+		<div class="page-box">
+			<el-pagination background layout="prev, pager, next" :total="queryResult.totalCount"
+				@current-change="currentchange">
+			</el-pagination>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		GetList,
+	} from "@/api/log";
+	import { formatTime } from '@/utils/util'
+	export default {
+		data() {
+			return {
+				currentFilePath: "",
+				queryResult: {},
+				queryModel: {
+					pageIndex: 1,
+					pageSize: 20,
+				},
+				query: {},
+				new_date_json: {}, //数据结构
+				multipleSelection: [], //复选框，数据
+				is_edit: true, //是否可编辑
+				is_delete: true, //是否可删除
+				selection: true, //是否需要复选框
+				radio: false, //单选变色
+				space_color: true, //隔行变色
+				//表头信息
+				table_columns: [{
+					prop: "OperationTitle",
+					label: "内容",
+					width: "350",
+				},
+				{
+					prop: "OperationIp",
+					label: "操作IP地址",
+					width: "180",
+				},
+				{
+					prop: "OperationTime",
+					label: "操作时间",
+					width: "180",
+				},
+				{
+					prop: "UserName",
+					label: "操作用户",
+					width: "120",
+				},
+				{
+					prop: "Describe",
+					label: "详细内容",
+				},
+				],
+				//表格数据
+				table_data: [],
+				dialogVisible: false,
+				form: {},
+			};
+		},
+		methods: {
+
+			search() {
+				this.queryModel.pageIndex = 1;
+				this.getList();
+			},
+			getList() {
+				GetList(this.queryModel).then((res) => {
+					this.queryResult = res.data;
+
+					this.table_data = res.data.data.map(t => {
+						t.OperationTime = formatTime(t.OperationTime, 'yyyy-MM-dd');
+						return t;
+					});
+				});
+			},
+			//隔行变色
+			tableRowClassName() {
+				//选取DOM节点
+				var trs = this.$refs.mytable.$el
+					.getElementsByTagName("tbody")[0]
+					.getElementsByTagName("tr");
+				for (var i in trs) {
+					if (i % 2 == 0) {
+						//当隔行变色未true时改变颜色
+						if (this.space_color) {
+							trs[i].style.backgroundColor = "#f0f9eb";
+						} else {
+							trs[i].style.backgroundColor = "";
+						}
+					}
+				}
+			},
+
+			//多选框
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+				console.log("selection:", this.multipleSelection);
+			},
+
+
+			//删除
+			handleDelete(index, row) {
+				console.log(index, row);
+
+				this.table_data.splice(index, 1);
+				UserInfo_Delete(row.id);
+				this.$message({
+					message: "删除成功！",
+					type: "success",
+				});
+			},
+
+			currentchange(page) {
+				this.queryModel.pageIndex = page;
+				this.getList();
+			},
+		},
+		created() {
+			this.getList();
+		},
+		mounted: function () {
+			//确保方法在页面渲染后调用
+			this.$nextTick(function () {
+				/////方法
+				this.tableRowClassName();
+			});
+		},
+		watch: {
+			space_color: function () {
+				//监听数据变化
+				this.$nextTick(function () {
+					/////方法
+					this.tableRowClassName();
+				});
+			},
+			table_data: function () {
+				//监听数据变化f
+				this.$nextTick(function () {
+					/////方法
+					this.tableRowClassName();
+				});
+			},
+		},
+	};
+</script>
+<style scoped>
+	/deep/.el-table__body-wrapper {
+		height: 92% !important;
+	}
+</style>
+<style lang="scss" scoped>
+	.main-box {
+		display: flex;
+	}
+
+	.doc-view {
+		margin-left: 10px;
+		width: 100%;
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.el-table__expanded-cell {
+		padding: 10px;
+	}
+
+	.demo-table-expand {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+		padding: 20px;
+		border-radius: 10px;
+	}
+
+	.demo-table-expand .el-form-item {
+		margin-bottom: 10px !important;
+		min-width: 20%;
+		max-width: 50%;
+	}
+
+	.demo-form-inline {
+		display: flex;
+		align-items: center;
+	}
+
+	.el-form--inline .el-form-item {
+		display: flex;
+		align-items: center;
+		margin-bottom: 0;
+	}
+
+	.aligin-center {
+		align-items: center;
+	}
+
+	.seetingsDiv {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: auto;
+		padding: 30px;
+		background: #efefef;
+		/* line-height: 60px; */
+		border-radius: 5px;
+		box-shadow: 0 0 5px #cdcdcd;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		margin-bottom: 20px;
+	}
+
+	.seetingsDiv button {
+		height: 40px;
+		background-color: #304156;
+		border: 0px;
+		margin-left: 10px;
+		box-shadow: 0 0 5px #cdcdcd;
+		float: none;
+		margin-right: 10px;
+		margin-top: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/user/rolelist.vue b/src/views/user/rolelist.vue
new file mode 100644
index 0000000..0a09980
--- /dev/null
+++ b/src/views/user/rolelist.vue
@@ -0,0 +1,418 @@
+<template>
+  <div class="app-container">
+    <div class="seetingsDiv" style="">
+      <el-button type="primary" @click="dialogClassIVIsible=true">添加
+      </el-button>
+    </div>
+    <el-table :data="userList" id="QuestionTable" border
+      style="width: 100%;border-radius: 5px;box-shadow: 0 0 10px #efefef;margin-top: 10px;" :stripe='true'>
+      <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.name }}</span>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column fixed="right" label="操作" width="150">
+        <template slot-scope="scope">
+          <el-dropdown @command="(e)=>{handleCommand(e,scope.row)}">
+            <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="del" v-if="scope.row.username!='admin'">删除</el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </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-dialog :title="title" :visible.sync="dialogClassIVIsible" @close="closeClassDialog" width="450"
+      :close-on-click-modal="false">
+      <el-form ref="adminUserInfo" :rules="rules" :model="adminUserInfo" label-width="90px" style="margin-left: 40px;">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="adminUserInfo.name " placeholder="名称" style="width: 40%;"></el-input>
+        </el-form-item>
+        <el-form-item label="角色人员">
+          <el-transfer v-model="value" filterable :titles="['待选人员', '已选人员']" :data="data"></el-transfer>
+        </el-form-item>
+        <el-form-item label="权限" style="margin-top: 40px;">
+          <el-tree ref="tree" :check-strictly="true" :data="data1" show-checkbox node-key="id" default-expand-all :props="defaultProps">
+          </el-tree>
+        </el-form-item>
+
+        <el-form-item style="text-align: right;">
+          <el-button @click="dialogClassIVIsible=false">取消</el-button>
+          <el-button type="primary" @click="submitForm('adminUserInfo')">{{buttonText}}</el-button>
+        </el-form-item>
+      </el-form>
+
+      <div style="clear: both;"></div>
+    </el-dialog>
+
+
+    <el-dialog title="修改密码" :visible.sync="dialogClassIVIsibleT" @close="closeClassDialogT" width="450"
+      :close-on-click-modal="false">
+      <el-form :model="ruleForm" status-icon :rules="rulesT" ref="ruleForm" label-width="100px" class="demo-ruleForm"
+        style="width: 320px;">
+        <el-form-item label="密码" prop="Password">
+          <el-input type="password" v-model="ruleForm.Password" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="确认密码" prop="checkPass">
+          <el-input type="password" v-model="ruleForm.checkPass" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" @click="submitFormT('ruleForm')">提交</el-button>
+          <el-button @click="resetForm('ruleForm')">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <div style="clear: both;"></div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    GetInfo,
+    GetUserList,
+    UsersCreate,
+    UsersUpdate,
+    UsersDelete,
+    GetMenue
+  } from '@/api/role'
+  import { GetUserListByAdminSimple } from '@/api/user'
+
+  import {
+    formatTime
+  } from '@/utils/util.js'
+  export default {
+    data() {
+      var checkPhone = (rule, value, callback) => {
+        const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
+        if (!value) {
+          return callback(new Error('电话号码不能为空'))
+        }
+        setTimeout(() => {
+          if (!Number.isInteger(+value)) {
+            callback(new Error('请输入数字值'))
+          } else {
+            if (phoneReg.test(value)) {
+              callback()
+            } else {
+              callback(new Error('电话号码格式不正确'))
+            }
+          }
+        }, 100)
+      }
+
+
+      var validatePass = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入密码'));
+        } else {
+          if (this.ruleForm.checkPass !== '') {
+            this.$refs.ruleForm.validateField('checkPass');
+          }
+          callback();
+        }
+      };
+      var validatePass2 = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请再次输入密码'));
+        } else if (value !== this.ruleForm.Password) {
+          callback(new Error('两次输入密码不一致!'));
+        } else {
+          callback();
+        }
+      };
+
+
+      return {
+        data1: [],
+        data: [],
+        value: [],
+
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+
+        title: '添加',
+        buttonText: '立即创建',
+        userList: [],
+        dialogClassIVIsible: false,
+        dialogClassIVIsibleT: false,
+        adminUserInfo: {
+          username: "",
+          password: "",
+          // type: 4,
+          fullName: "",
+          // remark: "",
+          phone: "",
+          // sex: "",
+          // card: "",
+          // address: "",
+          // birthday: "",
+          status: 1,
+        },
+
+        ruleForm: {
+          UserId: 0,
+          Password: '',
+          checkPass: '',
+        },
+        rulesT: {
+          Password: [
+            { validator: validatePass, trigger: 'blur' }
+          ],
+          checkPass: [
+            { validator: validatePass2, trigger: 'blur' }
+          ],
+        },
+        Count: 0,
+        query: {
+          UserTypeEnum: 5, //0：管理员，1普通用户
+          PageIndex: 1,
+          PageSize: 10,
+
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请输入管理员名称',
+            trigger: 'blur'
+          }],
+          phone: [{
+            required: true,
+            message: '请输入联系方式',
+            trigger: 'blur'
+          }],
+          username: [{
+            required: true,
+            message: '请输入登录账号',
+            trigger: 'blur'
+          }],
+          phone: [{
+            required: true,
+            trigger: 'blur',
+            validator: checkPhone
+          }],
+          password: [{
+            required: true,
+            message: '请输入密码',
+            trigger: 'blur'
+          }],
+          type: [{
+            required: true,
+            message: '请输选择用户类型',
+            trigger: 'blur'
+          }]
+        }
+      }
+    },
+    created() {
+      this.GetUser()
+      this.getadmin()
+      this.getmenue()
+    },
+    methods: {
+      getmenue() {
+        GetMenue().then(res => {
+          this.data1 = res.data || [];
+        });
+      },
+      getadmin() {
+        GetUserListByAdminSimple({ PageSize: 9999999, PageIndex: 1, Sort: [{ Field: 'id', Type: 0 }] }).then(res => {
+          var data = res.data || [];
+          data = data.map(o => {
+            return {
+              key: o.id,
+              label: o.fullName
+            }
+          });
+          this.data = data;
+        });
+
+      },
+      closeClassDialog() {
+        this.title = '添加'
+        this.buttonText = '立即创建'
+        this.GetUser();
+      },
+      submitForm(formName) {
+        var _this = this;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            _this.adminUserInfo.users = _this.value || [];
+            _this.adminUserInfo.menues = _this.$refs.tree.getCheckedKeys() || [];
+            if (_this.title == '添加') {
+              _this.adminUserInfo.addTime = formatTime(new Date(), 'yyyy-MM-dd HH:mm:ss')
+              UsersCreate(this.adminUserInfo).then(res => {
+                this.$notify({
+                  title: '成功',
+                  message: res.data.message,
+                  type: 'success'
+                });
+                // this.$confirm(res.data.message, '消息')
+                _this.dialogClassIVIsible = false
+              })
+            } else {
+              _this.adminUserInfo.updateTime = formatTime(new Date(), 'yyyy-MM-dd HH:mm:ss')
+              _this.adminUserInfo.status = 1
+              UsersUpdate(this.adminUserInfo).then(res => {
+                _this.$notify({
+                  title: '成功',
+                  message: res.data.message,
+                  type: 'success'
+                });
+                // this.$confirm(res.data.message, '消息')
+                _this.dialogClassIVIsible = false
+              })
+            }
+
+          } else {
+            return false;
+          }
+        });
+      },
+
+      GetUser() {
+        GetUserList(this.query).then(res => {
+          this.userList = res.data.data
+          this.Count = res.data.total
+        })
+      },
+      currentchange(page) {
+        this.query.PageIndex = page;
+        this.GetUser();
+      },
+      closeClassDialogT() {
+        this.dialogClassIVIsibleT = false
+      },
+
+
+      submitFormT(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            var postdata = Object.assign({}, this.ruleForm);
+            if (this.ruleForm.id) {
+              UsersUpdate(postdata).then(res => {
+                if (res.data.code == 200) {
+                  this.$notify({
+                    title: 'Success',
+                    message: res.data.message,
+                    type: 'success',
+                    duration: 1000
+                  })
+                  this.dialogClassIVIsibleT = false
+
+                }
+              })
+            }
+            else {
+              UsersCreate(postdata).then(res => {
+                if (res.data.code == 200) {
+                  this.$notify({
+                    title: 'Success',
+                    message: res.data.message,
+                    type: 'success',
+                    duration: 1000
+                  })
+                  this.dialogClassIVIsibleT = false
+
+                }
+              })
+            }
+
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
+      },
+      handleCommand(value, val) {
+        let that = this;
+        if (value == "update") {
+          GetInfo(val.id).then(res => {
+            that.dialogClassIVIsible = true;
+            that.$nextTick(function () {
+
+              that.adminUserInfo = res.data.data
+              if (res.data.data.users) {
+                that.value = res.data.data.users;
+              }
+              if (res.data.data.menues) {
+                that.$refs.tree.setCheckedKeys(res.data.data.menues);
+              }
+              that.title = '编辑信息'
+              that.buttonText = '保存'
+
+            });
+
+          });
+        }
+        if (value == 'updatePassword') {
+          that.ruleForm.UserId = val.id
+          ththatis.dialogClassIVIsibleT = true
+        }
+        if (value == "del") {
+          that.$confirm('确定删除该管理员？', '消息', {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            callback: (action) => {
+              if (action == "confirm") {
+                UsersDelete({
+                  ids: val.id
+                }).then(res => {
+                  if (res.data.code == 200) {
+                    that.$notify({
+                      title: '成功',
+                      message: res.data.message,
+                      type: 'success'
+                    });
+                    that.GetUser();
+                  }
+                });
+              }
+            },
+          })
+
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .seetingsDiv {
+    width: 100%;
+    height: 60px;
+    background: #efefef;
+    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: left;
+    margin-top: 12px;
+    margin-right: 10px;
+  }
+</style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 2f0ae23..018da97 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -47,8 +47,8 @@ module.exports = {
                 }
             },
             '/api': {
-                target: `http://inteview.t1j2.com/`, //后台服务地址
-                // target: 'http://localhost:8877',
+                // target: `http://inteview.t1j2.com/`, //后台服务地址
+                target: 'http://localhost:8877',
                 changeOrigin: true,
                 pathRewrite: {}
             }