拉取王哥最新的

周超
1 parent d1837e7a
Showing 8 changed files with 212 additions and 65 deletions
src/api/paperLevel.js
src/layout/components/Sidebar/index.vue
src/store/modules/user.js
src/utils/routerList.js
src/views/TestPaper/ManualTestPaper.vue
src/views/TestPaper/TestPaperList.vue
src/views/user/adminList.vue
vue.config.js
+import request from '@/utils/request'
+export default {
+    deletepaperLevel(id) {
+        return request({
+            url: `/paperLevel/Delete?ids=${id}`,
+            method: 'post'
+        });
+    },
+}
+
+export function getpaperLevel(params) {
+    return request({
+        url: `/paperLevel/Get`,
+        method: 'get',
+        params
+    })
+}
+
+export function GetpaperLevelList(params) {
+    return request({
+        url: `/paperLevel/List`,
+        method: 'get',
+        params
+    })
+}
+// 修改 | 保存
+export function Save(params) {
+    return request({
+        url: `/paperLevel/Update`,
+        method: 'post',
+        data: params
+    })
+}
 \ No newline at end of file
@@ -34,7 +34,8 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'sidebar'
+      'sidebar',
+      'permissions'
     ]),
     // routes() {
     //   return this.$router.options.routes
@@ -59,10 +60,10 @@ export default {
       return !this.sidebar.opened
     }
   },
-  created() {
-    this.routes = getRoutes();
+  created() { 
+    this.routes = getRoutes(this.permissions);
     this.$bus.$on('relogin',()=>{
-      this.routes = getRoutes();
+      this.routes = getRoutes(this.permissions);
     })
   },
 }
@@ -16,7 +16,8 @@ const getDefaultState = () =&gt; {
   return {
     token: getToken(),
     name: '',
-    avatar: ''
+    avatar: '',
+    permissions: []
   }
 }
  
@@ -40,6 +41,9 @@ const mutations = {
     state.userInfo = val
     localStorage.userinfo = JSON.stringify(val)
   },
