diff --git a/src/api/user.js b/src/api/user.js
index 95a1050..537a5d2 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -165,10 +165,15 @@ export function UserInfo_List(params) {
         url: `/UserInfo/List`,
         method: 'get',
         params
-    })
-
+    }) 
+} 
 
- 
+export function GetTypeSetting(params={}) {
+    return request({
+        url: `/userType/GetTypeSetting`,
+        method: 'get',
+        params
+    }) 
 } 
 //设置标签
   export function ChangeTags(params) {
@@ -177,4 +182,22 @@ export function UserInfo_List(params) {
         method: 'post',
         params
     })
-}
\ No newline at end of file
+}
+
+
+//用户列表
+export function UserTypeSettings(params) {
+    return request({
+        url: `/userType/GetSettings`,
+        method: 'post',
+        params
+    })  
+} 
+
+export function saveTypeSetting(data) {
+    return request({
+        url: `/userType/saveTypeSetting`,
+        method: 'post',
+        data
+    })  
+} 
\ No newline at end of file
diff --git a/src/utils/routerList.js b/src/utils/routerList.js
index bcaba53..5c57165 100644
--- a/src/utils/routerList.js
+++ b/src/utils/routerList.js
@@ -165,33 +165,33 @@ export function getRoutes() {
 
             ]
         },
-        {
-            path: '/order',
-            component: Layout,
-            redirect: '/',
-            name: 'order',
-            meta: {
-                title: '订单管理',
-                icon: 'el-icon-s-marketing'
-            },
-            children: [{
-                path: 'recharge',
-                name: 'recharge',
-                component: () =>
-                    import('@/views/order/rechargeList'),
-                meta: {
-                    title: '充值记录',
-                }
-            }, {
-                path: 'shop',
-                name: 'shop',
-                component: () =>
-                    import('@/views/order/shopList'),
-                meta: {
-                    title: '购买记录',
-                }
-            }]
-        },
+        // {
+        //     path: '/order',
+        //     component: Layout,
+        //     redirect: '/',
+        //     name: 'order',
+        //     meta: {
+        //         title: '订单管理',
+        //         icon: 'el-icon-s-marketing'
+        //     },
+        //     children: [{
+        //         path: 'recharge',
+        //         name: 'recharge',
+        //         component: () =>
+        //             import('@/views/order/rechargeList'),
+        //         meta: {
+        //             title: '充值记录',
+        //         }
+        //     }, {
+        //         path: 'shop',
+        //         name: 'shop',
+        //         component: () =>
+        //             import('@/views/order/shopList'),
+        //         meta: {
+        //             title: '购买记录',
+        //         }
+        //     }]
+        // },
         {
             path: '/user',
             component: Layout,
@@ -230,6 +230,10 @@ export function getRoutes() {
                     title: '图片导入用户',
                 }
             },
