Merge branch 'dev' into dev-api

ruoyi-ui/src/api/sim/exam.js

@@ -106,6 +106,31 @@ export function examStudentPrepare(examId) {
   })
 }
 
+// 正在考试界面
+export function examStudentAnswering(examId) {
+  return request({
+      url: '/sim/real-exam/student/exam/answering/' + parseStrEmpty(examId),
+      method: 'get'
+  })
+}
+
+//考试交卷界面
+export function examStudentSubmit(examId) {
+  return request({
+      url: '/sim/real-exam/student/exam/submit/' + parseStrEmpty(examId),
+      method: 'get'
+  })
+}
+
+
+//结束考试界面
+export function examStudentReport(examId) {
+  return request({
+      url: '/sim/real-exam/student/exam/report/' + parseStrEmpty(examId),
+      method: 'get'
+  })
+}
+
 
 // 学生获取考试详细信息
 export function examStudentGet(userId) {

ruoyi-ui/src/router/index.js

@@ -100,7 +100,7 @@ export const dynamicRoutes = [
     permissions: ['system:user:list'],
     children: [
       {
-        path: 'examid/:userId(\\d+)',
+        path: 'examid/:examId(\\d+)',
         component: () => import('@/views/people/exam/exam1'),
         name: 'exam1',
         meta: { title: '准备考试', activeMenu: '/people/exam' }
@@ -115,7 +115,7 @@ export const dynamicRoutes = [
     permissions: ['system:user:list'],
     children: [
       {
-        path: 'examid/:userId(\\d+)',
+        path: 'examid/:examId(\\d+)',
         component: () => import('@/views/people/exam/exam2'),
         name: 'exam2',
         meta: { title: '正在考试', activeMenu: '/people/exam' }
@@ -127,10 +127,10 @@ export const dynamicRoutes = [
     path: '/people/exam-exam3',
     component: Layout,
     hidden: true,
-    permissions: ['people:exam:edit'],
+    permissions: ['system:user:list'],
     children: [
       {
-        path: 'examid/:userId(\\d+)',
+        path: 'examid/:examId(\\d+)',
         component: () => import('@/views/people/exam/exam3'),
         name: 'exam3',
         meta: { title: '得分分析', activeMenu: '/people/exam' }

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

@@ -1,24 +1,31 @@
 <template>
   <div class="app-container" style="width: 80%;">
-
     <el-descriptions title="基本信息" :column="2" border style="color: #6379bb;padding-left: 20%">
-      <el-descriptions-item label="当前模式">88</el-descriptions-item>
-      <el-descriptions-item label="模拟类型">90</el-descriptions-item>
-      <el-descriptions-item label="模拟状态">30</el-descriptions-item>
-      <el-descriptions-item label="考试学员">30</el-descriptions-item>
-      <el-descriptions-item label="学员座号">30</el-descriptions-item>
+      <el-descriptions-item label="当前模式">考试</el-descriptions-item>
+      <el-descriptions-item label="模拟类型" >
+        <template>
+          <dict-tag class="text-navy" :options="dict.type.sim_sim_type" :value="simType"/>
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="模拟状态">
+        <template>
+          <dict-tag class="text-navy" :options="dict.type.sim_sim_state" :value="simStateText"/>
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item label="考试学员">{{nickName}}</el-descriptions-item>
+      <el-descriptions-item label="学员座号">{{simNum}}</el-descriptions-item>
     </el-descriptions>
 
     <el-descriptions title="注意事项" :column="1" border style="margin-top: 2%;color: #6379bb;padding-left: 20%"></el-descriptions>
     <div class="shixiang">
-        <div>1.注意事项111</div>
-        <div>2.注意事项222</div>
-        <div>3.注意事项333</div>
+        <div>1.遵守考场纪律‌</div>
+        <div>2.合理安排时间</div>
+        <!-- <div>3.注意事项</div> -->
     </div>
 
-    <el-form ref="elForm" :model="form" size="medium" label-width="100px" style="margin-top: 10%;">
+    <el-form ref="elForm" size="medium" label-width="100px" style="margin-top: 10%;">
         <el-form-item size="large">
-            <el-button type="primary" @click="submitForm" >开始考试</el-button>
+            <el-button type="primary" :class="{ isDisabled }" @click="submitForm" :disabled="isDisabled">开始考试</el-button>
         </el-form-item>
     </el-form>
 
@@ -40,85 +47,58 @@
 
 <script>
 import { examStudentPrepare } from "@/api/sim/exam";
-
 export default {
-  name: "AuthRole",
+  name: "exam",
+  dicts: ['sim_sim_type','sim_sim_state'],
   data() {
     return {
-       // 遮罩层
+      // 遮罩层
       loading: true,
-      // 分页信息
-      total: 0,
-      pageNum: 1,
-      pageSize: 10,
-      // 选中角色编号
-      roleIds:[],
-      // 角色信息
-      roles: [],
-      // 用户信息
-      form: {}
+      simStateText:null,
+      simType:null,
+      simNum:null,
+      nickName:null,
+      isDisabled: true, // 初始化按钮为不可用状态
+      examId:'',
     };
   },
   created() {
-    this.getList();
-    // const userId = this.$route.params && this.$route.params.userId;
-    // if (userId) {
-    //   this.loading = true;
-    //   getAuthRole(userId).then((response) => {
-    //     this.form = response.user;
-    //     this.roles = response.roles;
-    //     this.total = this.roles.length;
-    //     this.$nextTick(() => {
-    //       this.roles.forEach((row) => {
-    //         if (row.flag) {
-    //           this.$refs.table.toggleRowSelection(row);
-    //         }
-    //       });
-    //     });
-    //     this.loading = false;
-    //   });
-    // }
+    this.getList(this.isDisabled);
+  },
+  computed: {
+  },
+  mounted() {
+    this.examId = this.$route.params.examId;
+    let timer = setInterval(() => {
+      console.log(this.isDisabled)
+      if (this.isDisabled == true) {
+        this.getList();
+      }
+    }, 5000);
   },
   methods: {
-    /** 单击选中行数据 */
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.roleIds = selection.map((item) => item.roleId);
-    },
-    // 保存选中的数据编号
-    getRowKey(row) {
-      return row.roleId;
-    },
     getList() {
       this.loading = true;
-      const examId = 1;
+      console.log(this.examId)
+      console.log('this.examId')
+      const examId = this.$route.params.examId;
       examStudentPrepare(examId).then(response => {
-           console.log(response);
-           console.log();
-           console.log('response.rows.realExamCollectio');
-          //将返回值注释
-          this.loading = false;
+        this.loading = false;
+        this.simType = response.data.realExamCollection.simType;
+        this.simNum = response.data.sim.simNum;
+        this.nickName = response.data.student.nickName;
+        this.simStateText = response.data.sim.simState;
+        if(response.data.next== true){
+          this.isDisabled = false;
         }
-      );
+        // this.isDisabled = false; 
+      });
     },
     /** 提交按钮 */
     submitForm() {
-      const userId = this.form.userId;
-      const roleIds = this.roleIds.join(",");
-    //   updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
-    //     this.$modal.msgSuccess("授权成功");
-    //     this.close();
-    //   });
-      this.$router.push("/people/exam-exam2/examid/1");
-    },
-    /** 关闭按钮 */
-    close() {
-      const obj = { path: "/system/user" };
-      this.$tab.closeOpenPage(obj);
-    },
+      const examId = this.$route.params.examId;
+      this.$router.push("/people/exam-exam2/examid/"+examId);
+    }
   },
 };
 </script>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div style="margin-top:3%">  
-    <div class="readme">正在考试中，考试时间 30 分钟</div>
+    <div class="readme">正在考试中，考试时间 50 分钟</div>
     <div class="djs">距离考试结束还有{{ time }}</div>
     </div>
 
@@ -142,13 +142,13 @@
 </style>
 
 <script>
-import { listUser } from "@/api/system/user";
-
+import { examStudentAnswering,examStudentSubmit } from "@/api/sim/exam";
 export default {
-  name: "AuthRole",
+  name: "exam2",
   data() {
     return {
-      duration: 1800, // 假设倒计时1800秒
+      duration: 0, // 假设倒计时1800秒
+      examId:'',
       tableData: [{
         name: '1111',
         number: '',
@@ -211,25 +211,17 @@ export default {
     };
   },
   created() {
-    const userId = this.$route.params && this.$route.params.userId;
-    if (userId) {
-      this.loading = true;
-      getAuthRole(userId).then((response) => {
-        this.form = response.user;
-        this.roles = response.roles;
-        this.total = this.roles.length;
-        this.$nextTick(() => {
-          this.roles.forEach((row) => {
-            if (row.flag) {
-              this.$refs.table.toggleRowSelection(row);
-            }
-          });
-        });
-        this.loading = false;
-      });
-    }
+    this.getList();
   },
   methods: {
+    getList() {
+      this.loading = true;
+      const examId = this.$route.params.examId;
+      examStudentAnswering(examId).then(response => {
+          console.log(response);          
+          this.duration = 3000000/1000;
+      });
+    },
     deleteRow(index, rows) {
       console.log(index+"@@@@")
       console.log(rows+"####")
@@ -270,14 +262,14 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      const userId = this.form.userId;
-      const roleIds = this.roleIds.join(",");
-    //   updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
-    //     this.$modal.msgSuccess("授权成功");
-    //     this.close();
-    //   });
-    // this.$router.push("/people/exam-exam3/examid/" + userId);
-    this.$router.push("/exam/exam");
+      const examId = this.$route.params.examId;
+      examStudentSubmit(examId).then(response => {
+        if(response.code='200'){
+          this.$router.push("/people/exam-exam3/examid/" + examId);
+        }
+      });
+      // this.$router.push("/people/exam-exam3/examid/1");
+      // this.$router.push("/exam/exam");
     },
     /** 关闭按钮 */
     close() {
@@ -286,13 +278,12 @@ export default {
     },
   },
   computed: {
-      time() {
-        //let hours = Math.floor(this.duration / 3600);
-        let minutes = Math.floor((this.duration % 3600) / 60);
-        let seconds = this.duration % 60;
-        return `${minutes}分${seconds}秒`;
-      },
+    time() {
+      let minutes = Math.floor((this.duration % 3600) / 60);
+      let seconds = this.duration % 60;
+      return `${minutes}分${seconds}秒`;
     },
+  },
   mounted() {
     let timer = setInterval(() => {
       this.duration--;

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div>  
-      <div class="djs">得分成绩/满分成绩: <span class="df">50</span>/100</div>
+      <div class="djs">得分成绩/满分成绩: <span class="df">0</span>/100</div>
     </div>
     <el-table
       :data="tableData"
@@ -19,7 +19,6 @@
       </el-table-column>
       <el-table-column
         prop="name2"
-
         label="扣分">
       </el-table-column>
       <el-table-column
@@ -28,6 +27,7 @@
         <template scope="scope">
             <span v-if="scope.row.name3==='排除'" style="color: green">排除</span>
             <span v-else-if="scope.row.name3==='未排除'" style="color: red">未排除</span>
+            <span v-else-if="scope.row.name3==='初始化'" style="color: gray">初始化</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -68,7 +68,7 @@
       </el-table-column>
     </el-table>
 
-    <el-form ref="elForm" :model="formData"  size="medium" label-width="100px" style="margin-top: 2%;text-align: center;">
+    <el-form ref="elForm" size="medium" label-width="100px" style="margin-top: 2%;text-align: center;">
         <el-form-item size="large">
             <el-button type="primary" @click="submitForm" style="width: 8%;">结束</el-button>
         </el-form-item>
@@ -88,9 +88,11 @@
 }
 </style>
 <script>
+import {examStudentReport } from "@/api/sim/exam";
   export default {
     data() {
       return {
+        examId:'',
         tableData: [{
           id:'一.故障排除(75分)',
           name: '',
@@ -101,19 +103,19 @@
           id:1,
           name: '故障一未排除扣25分',
           name2: '',
-          name3: '排除',
+          name3: '',
           name4: '',
         }, {
           id:2,
           name: '故障二未排除扣25分',
           name2: '',
-          name3: '未排除',
+          name3: '',
           name4: '',
         }, {
           id:3,
           name: '故障三未排除扣25分',
           name2: '',
-          name3: '排除',
+          name3: '',
           name4: '',
         }],
 
@@ -127,31 +129,31 @@
           id:1,
           name: '故障现象少写或错写1条扣1分',
           name2: '',
-          name3: '正确',
+          name3: '',
           name4: '',
         }, {
           id:2,
           name: '可能原因少写或错写1条扣1分',
           name2: '',
-          name3: '错误',
+          name3: '',
           name4: '',
         }, {
           id:3,
           name: '故障部位少写或错写1条扣1分',
           name2: '',
-          name3: '正确',
+          name3: '',
           name4: '',
         }, {
           id:4,
           name: '排除方法少写或错写1条扣1分',
           name2: '',
-          name3: '正确',
+          name3: '',
           name4: '',
         }, {
           id:5,
           name: '修复结论错扣2分',
           name2: '',
-          name3: '正确',
+          name3: '',
           name4: '',
         }, {
           id:'三.维修时间(10分)',
@@ -174,7 +176,7 @@
         }, {
           id:'五.成绩',
           name: '',
-          name2: '-50',
+          name2: '',
           name3: '',
           name4: '',
         }, {
@@ -186,7 +188,78 @@
         }],
       };
     },
+    created() {
+      this.getList();
+    },
+    mounted() {
+      this.examId = this.$route.params.examId;
+      let timer = setInterval(() => {
+        this.getList();
+      }, 5000);
+    },
     methods: {
+      getList() {
+        this.loading = true;
+        const examId = this.$route.params.examId;
+        examStudentReport(examId).then(response => {
+          console.log(response);
+          let minus1 =  response.data.listPart1[0].minus;
+          let minus2 =  response.data.listPart1[1].minus;
+          let minus3 =  response.data.listPart1[2].minus;
+
+          let text11 = '排除';
+          if(response.data.listPart1[0].answerRight ==0){
+            text11 == '初始化';
+          }else if(response.data.listPart1[0].answerRight ==1){
+            text11 == '排除';
+          }else{
+            text11 == '未排除';
+          }
+
+          let text12 = '';
+          if(response.data.listPart1[1].answerRight==0){
+            text12 = '初始化';
+          }else if(response.data.listPart1[1].answerRight==1){
+            text12 = '排除';
+          }else{
+            text12 = '未排除';
+          }
+
+          let text13 = '未排除';
+          if(response.data.listPart1[2].answerRight==0){
+            text13 = '初始化';
+          }else if(response.data.listPart1[2].answerRight==1){
+            text13 = '排除';
+          }else{
+            text13 = '未排除';
+          }
+          let topic1 = response.data.listPart1[0].fault.name;
+          let topic2 = response.data.listPart1[1].fault.name;
+          let topic3 = response.data.listPart1[2].fault.name;
+
+          this.tableData = [{
+            id:'一.故障排除(75分)',
+          },{
+            id:1,
+            name: '故障一未排除扣25分',
+            name2: minus1,
+            name3: text11,
+            name4: topic1,
+          }, {
+            id:2,
+            name: '故障二未排除扣25分',
+            name2: minus2,
+            name3: text12,
+            name4: topic2,
+          }, {
+            id:3,
+            name: '故障三未排除扣25分',
+            name2: minus3,
+            name3: text13,
+            name4: topic3,
+          }];         
+        });
+      },
       //首页合并
       arraySpanMethod({ row, column, rowIndex, columnIndex }) {
         if (rowIndex === 0) {
@@ -217,12 +290,6 @@
       /** 结束按钮 */
       submitForm() {
         this.$router.push("/exam/exam");
-        // const userId = this.form.userId;
-        // const roleIds = this.roleIds.join(",");
-        // updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
-        //   this.$modal.msgSuccess("授权成功");
-        //   this.close();
-        // });
       },
     }
   };

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

@@ -3,9 +3,9 @@
     <el-row>
       <!--考试数据-->
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-          <el-form-item label="考试名称" prop="userName">
+          <el-form-item label="考试名称" prop="examCollectionName">
             <el-input
-              v-model="queryParams.userName"
+              v-model="queryParams.examCollectionName"
               placeholder="请输入考试名称"
               clearable
               style="width: 150px"
@@ -54,49 +54,16 @@
               />
             </el-select>
           </el-form-item> -->
-        
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['simulator:task:add']"
-            >新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['simulator:user:edit']"
-            >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['simulator:user:remove']"
-            >删除</el-button>
-          </el-col> -->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="userList" >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="编号" align="center" key="realExam.examId" prop="realExam.examId" v-if="columns[0].visible" width="80"/>
           <el-table-column label="考试名称" align="center" key="realExamCollection.examCollectionName" prop="realExamCollection.examCollectionName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -147,85 +114,11 @@
         />
     </el-row>
 
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="型号">
-              <!-- v-model="form.monitype" -->
-              <el-select v-model="selectedEquip"  placeholder="请选择模拟器型号">
-                <el-option
-                  value="请选择"
-                >请选择</el-option>
-                <el-option
-                  v-for="dict in dict.type.sim_equip_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="任务名称" prop="userName">
-              <el-input  placeholder="请输入任务名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <div style="text-align: right;">
-            <el-button @click="toggleSelection(tableData)">选择全部</el-button>
-            <el-button @click="toggleSelection()">取消选择</el-button>
-          </div>
-        </el-row>
-        
-          
-       
-        <el-table 
-          :data="tableData" border ref="multipleTable" @selection-change="handleSelectionRow" 
-          style="width:100%;text-align:center;margin-left:10px; margin-top:10px">
-          <el-table-column
-            prop="xinghao"
-            label="型号">
-          </el-table-column>
-          <el-table-column
-            prop="xianxiang"
-            label="故障现象">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="故障部位">
-          </el-table-column>
-          <el-table-column
-          type="selection" prop="ids"
-            label="ID"
-          width="55"></el-table-column>
-        </el-table>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    
-    
+  
   </div>
 </template>
-<style>
-  .el-table__header tr th .cell{
-    text-align: center;
-  }
-  .el-table__row .cell {
-    text-align: center;
-  }
-  /* .el-form-item__label{
-    width: 85px !important;
-  } */
-</style>
 <script>
-import { listUser,getUserProfile} from "@/api/system/user";
 import { examStudentList,examStudentGet,examStudentEnter} from "@/api/sim/exam";
-import { getToken } from "@/utils/auth";
 
 export default {
   name: "Exam",
@@ -256,18 +149,8 @@ export default {
       deptOptions: undefined,
       // 是否显示弹出层
       open: false,
-      //自检弹出框
-      zijianopen:false,
-      // 部门名称
-      deptName: undefined,
-      // 默认密码
-      initPassword: undefined,
       // 日期范围
       dateRange: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
       // 表单参数
       form: {
         startTime:'',
@@ -281,10 +164,6 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        status: undefined,
-        deptId: undefined
       },
       // 列信息
       columns: [
@@ -301,12 +180,6 @@ export default {
     };
   },
   watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    },
-    
-    
   },
   created() {
     this.getList();
@@ -316,13 +189,6 @@ export default {
     });
   },
   methods: {
-    // 根据选择的option获取新的数据
-    // getNewTableData(option) {
-    //   // 逻辑处理返回新的数据数组
-    //   return [
-    //     // ...新数据
-    //   ];
-    // },
     toggleSelection(rows) {
       if (rows) {
         rows.forEach(row => {
@@ -340,98 +206,16 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      // getUserProfile().then(response => {
-      //   this.user = response.data;
-      //   console.log(response.data.userId)
-      //   console.log(this.user.userId);
-      //   console.log('this.user.userId');
-      //   examStudentList(this.user.userId).then(response => {
-      //       //将返回值注释
-      //       this.userList = response.rows;
-      //       this.total = response.total;
-      //       this.loading = false;
-      //     }
-      //   );
-      // });
       examStudentList().then(response => {
-          //  console.log(response.rows[0]['realExa']);
-          //  console.log(response.rows.realExamCollection);
-          //  console.log('response.rows.realExamCollectio');
-          //将返回值注释
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
-        }
-      );
-      
-    },
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.handleQuery();
-    },
-    // 用户状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    //清除故障
-    clearFaultChange(row,number,nametext){
-      console.log()
-      // console.log(nametext+'###')
-      // console.log(row[nametext]+'@@@')
-      // console.log(row.name1+'@@@')
-      let text1 = '清除所有模拟器故障';
-      console.log(nametext + '###name1');
-      if(nametext != 'all'){
-        text1 = '清除'+ number +'号坐席模拟器故障';
-      }
-      this.$modal.confirm('确认要"' + text1 + '"吗？').then(function() {
-        // return changeUserStatus(row.userId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text1 + "成功");
-      }).catch(function() {
-        // row.status = row.status === "0" ? "1" : "0";
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.zijianopen = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
       this.form = {
         userId: undefined,
-        deptId: undefined,
-        userName: undefined,
-        
-        password: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
-        status: "0",
-        remark: undefined,
-        postIds: [],
-        roleIds: []
       };
       this.resetForm("form");
     },
@@ -444,66 +228,9 @@ export default {
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
-      this.queryParams.deptId = undefined;
       this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleResetPwd":
-          this.handleResetPwd(row);
-          break;
-        case "handleAuthRole":
-          this.handleAuthRole(row);
-          break;
-        default:
-          break;
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.open = true;
-        this.title = "新增训练任务";
-        this.form.password = this.initPassword;
-      });
-    },
-    /* 故障设置自检 **/
-    handleInspect() {
-      //this.reset();
-      getUser().then(response => {
-        //this.postOptions = response.posts;
-        //this.roleOptions = response.roles;
-        this.zijianopen = true;
-        this.title = "故障设置自检";
-      });
-    },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.open = true;
-        this.title = "修改用户";
-        this.form.password = "";
-      });
-    },
     /** 进入操作 */
     handleInto: function(row) {
       const examId = row.realExam.examId;
@@ -512,92 +239,14 @@ export default {
         if(response.code='200'){
           this.$router.push("/people/exam-exam1/examid/" + examId);
         }
-          // console.log(response);
-          // console.log('response');
-          // return;
           //将返回值注释
           // this.userList = response.rows;
           // this.total = response.total;
           // this.loading = false;
           // this.$router.push("/people/exam-exam1/examid/" + examId);
-        }
-      );
-
-      // this.$router.push("/people/exam-exam1/examid/" + userId);
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
       });
+      // this.$router.push("/people/exam-exam1/examid/" + userId);
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    //训练任务下发
-    handleIssued(row) {
-      const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确定编号为"' + userIds + '"的训练任务？').then(function() {
-        //return delUser(userIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('simulator/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('simulator/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    }
   }
 };
 </script>

ruoyi-ui/src/views/system/dept/index.vue

@@ -57,6 +57,7 @@
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
+      <el-col :span="1.5" size="mini" style="color: #e53939;line-height: 25px;">层级顺序： 层次->专业->年级->队->区队</el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>