+  setPermissions(state, permissions) {
+    state.permissions = permissions;
+  },
 }
  
 const actions = {
@@ -60,7 +64,7 @@ const actions = {
           data
         } = response
         commit('SET_TOKEN', data.token)
-        commit('SET_USERINFO', data.data)
+        // commit('SET_USERINFO', data.data)
         setToken(data.token)
         resolve()
       }).catch(error => {
@@ -77,7 +81,7 @@ const actions = {
     return new Promise((resolve, reject) => {
       getInfo().then(response => {
         const {
-          data
+          data,permissions
         } = response.data
         if (!data) {
           return reject('Verification failed, please Login again.')
@@ -88,6 +92,8 @@ const actions = {
         } = data
         commit('SET_NAME', DisplayName)
         commit('SET_AVATAR', avatar)
+        // commit("setPermissions", permissions);
+        commit('SET_USERINFO', data)
         resolve(data)
       }).catch(error => {
         reject(error)
@@ -2,15 +2,19 @@ import Layout from &#39;@/layout&#39;
 import { getInfo } from '../store/modules/user.js'
  
  
-export function getRoutes() {
-
+export function getRoutes(permissions) {
     let userInfo = {}
     if (localStorage.userinfo) {
         userInfo = JSON.parse(localStorage.userinfo)
     }
+    var permissions = userInfo.permissions || [];
+
+
+
+
     console.log(userInfo)
     let constantRoutes1 = []
-    if (userInfo.UserId == 1) {
+    if (userInfo.UserId == 1 || 1 == 1) {
         constantRoutes1 = [{
             path: '/login',
             component: () =>
@@ -67,7 +71,8 @@ export function getRoutes() {
             name: 'Example',
             meta: {
                 title: '题库管理',
-                icon: 'el-icon-s-help'
+                icon: 'el-icon-s-help',
+                permissions: ['admin']
             },
             children: [{
                 path: 'QuestionBank',
@@ -76,7 +81,8 @@ export function getRoutes() {
                     import('@/views/QuestionBank/index'),
                 meta: {
                     title: '题库',
-                    icon: 'table'
+                    icon: 'table',
+                    permissions: ['admin']
                 }
             },]
         },
@@ -199,7 +205,7 @@ export function getRoutes() {
             name: 'user',
             meta: {
                 title: '用户管理',
-                icon: 'el-icon-s-help'
+                icon: 'el-icon-s-help' 
             },
             children: [{
                 path: 'user',
@@ -230,18 +236,14 @@ export function getRoutes() {
                     title: '图片导入用户',
                 }
             },
-
-         
-
-            
             {
                 path: 'admin',
                 name: 'admin',
-
                 component: () =>
                     import('@/views/user/adminList'),
                 meta: {
                     title: '管理员列表',
+                    permissions: ['admin']
                 }
             },
  
@@ -259,46 +261,50 @@ export function getRoutes() {
                 {
                     path: 'userdimset',
                     name: 'impouserdimsetrtuser',
-    
+
                     component: () =>
                         import('@/views/user/userdimset'),
                     meta: {
                         title: '维度规则设置',
+                        permissions:['admin' ]
                     }
                 },
                 {
-                path: 'index',
-                name: 'index',
-                component: () =>
-                    import('@/views/password/index'),
-                meta: {
-                    title: '忘记密码',
-                }
-            }, {
-                path: 'TestPaperClass',
-                name: 'Table',
-                component: () =>
-                    import('@/views/TestPaper/TestPaperClass'),
-                meta: {
-                    title: '分类管理',
-                }
-            }, {
-                path: 'carousel',
-                name: 'carousel',
-                component: () =>
-                    import('@/views/carousel/index'),
-                meta: {
-                    title: '轮播图',
-                }
-            }, {
-                path: 'new',
-                name: 'new',
-                component: () =>
-                    import('@/views/carousel/new'),
-                meta: {
-                    title: '最新资讯',
-                }
-            }]
+                    path: 'index',
+                    name: 'index',
+                    component: () =>
+                        import('@/views/password/index'),
+                    meta: {
+                        title: '忘记密码',
+                    }
+                }, {
+                    path: 'TestPaperClass',
+                    name: 'Table',
+                    component: () =>
+                        import('@/views/TestPaper/TestPaperClass'),
+                    meta: {
+                        title: '分类管理',
+                        permissions:['admin' ]
+                    }
+                }, {
+                    path: 'carousel',
+                    name: 'carousel',
+                    component: () =>
+                        import('@/views/carousel/index'),
+                    meta: {
+                        title: '轮播图',
+                        permissions:['admin' ]
+                    }
+                }, {
+                    path: 'new',
+                    name: 'new',
+                    component: () =>
+                        import('@/views/carousel/new'),
+                    meta: {
+                        title: '最新资讯',
+                        permissions:['admin']
+                    }
+                }]
         },
         // 404 page must be placed at the end !!!
         {
@@ -308,6 +314,7 @@ export function getRoutes() {
         }
         ]
     } else {
+        return ;
         constantRoutes1 = [{
             path: '/login',
             component: () =>
@@ -329,7 +336,8 @@ export function getRoutes() {
             name: 'Example',
             meta: {
                 title: '题库管理',
-                icon: 'el-icon-s-help'
+                icon: 'el-icon-s-help',
+                permissions: ["admin", "user"],
             },
             children: [{
                 path: 'QuestionBank',
@@ -481,8 +489,7 @@ export function getRoutes() {
                 meta: {
                     title: '人才库',
                 }
-            },
-
+            }
  
             ]
         }, {
@@ -492,7 +499,8 @@ export function getRoutes() {
             name: 'password',
             meta: {
                 title: '系统管理',
-                icon: 'el-icon-s-platform'
+                icon: 'el-icon-s-platform',
+                permissions:['admin','user']
             },
             children: [{
                 path: 'index',
@@ -509,6 +517,7 @@ export function getRoutes() {
                     import('@/views/TestPaper/TestPaperClass'),
                 meta: {
                     title: '分类管理',
+                    permissions: ['admin']
                 }
             }, {
                 path: 'carousel',
@@ -517,6 +526,7 @@ export function getRoutes() {
                     import('@/views/carousel/index'),
                 meta: {
                     title: '轮播图',
+                    permissions: ['admin']
                 }
             }, {
                 path: 'new',
@@ -525,6 +535,7 @@ export function getRoutes() {
                     import('@/views/carousel/new'),
                 meta: {
                     title: '最新资讯',
+                    permissions: ['admin']
                 }
             }]
         },
@@ -538,5 +549,29 @@ export function getRoutes() {
     }
  
  
+    function hasPermission(permissions, route) {
+        if (route.meta && route.meta.permissions) {
+            return permissions.some((role) => route.meta.permissions.includes(role));
+        } else {
+            return true;
+        }
+    }
+
+
+    function filterAsyncRoutes(routes, permissions) { 
+        const finallyRoutes = [];
+        routes.forEach((route) => {
+            const item = { ...route };
+            if (hasPermission(permissions, item)) {
+                if (item.children) {
+                    item.children = filterAsyncRoutes(item.children, permissions);
+                }
+                finallyRoutes.push(item);
+            }
+        });
+        return finallyRoutes;
+    } 
+    constantRoutes1 = filterAsyncRoutes(constantRoutes1, permissions);
+
     return constantRoutes1;
 }
 \ No newline at end of file
@@ -84,7 +84,12 @@
               </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">
@@ -135,10 +140,15 @@
       <ul class="random-list">
         <li v-for="(item,index) in randomSubjectList" :key="index">
           <span>试题分类：</span>
-          <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-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>
@@ -173,6 +183,9 @@
 <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";
@@ -238,6 +251,7 @@
           PresentPrice: "0",
           MembershipPrice: "0",
           QuestionBankIds: [],
+          FLevelCount:0
         },
         loading: false,
         rules: {
@@ -246,7 +260,7 @@
               required: true,
               message: "不能为空",
             },
-          ],
+          ],   
           PresentPrice: [
             {
               required: true,
@@ -278,6 +292,8 @@
           },
         ],
         timeout: 0,
+        typelist:[],
+        levellist:[] //等级
       };
     },
     watch: {
@@ -311,6 +327,11 @@
         if (res.data) {
           this.usertypelist = res.data || [];
         }
+      }); 
+      GetpaperLevelList({pageSize:1000,sortOrder:'asc'}).then(res => {
+        if (res.data) {
+          this.levellist = res.data.data || [];
+        }
       });
     },
     mounted() {
@@ -319,6 +340,25 @@
       //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){ 
+        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);
@@ -339,6 +379,7 @@
         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;
@@ -437,7 +478,11 @@
             if (this.arr2.length > 0) {
               EditTestPaper(this.TestPaper).then((res) => {
                 if (res.data.code == 200) {
-                  this.$confirm("组卷成功！", "消息");
+                  this.$notify({
+                  title: '组卷成功！',
+                  // message: res.data.message,
+                  type: 'success'
+                });
                   this.$router.push({
                     path: '/views/TestPaperList',
                     query: { 
@@ -550,7 +595,7 @@
           getQuestionList({
             QuestionClassId: d.id,
             PageIndex: 1,
-            PageSize: 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));
@@ -11,7 +11,7 @@
           <span>{{ scope.row.id }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="试卷标题" width="250">
+      <el-table-column prop="date" label="试卷标题" width="300">
         <template slot-scope="scope">
           <span>{{ scope.row.TestPaperTitle }}</span>
         </template>
@@ -52,6 +52,12 @@
           <span>{{ scope.row.TestPaperClassId | typeFilters}}</span>
         </template>
       </el-table-column>
+
+      <el-table-column prop="FLevelTitle" label="等级" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.FLevelTitle  }}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="name" label="原价" width="80" v-show="false">
         <template slot-scope="scope">
           <span>{{ scope.row.OriginalPrice/100 }}</span>
@@ -22,6 +22,14 @@
       </el-table-column>
       <el-table-column prop="username" label="登录账号">
       </el-table-column>
+
+      <el-table-column prop="type" label="类型">
+        <template slot-scope="scope"> 
+            <span>{{ scope.row.type == 0?'超级管理员':'一般管理员' }}</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)}">
@@ -55,6 +63,13 @@
         <el-form-item label="登录账号" style="margin-top: 40px;" prop="username">
           <el-input v-model="adminUserInfo.username" placeholder="请输入登录账号" style="width: 40%;"></el-input>
         </el-form-item>
+        <el-form-item label="类型" style="margin-top: 40px;" prop="type">
+          <el-radio-group v-model="adminUserInfo.type">
+            <el-radio :label="0">超级管理员</el-radio>
+            <el-radio :label="5">一般管理员</el-radio> 
+          </el-radio-group>
+        </el-form-item>
+        
         <el-form-item label="密码" prop="password" v-if="title=='添加管理员'">
           <el-input v-model="adminUserInfo.password " placeholder="请输入密码" show-password style="width: 40%;"></el-input>
         </el-form-item>
@@ -208,6 +223,11 @@
             required: true,
             message: '请输入密码',
             trigger: 'blur'
+          }],
+          type: [{
+            required: true,
+            message: '请输选择用户类型',
+            trigger: 'blur'
           }]
         }
       }
@@ -39,7 +39,8 @@ module.exports = {
         proxy: {
             '/development': {
                 // target: `http://inteview.t1j2.com/`, //后台服务地址
-                target:'http://localhost:8009',
+                target:'http://localhost:8877',
+                // target:'http://localhost:8009',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/development': ''