+
+         
+
+            
             {
                 path: 'admin',
                 name: 'admin',
@@ -251,7 +255,18 @@ export function getRoutes() {
                 title: '系统管理',
                 icon: 'el-icon-s-platform'
             },
-            children: [{
+            children: [
+                {
+                    path: 'userdimset',
+                    name: 'impouserdimsetrtuser',
+    
+                    component: () =>
+                        import('@/views/user/userdimset'),
+                    meta: {
+                        title: '维度规则设置',
+                    }
+                },
+                {
                 path: 'index',
                 name: 'index',
                 component: () =>
@@ -422,33 +437,33 @@ export function getRoutes() {
 
             ]
         },
-        {
-            path: '/order',
-            component: Layout,
-            redirect: '/',
-            name: 'order',
-            meta: {
-                title: '订单管理',
-                icon: 'el-icon-s-marketing'
-            },
-            children: [{
-                path: 'recharge',
-                name: 'recharge',
-                component: () =>
-                    import('@/views/order/rechargeList'),
-                meta: {
-                    title: '充值记录',
-                }
-            }, {
-                path: 'shop',
-                name: 'shop',
-                component: () =>
-                    import('@/views/order/shopList'),
-                meta: {
-                    title: '购买记录',
-                }
-            }]
-        },
+        // {
+        //     path: '/order',
+        //     component: Layout,
+        //     redirect: '/',
+        //     name: 'order',
+        //     meta: {
+        //         title: '订单管理',
+        //         icon: 'el-icon-s-marketing'
+        //     },
+        //     children: [{
+        //         path: 'recharge',
+        //         name: 'recharge',
+        //         component: () =>
+        //             import('@/views/order/rechargeList'),
+        //         meta: {
+        //             title: '充值记录',
+        //         }
+        //     }, {
+        //         path: 'shop',
+        //         name: 'shop',
+        //         component: () =>
+        //             import('@/views/order/shopList'),
+        //         meta: {
+        //             title: '购买记录',
+        //         }
+        //     }]
+        // },
         {
             path: '/user',
             component: Layout,
diff --git a/src/views/TestPaper/ManualTestPaper.vue b/src/views/TestPaper/ManualTestPaper.vue
index 65ce745..210e828 100644
--- a/src/views/TestPaper/ManualTestPaper.vue
+++ b/src/views/TestPaper/ManualTestPaper.vue
@@ -18,7 +18,7 @@
           <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>
@@ -69,17 +69,24 @@
               {{TestPaper.TotalScore || ''}}
             </el-form-item>
 
-
-            <el-form-item label="分类" class="el-form-item-custom">
+            <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:400px;margin-bottom: 20px;" :props="{emitPath:false}" :clearable=true
+                style="width:100%;margin-bottom: 20px;" :props="{emitPath:false}" :clearable=true
                 :options="QuestionClass">
               </el-cascader>
             </el-form-item>
 
+
+
             <el-form-item label="有效时间" required>
-              <el-form-item prop="date1">
-                <el-date-picker v-model="TestPaper.date" @change="changetimestartend" type="datetimerange"
+              <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>
@@ -120,19 +127,19 @@
     </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
-          style="flex:1"
-          v-model="item.QuestionClassId"
-          :options="randomQuestionTypeList"
-          clearable></el-cascader>
+          <el-cascader :multiple="false" style="flex:1" v-model="item.QuestionClassId" :options="randomQuestionTypeList"
+            clearable></el-cascader>
           <span style="margin-left:10px;">试题数量：</span>
-          <el-input-number v-model="item.Count" :min="1" :max="100" 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>
+          <el-input-number v-model="item.Count" :min="1" :max="100" 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>
@@ -145,148 +152,171 @@
   </div>
 </template>
 <style lang="scss" scoped>
-.random-list {
-  display: flex;
-  flex-direction: column;
-  li {
-    margin-bottom: 20px;
+  .random-list {
     display: flex;
-    align-items: center;
-    [class^="el-icon"] {
-      font-size: 24px;
-      cursor: pointer;
+    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 { GetQuestionClassByType } from "@/api/QuestionClass";
-import { EditTestPaper, GetToplevel } from "@/api/TestPaper";
-import { formatTime } from "@/utils/util";
-export default {
-  //注册draggable组件
-  components: {
-    draggable,
-  },
-  data() {
-    return {
-      randomSubjectList: [
-        {
-          QuestionClassId: "",
-          Count: "",
-        },
-        {
-          QuestionClassId: "",
-          Count: "",
-        },
-      ],
-      randomQuestionTypeList: [],
-      dynamicValidateForm: {
-        domains: [
+  import draggable from "vuedraggable";
+  import { PostRandomGetQuestion, getQuestionList, getQuestionClassList } from "@/api/QuestionBank";
+  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: [
           {
-            value: "",
+            QuestionClassId: "",
+            Count: "",
           },
-        ],
-        email: "",
-      },
-      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,
-        OriginalPrice: "0",
-        PresentPrice: "0",
-        MembershipPrice: "0",
-        QuestionBankIds: [],
-      },
-      loading: false,
-      rules: {
-        OriginalPrice: [
           {
-            required: true,
-            message: "不能为空",
+            QuestionClassId: "",
+            Count: "",
           },
         ],
-        PresentPrice: [
-          {
-            required: true,
-            message: "不能为空",
-          },
-        ],
-        MembershipPrice: [
+        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,
+          OriginalPrice: "0",
+          PresentPrice: "0",
+          MembershipPrice: "0",
+          QuestionBankIds: [],
+        },
+        loading: false,
+        rules: {
+          OriginalPrice: [
+            {
+              required: true,
+              message: "不能为空",
+            },
+          ],
+          PresentPrice: [
+            {
+              required: true,
+              message: "不能为空",
+            },
+          ],
+          UserTypeOfWork: [
+            {
+              required: true,
+              message: "请选择工种",
+            },
+          ], QuestionClassId: [
+            {
+              required: true,
+              message: "请选择分类", 
+            },
+          ],date: [
+            {
+              required: true,
+              message: "请选择时间段", 
+            },
+          ],
+        },
+        QuestionClass: [],
+        treeData: [
           {
-            required: true,
-            message: "不能为空",
+            value: 0,
+            label: "全部",
           },
         ],
+        timeout: 0,
+      };
+    },
+    watch: {
+      activeTab() {
+        console.log("activeTab watch");
+        this.search();
       },
-      QuestionClass: [],
-      treeData: [
-        {
-          value: 0,
-          label: "全部",
+      "parameter.keyWord": {
+        handler() {
+          clearTimeout(this.timeout);
+          this.timeout = setTimeout(() => {
+            this.search();
+          }, 200);
         },
-      ],
-      timeout: 0,
-    };
-  },
-  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;
       },
     },
-  },
-  computed: {
-    noMore() {
-      return this.arr1.length >= this.count;
+    created() {
+      this.getQuestionClassListHeadler();
+      this.getQuestionClassListHeadler2();
+
+
+      GetTypeSetting({}).then(res => {
+        if (res.data) {
+          this.usertypelist = res.data || [];
+        }
+      });
     },
-    disabled() {
-      return this.loading || this.noMore;
+    mounted() {
+      //计算页面内容区域的高度
+      this.contentHeight = window.innerHeight - 90;
+      //this.GetList();
     },
-  },
-  created() {
-    this.getQuestionClassListHeadler();
-    this.getQuestionClassListHeadler2();
-  },
-  mounted() {
-    //计算页面内容区域的高度
-    this.contentHeight = window.innerHeight - 90;
-    //this.GetList();
-  },
-  methods: {
-    getSubTree(id, list) {
+    methods: {
+      getSubTree(id, list) {
         let result = [];
         result = list.filter((t) => t.ParentId == id);
         if (result.length) {
@@ -294,7 +324,7 @@ export default {
             item.value = item.id;
             item.label = item.ClassificationName;
             item.children = this.getSubTree(item.id, list);
-            if(!item.children || !item.children.length){
+            if (!item.children || !item.children.length) {
               delete item.children;
             }
             return item;
@@ -306,12 +336,12 @@ export default {
         let _this = this;
         getQuestionClassList().then((res) => {
           let alllist = res.data.data;
-          let list  = alllist.filter(t=>!t.ParentId);
+          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){
+            t.children = this.getSubTree(t.id, alllist);
+            if (!t.children || !t.children.length) {
               delete t.children;
             }
             return t;
@@ -319,345 +349,359 @@ export default {
           this.randomQuestionTypeList = list;
         });
       },
-    randomCancel() {
-      this.dialogTableVisible = false;
-    },
-    randomSubmit() {
-      let list = 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;
+      randomCancel() {
         this.dialogTableVisible = false;
-        if(!list.length){
-          this.$message.warning('所选分类没有试题');
+      },
+      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;
         }
-      });
-    },
-    changeSubjectCount(type, index) {
-      if (type > 0) {
-        this.randomSubjectList.push({
-          QuestionClassId: "",
-          Count: "",
+
+        list = list.map(t => {
+          t.QuestionClassId = t.QuestionClassId.pop();
+          return t;
         });
-      } else {
-        this.randomSubjectList.splice(index, 1);
-      }
-    },
-    randomSubject() {
-      this.dialogTableVisible = true;
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          alert("submit!");
+        PostRandomGetQuestion(list).then((res) => {
+          let list = res.data.data;
+          this.arr2 = list;
+          this.dialogTableVisible = false;
+          if (!list.length) {
+            this.$message.warning('所选分类没有试题');
+          }
+        });
+      },
+      changeSubjectCount(type, index) {
+        if (type > 0) {
+          this.randomSubjectList.push({
+            QuestionClassId: "",
+            Count: "",
+          });
         } else {
-          console.log("error submit!!");
-          return false;
+          this.randomSubjectList.splice(index, 1);
         }
-      });
-    },
-    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.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.$confirm("组卷成功！", "消息");
+      },
+      randomSubject() {
+        this.dialogTableVisible = true;
+      },
+      submitForm(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            alert("submit!");
           } else {
-            this.$confirm("组卷失败！", "消息");
+            console.log("error submit!!");
+            return false;
           }
         });
-      } else {
-        this.$confirm("试题没有题目！", "消息");
-      }
-    },
-    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.type = "wd";
-              rs.subjectContent = "[]";
-              return rs;
-            });
-            this.loadingType = true;
-          });
-      } else {
-        getQuestionList(this.parameter).then((res) => {
-          if (this.parameter.pageIndex == 1) {
-            this.arr1 = [];
+      },
+      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 (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.$confirm("组卷成功！", "消息");
+                } else {
+                  this.$confirm("组卷失败！", "消息");
+                }
+              });
+            } else {
+              this.$confirm("试题没有题目！", "消息");
+            }
+          } else {
+
+            return false;
           }
-          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;
-      }
-      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;
-      }
-      this.TestPaper.TotalScore += e.item._underlying_vm_.fraction;
-
-      this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
-
-      if (d.type == "wd") {
-        getQuestionList({
-          QuestionClassId: d.id,
-          PageIndex: 1,
-          PageSize: 1000,
-        }).then((res) => {
-          var data = res.data.data.rows || [];
-          this.arr2 = this.arr2.filter((o) => o.type != "wd");
-          // this.arr1.splice(this.arr1.findIndex(o=>o.id == d.id),1)
-          this.classarr.push(d.id);
-          // var  test = this.arr2;
-          this.arr2.push(...data);
-          data.forEach((rs) => {
-            if (rs.subjectType == 1) {
-              this.TestPaper.SingleNumber += 1;
-            }
-            if (rs.subjectType == 2) {
-              this.TestPaper.MultipleNumber += 1;
-            }
-            if (rs.subjectType == 3) {
-              this.TestPaper.SubjectiveNumber += 1;
+      },
+      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.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;
         });
-      }
-    },
-    //右边往左边拖动时的事件
-    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;
+
+        //如果左边
+        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;
+        }
+        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;
+        }
+        this.TestPaper.TotalScore += e.item._underlying_vm_.fraction;
+
+        this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
+
+        if (d.type == "wd") {
+          getQuestionList({
+            QuestionClassId: d.id,
+            PageIndex: 1,
+            PageSize: 1000,
+          }).then((res) => {
+            var data = res.data.data.rows || [];
+            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;
+              }
+            });
+          });
+        }
+      },
+      //右边往左边拖动时的事件
+      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 == titem.value)
+            .filter((u) => u.ParentId == 0)
             .forEach((item, i) => {
               var model = {
                 value: item.id,
                 label: item.ClassTitle,
               };
               gettree(model);
-              titem.children.push(model);
+              _this.QuestionClass.push(model);
+              _this.treeData.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-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;
+
+  .el-col {
+    border-radius: 4px;
+  }
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    background: #efefef;
   }
 
-  //滚动条小方块
-  &::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: #304156;
+  .bg-purple-light {
+    background: #e5e9f2;
   }
 
-  //滚动条轨道
-  &::-webkit-scrollbar-track {
-    // border-radius: 10px;
-    height: 100px;
-    background: #cdcdcd;
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+    height: 100%;
   }
 
-  .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;
+  .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;
-}
+
+  .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/TestPaperList.vue b/src/views/TestPaper/TestPaperList.vue
index 3afb957..1803eca 100644
--- a/src/views/TestPaper/TestPaperList.vue
+++ b/src/views/TestPaper/TestPaperList.vue
@@ -100,6 +100,15 @@
               <el-option label="面试题" value="4"></el-option>
             </el-select>
           </el-form-item>
