Merge branch 'dev-web' into dev

ruoyi-ui/src/router/index.js

@@ -97,7 +97,7 @@ export const dynamicRoutes = [
     path: '/people/exam-exam1',
     component: Layout,
     hidden: true,
-    permissions: ['people:exam:edit'],
+    permissions: ['system:user:list'],
     children: [
       {
         path: 'examid/:userId(\\d+)',
@@ -112,7 +112,7 @@ export const dynamicRoutes = [
     path: '/people/exam-exam2',
     component: Layout,
     hidden: true,
-    permissions: ['people:exam:edit'],
+    permissions: ['system:user:list'],
     children: [
       {
         path: 'examid/:userId(\\d+)',
@@ -143,7 +143,7 @@ export const dynamicRoutes = [
     path: '/people/train-train1',
     component: Layout,
     hidden: true,
-    permissions: ['people:exam:edit'],
+    permissions: ['system:user:list'],
     children: [
       {
         path: 'trainid/:userId(\\d+)',
@@ -158,7 +158,7 @@ export const dynamicRoutes = [
     path: '/people/train-train2',
     component: Layout,
     hidden: true,
-    permissions: ['people:train:edit'],
+    permissions: ['system:user:list'],
     children: [
       {
         path: 'trainid/:userId(\\d+)',
@@ -173,7 +173,7 @@ export const dynamicRoutes = [
     path: '/people/train-train3',
     component: Layout,
     hidden: true,
-    permissions: ['people:train:edit'],
+    permissions: ['system:user:list'],
     children: [
       {
         path: 'trainid/:userId(\\d+)',
@@ -190,7 +190,7 @@ export const dynamicRoutes = [
     path: '/people/practice-practice2',
     component: Layout,
     hidden: true,
-    // permissions: ['people:practice:edit'],
+    permissions: ['system:user:list'],
     children: [
       {
         path: 'practiceid/:userId(\\d+)',
@@ -205,7 +205,7 @@ export const dynamicRoutes = [
   path: '/people/practice-practice3',
   component: Layout,
   hidden: true,
-  permissions: ['people:train:edit'],
+  permissions: ['system:user:list'],
   children: [
     {
       path: 'practiceid/:userId(\\d+)',

ruoyi-ui/src/views/people/exam/exam1.vue

@@ -39,7 +39,7 @@
 </style>
 
 <script>
-import { getAuthRole, updateAuthRole } from "@/api/system/user";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "AuthRole",
@@ -99,7 +99,7 @@ export default {
     //     this.$modal.msgSuccess("授权成功");
     //     this.close();
     //   });
-    this.$router.push("/people/exam-exam2/examid/" + userId);
+    this.$router.push("/people/exam-exam2/examid/1");
     },
     /** 关闭按钮 */
     close() {

ruoyi-ui/src/views/people/exam/exam2.vue

@@ -142,7 +142,7 @@
 </style>
 
 <script>
-import { getAuthRole, updateAuthRole } from "@/api/system/user";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "AuthRole",

ruoyi-ui/src/views/people/exam/index.vue

@@ -117,7 +117,6 @@
                 type="text"
                 icon="el-icon-thumb"
                 @click="handleInto(scope.row)" 
-                v-hasPermi="['simulator:user:remove']"
               >进入</el-button>
             </template>
           </el-table-column>

ruoyi-ui/src/views/people/practice/practice2.vue

@@ -142,7 +142,7 @@
 </style>
 
 <script>
-import { getAuthRole, updateAuthRole } from "@/api/system/user";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "AuthRole",

ruoyi-ui/src/views/people/train/index.vue

@@ -82,7 +82,7 @@
                 type="text"
                 icon="el-icon-thumb"
                 @click="handleInto(scope.row)" 
-                v-hasPermi="['simulator:user:remove']"
+
               >进入</el-button>
             </template>
           </el-table-column>

ruoyi-ui/src/views/people/train/train1.vue

@@ -38,7 +38,7 @@
 }
 </style>
 <script>
-import { getAuthRole, updateAuthRole } from "@/api/system/user";
+import { listUser } from "@/api/system/user";
 export default {
   name: "AuthRole",
   data() {
@@ -102,7 +102,7 @@ export default {
     //     this.$modal.msgSuccess("授权成功");
     //     this.close();
     //   });
-    this.$router.push("/people/train-train2/trainid/" + userId);
+    this.$router.push("/people/train-train2/trainid/5");
     },
     /** 关闭按钮 */
     close() {

ruoyi-ui/src/views/people/train/train2.vue

@@ -142,7 +142,7 @@
 </style>
 
 <script>
-import { getAuthRole, updateAuthRole } from "@/api/system/user";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "AuthRole",
@@ -272,7 +272,7 @@ export default {
     //     this.$modal.msgSuccess("授权成功");
     //     this.close();
     //   });
-       this.$router.push("/people/train-train3/trainid/" + userId);
+       this.$router.push("/people/train-train3/trainid/5");
     },
     /** 关闭按钮 */
     close() {

ruoyi-ui/src/views/peoples/student/index.vue

@@ -68,7 +68,6 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['system:user:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -79,7 +78,6 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -90,7 +88,6 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
             >删除</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -121,20 +118,17 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
               >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['simulator:user:resetPwd', 'simulator:user:edit']">
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['sim:student:resetPwd', 'sim:student:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                    v-hasPermi="['simulator:user:resetPwd']">重置密码</el-dropdown-item>
+                    v-hasPermi="['sim:student:resetPwd']">重置密码</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>