+
+
+          <el-form-item label="工种" class="el-form-item-custom">
+            <el-select v-model="TestPaper.UserTypeOfWork" placeholder="请选择工种">
+              <el-option v-for="item in usertypelist" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+
+
           <el-form-item label="有效时间" required>
             <el-form-item prop="date1">
               <el-date-picker v-model="TestPaper.date" @change="changetimestartend" type="datetimerange"
@@ -155,6 +164,9 @@
     getTestPaperClassList,
     DeleteTestPaper
   } from '@/api/TestPaper'
+
+  import {  GetTypeSetting
+  } from '@/api/user'
   import { formatTime } from '@/utils/util'
   let that
   export default {
@@ -174,6 +186,7 @@
         dialogAddTestPaperVIsible: false,
         dialogQuestionVlsible: false,
         QuestionClass: [],
+        usertypelist:[],
         TestPaper: {
           TestPaperTitle: "",
           PlateClass: 4,
@@ -209,6 +222,12 @@
       getTestPaperClassList(parameter).then(res => {
         this.list = res.data.data;
       });
+
+      GetTypeSetting({}).then(res=>{
+        if(res.data){
+          this.usertypelist = res.data || [];
+        }
+      });
     },
     filters: {
       typeFilters(val) {
diff --git a/src/views/live/index.vue b/src/views/live/index.vue
index e41e60c..43c0c21 100644
--- a/src/views/live/index.vue
+++ b/src/views/live/index.vue
@@ -1,51 +1,55 @@
 <template>
   <div class="container">
-      <div id="id_test_video" style="width:100%; height:auto;"></div>
+    <div id="id_test_video" style="width:100%; height:auto;"></div>
   </div>
 </template>
 <script>
-export default {
-  data() {
-    return {
-      streaName:''
-    };
-  },
-  created(){
-    let streaName = this.$route.query.id;
-    this.streaName = streaName;
-  },
-  mounted() {
-    var player = new TcPlayer("id_test_video", {
-      m3u8: `http://watch.t1j2.com/live/${this.streaName}.m3u8`,
-      flv: `http://watch.t1j2.com/live/${this.streaName}.flv`, //增加了一个 flv 的播放地址，用于PC平台的播放 请替换成实际可用的播放地址
-      autoplay: true, //iOS 下 safari 浏览器，以及大部分移动端浏览器是不开放视频自动播放这个能力的
-      poster: "",
-      width: "1200", //视频的显示宽度，请尽量使用视频分辨率宽度
-      height: "800", //视频的显示高度，请尽量使用视频分辨率高度
-    });
-  },
-  methods: {},
-};
+  export default {
+    data() {
+      return {
+        streaName: ''
+      };
+    },
+    created() {
+      let streaName = this.$route.query.id;
+      this.streaName = streaName;
+    },
+    mounted() {
+      this.$nextTick(function () {
+        var player = new TcPlayer("id_test_video", {
+          m3u8: `http://watch.t1j2.com/live/${this.streaName}.m3u8`,
+          flv: `http://watch.t1j2.com/live/${this.streaName}.flv`, //增加了一个 flv 的播放地址，用于PC平台的播放 请替换成实际可用的播放地址
+          autoplay: true, //iOS 下 safari 浏览器，以及大部分移动端浏览器是不开放视频自动播放这个能力的
+          poster: "",
+          width: "1200", //视频的显示宽度，请尽量使用视频分辨率宽度
+          height: "800", //视频的显示高度，请尽量使用视频分辨率高度
+        });
+      });
+
+    },
+    methods: {},
+  };
 </script>
 <style lang="scss" scoped>
-.container{
+  .container {
     display: flex;
     justify-content: center;
     align-items: center;
     height: calc(100vh - 50px);
     background-color: #000;
-}
-#id_test_video{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
+  }
+
+  #id_test_video {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 </style>
 <style scoped>
->>>.vcp-player{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin: 0;
-}
+  >>>.vcp-player {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 0;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index eeab3d8..f378c39 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -88,6 +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')
 				},
 				immediate: true
 			}
diff --git a/src/views/user/InterviewSchedule.vue b/src/views/user/InterviewSchedule.vue
index 997277c..8efc55c 100644
--- a/src/views/user/InterviewSchedule.vue
+++ b/src/views/user/InterviewSchedule.vue
@@ -41,6 +41,16 @@
       </div>
 
     </div>
+    <div              > 
+      <el-calendar v-model="query.date">
+        <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
+        <template slot="dateCell" slot-scope="{date, data}">
+          <p :class="data.isSelected ? 'is-selected' : ''" v-html="getContent(data,date)">
+    
+          </p>
+        </template>
+      </el-calendar>
+    </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>
@@ -56,8 +66,8 @@
       <el-table-column prop="date" label="姓名">
         <template slot-scope="scope">
           <span>{{ scope.row.fullName }}</span>
-          <el-tag v-for="item in scope.row.taglist" size="mini" style="margin-right:5px"  
-                  :disable-transitions="false"  >{{item}}</el-tag>
+          <el-tag v-for="item in scope.row.taglist" size="mini" style="margin-right:5px" :disable-transitions="false">
+            {{item}}</el-tag>
 
         </template>
       </el-table-column>
@@ -149,6 +159,7 @@
         }
       };
       return {
+
         title: '添加管理员',
         buttonText: '立即创建',
         userList: [],
@@ -173,18 +184,92 @@
           Password: '',
           checkPass: '',
         },
+        accountlist:[],
         Count: 0,
         query: {
           PageIndex: 1,
           PageSize: 1000,
-
+          date: '',
+          month:0,
+          day:1
         },
       }
     },
     created() {
-      this.GetUser()
+      this.GetUser();
+
+      this.$nextTick(() => {
+        // 点击前一个月
+        let prevBtn = document.querySelector(
+          ".el-calendar__button-group .el-button-group>button:nth-child(1)"
+        );
+        prevBtn.addEventListener("click", e => {
+          console.log(this.query.date);
+          this.handlemonth(1);
+        });
+
+        //点击下一个月
+        let nextBtn = document.querySelector(
+          ".el-calendar__button-group .el-button-group>button:nth-child(3)"
+        );
+        nextBtn.addEventListener("click", () => {
+          console.log(this.query.date);
+          this.handlemonth(-1);
+        });
+
+        //点击今天
+        let todayBtn = document.querySelector(
+          ".el-calendar__button-group .el-button-group>button:nth-child(2)"
+        );
+        todayBtn.addEventListener("click", () => {
+          this.handlemonth(0);
+        });
+      }); 
     },
     methods: {
+      getContent(data,date){
+        // {{ data.day.split('-').slice(1).join('-') }} {{ data.isSelected ? '✔️' : ''}}
+        var html = [];
+        html.push( data.day.split('-').slice(1).join('-'));
+        try {
+          var d = this.accountlist.filter(o=>o.startTime == data.day);
+          if(d){
+           d.forEach((item)=>{
+             html.push(`<el-tag type="success" style="    background-color: #ecf5ff;
+    display: inline-block;
+    height: 32px;
+    padding: 0 10px;
+    line-height: 30px;
+    font-size: 12px;
+    color: #409eff;
+    border: 1px solid #d9ecff;
+    border-radius: 4px;
+    box-sizing: border-box;
+    white-space: nowrap;">${item.qujian+':'+item.count}</el-tag>`);
+           });
+          }
+        } catch (error) {
+          
+        }
+        return html.join(' &nbsp;');
+      },
+      handlemonth(val) {
+        switch (val) {
+          case -1:
+           this.query.day=0;
+           this.query.month--;  
+          break;
+          case 0:
+           this.query.month = 0;
+           this.query.day =1;  
+          break;
+          case 1: 
+          this.query.month++;
+           this.query.day =0;
+          break;
+        }
+        this.GetUser();
+      },
       search() {
         this.GetUser();
       },
@@ -229,7 +314,8 @@
 
       GetUser() {
         GetCompanyInvitation(this.query).then(res => {
-          this.userList = res.data.data
+          this.userList = res.data.data.list || [];
+          this.accountlist = res.data.data.account || []
           this.Count = res.data.records
         })
       },
diff --git a/src/views/user/picuserimport.vue b/src/views/user/picuserimport.vue
index 811e5f4..13c54f6 100644
--- a/src/views/user/picuserimport.vue
+++ b/src/views/user/picuserimport.vue
@@ -96,7 +96,7 @@
             >
             </el-input>
             <span v-if="!scope.row.edit"
-              >{{ scope.row[item.prop] }}{{ scope.row.edit }}</span
+              >{{ scope.row[item.prop] }}</span
             >
           </template>
         </el-table-column>
@@ -298,6 +298,7 @@ export default {
       this.multipleSelection = val;
       console.log("selection:", this.multipleSelection);
     },
+
     //编辑
     handleEdit(index, row) {
       if (row.ViewPath) {
@@ -305,13 +306,21 @@ export default {
       }else{
         this.currentFilePath = '';
       }
-      this.table_data = this.table_data.map(t=>{
-        delete t.edit;
-        return t;
-      })
-      this.table_data[index].edit = true;
-      this.table_data.push(this.table_data.pop());
-      this.$forceUpdate();
+      // debugger;
+      // if(this.table_data)
+      // this.table_data = this.table_data.map(t=>{
+      //   t.edit = false;
+      //   return t;
+      // })
+      this.table_data.forEach((o,i)=>{
+        this.$set(this.table_data[i],'edit',i==index)
+      });
+      // this.table_data = Object.assign({},this.table_data);
+      // this.table_data[index].edit = true;
+      // this.table_data.push(this.table_data.pop());
+      // this.$forceUpdate();
+
+      // this.$set(this.table_data[index],'edit',true)
     },
     //删除
     handleDelete(index, row) {
@@ -423,7 +432,13 @@ export default {
   },
 };
 </script>
+<style scoped>
+ /deep/.el-table__body-wrapper{
+    height:92% !important;
+  }
+</style>
 <style lang="scss" scoped>
+
 .main-box{
   display: flex;
 }
diff --git a/src/views/user/userdimset copy.vue b/src/views/user/userdimset copy.vue
new file mode 100644
index 0000000..6a1bded
--- /dev/null
+++ b/src/views/user/userdimset copy.vue
@@ -0,0 +1,384 @@
+<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="query.keyword"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="最高学历">
+            <el-select v-model="query.xueli" placeholder="最高学历">
+              <el-option label="大专" value="dazhuan"></el-option>
+              <el-option label="本科" value="benke"></el-option>
+              <el-option label="博士" value="boshi"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="性别">
+            <el-select v-model="query.sex" placeholder="性别">
+              <el-option label="男" value="1"></el-option>
+              <el-option label="女" value="0"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="flex align-center" style="margin-top: 10px">
+        <el-button type="success" @click="search">搜索</el-button>
+        <el-button size="mini" @click="handleshare()" type="primary"
+          >批量入库</el-button
+        >
+        <el-button size="mini" @click="handleAdd()" type="primary"
+          >新增一行</el-button
+        >
+        <el-upload
+          class="upload-demo"
+          ref="uploader"
+          action="/api//UserInfo/ResumeIdentification"
+          multiple
+          :headers="{
+            Authorization: Authorization,
+          }"
+          :limit="100"
+          :show-file-list="false"
+          :on-exceed="handleExceed"
+          :on-success="handleSuccess"
+        >
+          <el-button size="small" type="primary">上传简历</el-button>
+        </el-upload>
+      </div>
+    </div>
+    <div class="main-box">
+   
+   <table class="el-table__body">
+     <thead class="has-gutter">
+         <th>
+       <td>111</td>
+       <td>大师傅</td>
+       <td>的的的</td>
+     </th>
+     </thead>
+   
+     <tr>
+       <td>test禄口街道杀戮空间</td>
+       <td>test禄口街道杀戮空间</td>
+       <td>test禄口街道杀戮空间</td>
+     </tr>
+   </table>
+    </div>
+    <!-- <div class="page-box">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="queryResult.totalCount"
+      >
+      </el-pagination>
+    </div> -->
+  </div>
+</template>
+
+<script>
+import {
+  UserInfo_BatchToUser,
+  UserInfo_Delete,
+  UserInfo_Update,
+  UserInfo_List,
+} from "@/api/user";
+export default {
+  data() {
+    return {
+      currentFilePath: "",
+      queryResult: {},
+      queryModel: {
+        pageIndex: 1,
+        pageSize: 10,
+      },
+      query: {},
+      new_date_json: {}, //数据结构
+      multipleSelection: [], //复选框，数据
+      is_edit: true, //是否可编辑
+      is_delete: true, //是否可删除
+      selection: true, //是否需要复选框
+      radio: false, //单选变色
+      space_color: true, //隔行变色
+      //表头信息
+      table_columns: [
+        {
+          prop: "FullName",
+          label: "技术",
+          width: "150",
+        },
+        {
+          prop: "PhoneNumber",
+          label: "手机号",
+          width: "150",
+        },
+        {
+          prop: "DateBirth",
+          label: "出生日期",
+          width: "180",
+        },
+        {
+          prop: "Gender",
+          label: "性别",
+          width: "80",
+        },
+        {
+          prop: "GraduationSchool",
+          label: "毕业学校",
+          width: "200",
+        },
+        {
+          prop: "GraduationMajor",
+          label: "专业",
+          width: "200",
+        },
+        {
+          prop: "Education",
+          label: "最高学历",
+          width: "",
+        },
+        {
+          prop: "IntendedCity",
+          label: "城市",
+          width: "150",
+        },
+      ],
+      //表格数据
+      table_data: [],
+    };
+  },
+  methods: {
+    handleExceed() {},
+    handleSuccess(res) {
+      this.$refs.uploader.clearFiles();
+      this.search();
+    },
+    search() {
+      this.queryModel.pageIndex = 1;
+      this.getList();
+    },
+    getList() {
+      table_data = [];
+      // UserInfo_List(this.queryModel).then((res) => {
+      //   this.queryResult = res.data;
+      //   if (res.data.data && res.data.data.length) {
+      //     res.data.data = res.data.data.map((t) => {
+      //       t.DataJsonObj = JSON.parse(t.DataJson);
+      //       return t;
+      //     });
+      //   }
+      //   this.table_data = res.data.data;
+      // });
+    },
+    //隔行变色
+    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);
+    },
+    //编辑
+    handleEdit(index, row) {
+     var model ;
+      this.table_data = this.table_data.map(t=>{
+        delete t.edit;
+        return t;
+      })  
+      this.$set(this.table_data[index],'edit',true)
+      
+
+    },
+    //删除
+    handleDelete(index, row) {
+      console.log(index, row);
+
+      this.table_data.splice(index, 1);
+      // UserInfo_Delete(row.id);
+      // this.$message({
+      //   message: "删除成功！",
+      //   type: "success",
+      // });
+    },
+
+    handleshare(index, row) {
+      if (!row) {
+        this.table_data = [];
+      } else {
+        console.log(index, row);
+        this.table_data.splice(index, 1);
+      }
+      UserInfo_BatchToUser(row.id);
+      this.$message({
+        message: "入库成功！",
+        type: "success",
+      });
+    },
+
+    //保存
+    handleSave(index, row) {
+      delete this.table_data[index].edit;
+      let formData = { ...row };
+      delete formData.DataJsonObj;
+      UserInfo_Update(row);
+      this.table_data.push(this.table_data.pop());
+      this.$forceUpdate();
+      this.$message({
+        message: "保存成功！",
+        type: "success",
+      });
+    },
+    handleCancelSave(index, row){
+      delete this.table_data[index].edit;
+      if(this.currentFilePath == row.ViewPath){
+        this.currentFilePath = '';
+      }
+      this.table_data.push(this.table_data.pop());
+    },
+    handleAdd() {
+      var addDataJson = {};
+      for (var key in this.new_date_json) {
+        if (key === "edit") {
+          delete addDataJson[key];
+        } else if (key === "add") {
+          delete addDataJson[key];
+        } else {
+          addDataJson[key] = "";
+        }
+      }
+      addDataJson.edit = true;
+      addDataJson.add = true;
+      this.table_data.push(addDataJson);
+    },
+    //初始化编辑属性
+    initEditAttribute() {
+      var self = this;
+      var edit = self.edit;
+    },
+    initAddDataJson(dataArray) {
+      //新增时，初始化数据结构
+      var dataJson = dataArray;
+      var newDateJson = {};
+      for (var key in dataJson) {
+        if (key === "edit") {
+          newDateJson[key] = "true";
+        } else {
+          newDateJson[key] = "";
+        }
+      }
+      newDateJson["add"] = true;
+      this.new_date_json = newDateJson;
+    },
+  },
+  created() {
+    this.getList();
+  },
+  mounted: function () {
+    this.initEditAttribute();
+    //确保方法在页面渲染后调用
+    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 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/userdimset.vue b/src/views/user/userdimset.vue
new file mode 100644
index 0000000..af91997
--- /dev/null
+++ b/src/views/user/userdimset.vue
@@ -0,0 +1,532 @@
+<template>
+  <div style="padding: 10px">
+    <div class="seetingsDiv" style="">
+      <div class="flex" style="margin-top: 10px">
+        <el-alert title="分别设置各种岗位分值区间   具体标签自动生成 规则：当某种性格/能力标签 大于 或小于分值区间标签自动贴上！ 如：感性 感性高  感性低" type="success"
+          :closable="false">
+        </el-alert> 
+      </div>
+      <div class="flex align-center" style="margin-top: 10px">
+        <el-button type="success" @click="saveSetting">保存</el-button>
+      </div>
+    </div>
+    <div class="main-box" style="padding:100px">
+
+      <el-table ref="mytable" :data="table_data" style="width: 100%;display:block" border>
+        <el-table-column width="155" label="性格" prop="title" align="center">
+          <template slot-scope="{row}">
+
+            <el-input size="small" v-model="row.title" placeholder="请输入标题">
+            </el-input>
+
+          </template>
+        </el-table-column>
+        <el-table-column align="center" v-for="(item, index, key) in table_columns" :item="item" :key="key"
+          :index="index" :label="item">
+          <template slot-scope="{row}">
+            <el-col :span="11">
+              <el-input size="small" v-model="row[item].start" placeholder="请输入开始分值">
+              </el-input>
+            </el-col>
+            <el-col class="line" :span="2">-</el-col>
+            <el-col :span="11">
+              <el-input size="small" v-model="row[item].end" placeholder="请输入结束分值">
+              </el-input>
+            </el-col>
+            <!-- <el-input  
+            size="small"
+            v-model="row[item].start"
+            placeholder="请输入开始分值"
+          >
+          </el-input> 
+  -     <el-input  
+  size="small"
+  v-model="row[item].end"
+  placeholder="请输入结束分值"
+>
+</el-input>  -->
+            <!-- <el-input   v-if="scope.row[item]"
+          size="small"
+          v-model="scope.row[item].end"
+          :placeholder="'请输入结束分值"
+        >
+        </el-input> -->
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="操作" align="center" width="300" >
+          <template slot-scope="scope"> 
+            <el-button
+              size="mini" 
+              :plain="true"
+              type="danger"
+              style="margin-left: 10px"
+              @click="handleDelete(scope.$index, scope.row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column> -->
+      </el-table>
+
+      <el-table ref="mytable_gdf" :data="table_gdfdata" style="width: 100%;display:block" :show-header="false" border>
+        <el-table-column width="155" label="能力" prop="title" align="center">
+          <template slot-scope="{row}">
+
+            <el-input size="small" v-model="row.title" placeholder="请输入标题">
+            </el-input>
+
+          </template>
+        </el-table-column>
+        <el-table-column align="center" v-for="(item, index, key) in table_columns" :item="item" :key="key"
+          :index="index" :label="item">
+          <template slot-scope="{row}">
+            <el-input size="small" v-model="row[item].start" placeholder="请输入值">
+            </el-input>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="操作" align="center" width="300" >
+          <template slot-scope="scope"> 
+            <el-button
+              size="mini" 
+              :plain="true"
+              type="danger"
+              style="margin-left: 10px"
+              @click="handleDelete(scope.$index, scope.row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column> -->
+      </el-table>
+
+
+
+      <el-table ref="mytable1" :data="table_nldata" style="width: 100%;display:block;margin-top:20px;" border>
+        <el-table-column width="155" label="能力" prop="title" align="center">
+          <template slot-scope="{row}">
+
+            <el-input size="small" v-model="row.title" placeholder="请输入标题">
+            </el-input>
+
+          </template>
+        </el-table-column>
+        <el-table-column align="center" :label="'能力分值规则'">
+          <template slot-scope="{row}">
+
+
+            <el-col :span="11">
+              <el-input size="small" v-model="row.scoreStart" placeholder="请输入开始分值">
+              </el-input>
+            </el-col>
+            <el-col class="line" :span="2">-</el-col>
+            <el-col :span="11">
+              <el-input size="small" v-model="row.scoreEnd" placeholder="请输入结束分值">
+              </el-input>
+            </el-col>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <el-table ref="mytable2" :data="table_stardata" style="width: 100%;display:block" border>
+        <el-table-column width="155" label="星级" prop="title" align="center">
+          <template slot-scope="{row}">
+
+            <el-input size="small" v-model="row.title" placeholder="请输入标题">
+            </el-input>
+
+          </template>
+        </el-table-column>
+        <el-table-column align="center" v-for="(item, index, key) in table_columns" :item="item" :key="key"
+          :index="index" :label="item">
+          <template slot-scope="{row}">
+            <el-col :span="11">
+              <el-input size="small" v-model="row[item].start" placeholder="请输入开始分值">
+              </el-input>
+            </el-col>
+            <el-col class="line" :span="2">-</el-col>
+            <el-col :span="11">
+              <el-input size="small" v-model="row[item].end" placeholder="请输入结束分值">
+              </el-input>
+            </el-col>
+            <!-- <el-input  
+            size="small"
+            v-model="row[item].start"
+            placeholder="请输入开始分值"
+          >
+          </el-input> 
+  -     <el-input  
+  size="small"
+  v-model="row[item].end"
+  placeholder="请输入结束分值"
+>
+</el-input>  -->
+            <!-- <el-input   v-if="scope.row[item]"
+          size="small"
+          v-model="scope.row[item].end"
+          :placeholder="'请输入结束分值"
+        >
+        </el-input> -->
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="操作" align="center" width="300" >
+          <template slot-scope="scope"> 
+            <el-button
+              size="mini" 
+              :plain="true"
+              type="danger"
+              style="margin-left: 10px"
+              @click="handleDelete(scope.$index, scope.row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column> -->
+      </el-table>
+
+
+    </div>
+
+  </div>
+  </div>
+</template>
+
+<script>
+  import {
+    UserInfo_BatchToUser,
+    UserInfo_Delete,
+    UserInfo_Update,
+    UserInfo_List,
+    UserTypeSettings,
+    saveTypeSetting
+  } from "@/api/user";
+  export default {
+    data() {
+      return {
+        currentFilePath: "",
+        queryResult: {},
+        queryModel: {
+          pageIndex: 1,
+          pageSize: 10,
+        },
+
+        query: {},
+        new_date_json: {}, //数据结构
+        multipleSelection: [], //复选框，数据
+        is_edit: true, //是否可编辑
+        is_delete: true, //是否可删除
+        selection: true, //是否需要复选框
+        radio: false, //单选变色
+        space_color: true, //隔行变色
+
+        //表头信息
+        table_columns: [
+          // {
+          //   prop: "",
+          //   label: "",
+          //   width: "150",
+          // },
+          // {
+          //   prop: "PhoneNumber",
+          //   label: "手机号",
+          //   width: "150",
+          // },
+          // {
+          //   prop: "DateBirth",
+          //   label: "出生日期",
+          //   width: "180",
+          // },
+          // {
+          //   prop: "Gender",
+          //   label: "性别",
+          //   width: "80",
+          // },
+          // {
+          //   prop: "GraduationSchool",
+          //   label: "毕业学校",
+          //   width: "200",
+          // },
+          // {
+          //   prop: "GraduationMajor",
+          //   label: "专业",
+          //   width: "200",
+          // },
+          // {
+          //   prop: "Education",
+          //   label: "最高学历",
+          //   width: "",
+          // },
+          // {
+          //   prop: "IntendedCity",
+          //   label: "城市",
+          //   width: "150",
+          // },
+        ],
+        //表格数据
+        table_data: [], //性格
+        table_nldata: [], //能力 规则
+        table_stardata: [], //星级分值规则
+        table_gdfdata: [] //高低分
+      };
+    },
+    methods: {
+      saveSetting() {
+        var saveForm = {
+          xg: this.table_data || [], //性格
+          nl: this.table_nldata || [], //能力 规则
+          star: this.table_stardata || [], //星级分值规则
+          gdf: this.table_gdfdata || [] //高低分
+        };
+        saveTypeSetting({ Value: JSON.stringify(saveForm) }).then(res => {
+          if (res.data && res.data > 0) {
+            this.$message({
+              message: "更新成功！",
+              type: "success",
+            });
+          }
+          else {
+
+            this.$message({
+              message: "更新失败！",
+              type: "warning",
+            });
+
+          }
+        });
+      },
+      handleExceed() { },
+      handleSuccess(res) {
+        this.$refs.uploader.clearFiles();
+        this.search();
+      },
+      search() {
+        this.queryModel.pageIndex = 1;
+        this.getList();
+      },
+      getList() {
+        UserTypeSettings({}).then((res) => {
+
+          if (res.data) {
+            this.table_columns = res.data.columns;
+            this.table_data = res.data.list || [];
+            this.table_nldata = res.data.nlList || [];
+            this.table_stardata = res.data.starList || [];
+            this.table_gdfdata = res.data.gdList || [];
+
+          }
+
+        });
+      },
+      //隔行变色
+      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);
+      },
+      //编辑
+      handleEdit(index, row) {
+        var model;
+        this.table_data = this.table_data.map(t => {
+          delete t.edit;
+          return t;
+        })
+        this.$set(this.table_data[index], 'edit', true)
+
+
+      },
+      //删除
+      handleDelete(index, row) {
+        console.log(index, row);
+
+        this.table_data.splice(index, 1);
+        // UserInfo_Delete(row.id);
+        // this.$message({
+        //   message: "删除成功！",
+        //   type: "success",
+        // });
+      },
+
+      handleshare(index, row) {
+        if (!row) {
+          this.table_data = [];
+        } else {
+          console.log(index, row);
+          this.table_data.splice(index, 1);
+        }
+        UserInfo_BatchToUser(row.id);
+        this.$message({
+          message: "入库成功！",
+          type: "success",
+        });
+      },
+
+      //保存
+      handleSave(index, row) {
+        delete this.table_data[index].edit;
+        let formData = { ...row };
+        delete formData.DataJsonObj;
+        UserInfo_Update(row);
+        this.table_data.push(this.table_data.pop());
+        this.$forceUpdate();
+        this.$message({
+          message: "保存成功！",
+          type: "success",
+        });
+      },
+      handleCancelSave(index, row) {
+        delete this.table_data[index].edit;
+        if (this.currentFilePath == row.ViewPath) {
+          this.currentFilePath = '';
+        }
+        this.table_data.push(this.table_data.pop());
+      },
+      handleAdd() {
+        var addDataJson = {};
+        for (var key in this.new_date_json) {
+          if (key === "edit") {
+            delete addDataJson[key];
+          } else if (key === "add") {
+            delete addDataJson[key];
+          } else {
+            addDataJson[key] = "";
+          }
+        }
+        addDataJson.edit = true;
+        addDataJson.add = true;
+        this.table_data.push(addDataJson);
+      },
+      //初始化编辑属性
+      initEditAttribute() {
+        var self = this;
+        var edit = self.edit;
+      },
+      initAddDataJson(dataArray) {
+        //新增时，初始化数据结构
+        var dataJson = dataArray;
+        var newDateJson = {};
+        for (var key in dataJson) {
+          if (key === "edit") {
+            newDateJson[key] = "true";
+          } else {
+            newDateJson[key] = "";
+          }
+        }
+        newDateJson["add"] = true;
+        this.new_date_json = newDateJson;
+      },
+    },
+    created() {
+      this.getList();
+    },
+    mounted: function () {
+      this.initEditAttribute();
+      //确保方法在页面渲染后调用
+      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 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/userlist.vue b/src/views/user/userlist.vue
index 9fc8f23..c10b9dc 100644
--- a/src/views/user/userlist.vue
+++ b/src/views/user/userlist.vue
@@ -28,10 +28,10 @@
           </el-form-item>
 
           <el-form-item label="推荐指数">
-            <el-rate v-model="query.stars" text-color="#ff9900" style="margin-top:10px;">
+            <el-rate v-model="query.stars" text-color="#ff9900" style="margin-top:10px;"  show-score :allow-half="true" :max="7"   :score-template="query.stars <0?'无':query.stars+' 星' ">
             </el-rate>
           </el-form-item>
-
+        
 
           <el-form-item>
             <el-button type="success" @click="search">搜索</el-button>
@@ -93,10 +93,14 @@
 
               </template>
             </el-table-column>
-            <el-table-column prop="date" label="系统推荐" width="150px" sortable>
+            <el-table-column prop="date" label="系统推荐" width="220px" sortable>
               <template slot-scope="scope">
-                <el-rate v-model="scope.row.stars" disabled text-color="#ff9900" size="small">
-                </el-rate>
+
+                <el-tooltip class="item" effect="dark" :content="scope.row.stars+' 星'" placement="top-start">
+                  <el-rate v-model="scope.row.stars" show-score :allow-half="true" :max="7" disabled text-color="#ff9900" size="mini"  >
+                  </el-rate>
+                </el-tooltip>
+               
               </template>
             </el-table-column>
             <el-table-column prop="date" label="电话号码" width="100">
@@ -290,9 +294,9 @@
           <el-input v-model="adminUserInfo.byyx" placeholder="请输入毕业院校" style="width: 40%"></el-input>
         </el-form-item>
         <el-form-item label="系统推荐" style="margin-top: 40px" prop="stars">
-          <el-rate style="width: 40%" v-model="adminUserInfo.stars" :texts="['不推荐', '一般', '满意', '很满意', '极力推荐']"
-            show-text>
-          </el-rate>
+          <el-rate style="width: 40%" v-model="adminUserInfo.stars"   show-score :allow-half="true" :max="7" :texts="['0星', '半星', '1星', '1星半', '2星', '2星半', '3星', '2星半', '4星', '4星半', '5星', '5星半', '6星', '6星半', '7星']"
+            show-text   :score-template="adminUserInfo.stars+' 星'">
+          </el-rate>  
         </el-form-item>
         <el-form-item label="面试进度">
           <el-select v-model="adminUserInfo.process" placeholder="进度">