Merge branch 'dev-web' into dev

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询专业列表
+export function listMajor(query) {
+  return request({
+    url: '/sim/major/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询专业详细
+export function getMajor(majorId) {
+  return request({
+    url: '/sim/major/' + majorId,
+    method: 'get'
+  })
+}
+
+// 新增专业
+export function addMajor(data) {
+  return request({
+    url: '/sim/major',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改专业
+export function updateMajor(data) {
+  return request({
+    url: '/sim/major',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除专业
+export function delMajor(majorId) {
+  return request({
+    url: '/sim/major/' + majorId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询学生列表
+export function listStudent(query) {
+  return request({
+    url: '/sim/student/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询学生详细
+export function getStudent(userId) {
+  return request({
+    url: '/sim/student/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增学生
+export function addStudent(data) {
+  return request({
+    url: '/sim/student',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改学生
+export function updateStudent(data) {
+  return request({
+    url: '/sim/student',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除学生
+export function delStudent(userId) {
+  return request({
+    url: '/sim/student/' + userId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询教师列表
+export function listTeacher(query) {
+  return request({
+    url: '/sim/teacher/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询教师详细
+export function getTeacher(userId) {
+  return request({
+    url: '/sim/teacher/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增教师
+export function addTeacher(data) {
+  return request({
+    url: '/sim/teacher',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改教师
+export function updateTeacher(data) {
+  return request({
+    url: '/sim/teacher',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除教师
+export function delTeacher(userId) {
+  return request({
+    url: '/sim/teacher/' + userId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/router/index.js

@@ -168,7 +168,7 @@ export const dynamicRoutes = [
       }
     ]
   },
-  //得分分析 
+  //得分分析
   {
     path: '/people/train-train3',
     component: Layout,
@@ -190,7 +190,7 @@ export const dynamicRoutes = [
     path: '/people/practice-practice2',
     component: Layout,
     hidden: true,
-    permissions: ['people:practice:edit'],
+    // permissions: ['people:practice:edit'],
     children: [
       {
         path: 'practiceid/:userId(\\d+)',
@@ -200,7 +200,7 @@ export const dynamicRoutes = [
       }
     ]
   },
-//得分分析 
+//得分分析
 {
   path: '/people/practice-practice3',
   component: Layout,

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

@@ -10,7 +10,6 @@
               icon="el-icon-refresh"
               size="mini"
               @click="refreshTable1"
-              v-hasPermi="['system:user:add']"
             >刷新 </el-button>
           </el-col>
           <el-col :span="1.5">
@@ -19,7 +18,6 @@
               plain
               icon="el-icon-edit"
               size="mini"
-              v-hasPermi="['system:user:edit']"
             >批量确认已送</el-button>
           </el-col>
         </el-row>
@@ -46,14 +44,12 @@
                 type="text"
                 icon="el-icon-position"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
               >已送</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-finished"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
               >驳回</el-button>
             </template>
           </el-table-column>
@@ -182,7 +178,7 @@
 }
 </style>
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listStudent, getStudent, delStudent, addStudent, updateStudent } from "@/api/sim/student";
 import { getToken } from "@/utils/auth";
 
 export default {
@@ -306,7 +302,7 @@ export default {
   methods: {
     refreshTable1(){
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -316,7 +312,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;

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

@@ -76,7 +76,6 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['simulator:task:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -87,7 +86,6 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['simulator:user:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -98,10 +96,9 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['simulator:user:remove']"
             >删除</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="warning"
               plain
@@ -110,7 +107,7 @@
               :disabled="single"
               @click="handleKaoshi"
             >当前考试</el-button>
-          </el-col>
+          </el-col> -->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
@@ -263,9 +260,9 @@
                 v-hasPermi="['system:user:remove']"
               >删除</el-button>
             </el-col> -->
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList1" :columns="columns"></right-toolbar>
           </el-row>
-          <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table v-loading="loading" :data="userList1" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="区队/班级" align="center" key="className" prop="className" v-if="columns[0].visible" :show-overflow-tooltip="true" />
             <el-table-column label="专业名称" align="center" key="majorName" prop="majorName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -299,7 +296,7 @@
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
-            @pagination="getList"
+            @pagination="getList1"
           /> 
         </el-col>
       </el-row>
@@ -396,7 +393,8 @@
 }
 </style>
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listStudent, getStudent, delStudent, addStudent, updateStudent } from "@/api/sim/student";
+import { listMajor  } from "@/api/sim/major";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -585,6 +583,8 @@ export default {
       total: 0,
       // 用户表格数据
       userList: null,
+       // 用户表格数据
+      userList1: null,
       // 弹出层标题
       title: "",
       // 部门树选项
@@ -934,7 +934,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           //将返回值注释
           this.userList = response.rows;
           this.total = response.total;
@@ -942,6 +942,16 @@ export default {
         }
       );
     },
+    getList1() {
+      this.loading = true;
+      listMajor(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          //将返回值注释
+          this.userList1 = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
     /** 查询部门下拉树结构 */
     getDeptTree() {
       deptTreeSelect().then(response => {
@@ -1015,29 +1025,29 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
+      // getUser().then(response => {
+      //   this.postOptions = response.posts;
+      //   this.roleOptions = response.roles;
         this.open = true;
         this.title = "新增考试";
-        this.form.password = this.initPassword;
-      });
+        // this.form.password = this.initPassword;
+      // });
     },
 
     /** 修改按钮操作 */
     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);
+      // 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.title = "修改考试";
         this.form.password = "";
-      });
+      // });
     },
 
     /** 当前考试查询 */
@@ -1050,12 +1060,12 @@ export default {
     handleSelectType(row) {
       this.reset();
       const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
-        this.form = response.data;
+      // getUser(userId).then(response => {
+      //   this.form = response.data;
         this.selectopen = true;
         // this.open = false;
         this.title = "选择考题";
-      });
+      // });
     },
     
     /** 提交按钮 */

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

@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <!--用户数据1-->
+      <!--用户数据-->
       <el-col :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
-          <el-form-item label="专业" prop="majorName">
+          <el-form-item label="专业名称" prop="majorName">
             <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入专业"
+              v-model="queryParams.majorName"
+              placeholder="请输入专业名称"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        
+
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="dateRange"
@@ -39,7 +39,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['system:user:add']"
+              v-hasPermi="['sim:major:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -50,7 +50,7 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
+              v-hasPermi="['sim:major:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -61,7 +61,7 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
+              v-hasPermi="['sim:major:remove']"
             >删除</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -69,9 +69,9 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="专业名称" align="center" key="nickName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="备注" align="center" prop="remark"  width="160" />
+          <el-table-column label="编号" align="center" key="majorId" prop="majorId" v-if="columns[0].visible" />
+          <el-table-column label="专业名称" align="center" key="majorName" prop="majorName" v-if="columns[1].visible" />
+          <el-table-column label="备注" align="center" prop="remark"  width="160" v-if="columns[2].visible"/>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[3].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -89,14 +89,14 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
+                v-hasPermi="['sim:major:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
+                v-hasPermi="['sim:major:remove']"
               >删除</el-button>
             </template>
           </el-table-column>
@@ -117,8 +117,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="专业名称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入专业名称" maxlength="30" />
+            <el-form-item label="专业名称" prop="majorName">
+              <el-input v-model="form.majorName" placeholder="请输入专业名称" maxlength="30" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -135,21 +135,15 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    
   </div>
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
+import { listMajor, getMajor, delMajor, addMajor, updateMajor, resetUserPwd  } from "@/api/sim/major";
 export default {
-  name: "User",
+  name: "Major",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect },
+  // components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -170,45 +164,19 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 部门名称
-      deptName: undefined,
-      // 默认密码
-      initPassword: undefined,
       // 日期范围
       dateRange: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
       // 表单参数
       form: {},
       defaultProps: {
         children: "children",
         label: "label"
       },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
-      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        status: undefined,
-        deptId: undefined
+        majorName: undefined,
       },
       // 列信息
       columns: [
@@ -219,53 +187,25 @@ export default {
       ],
       // 表单校验
       rules: {
-        userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        majorName: [
+          { required: true, message: "专业名称不能为空", trigger: "blur" },
         ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
       }
     };
   },
   watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    }
   },
   created() {
     this.getList();
-    // this.getDeptTree();
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg;
-    });
+    // this.getConfigKey("sys.user.initPassword").then(response => {
+    //   this.initPassword = response.msg;
+    // });
   },
   methods: {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listMajor(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -281,7 +221,7 @@ export default {
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
       this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status);
+        return changeUserStatus(row.majorId, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
@@ -296,18 +236,9 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        userId: undefined,
-        deptId: undefined,
-        userName: undefined,
-        nickName: undefined,
-        password: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
-        status: "0",
+        majorId: undefined,
+        majorName: undefined,
         remark: undefined,
-        postIds: [],
-        roleIds: []
       };
       this.resetForm("form");
     },
@@ -325,7 +256,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
+      this.ids = selection.map(item => item.majorId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -345,65 +276,41 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
+      // getMajor().then(response => {
+        // this.postOptions = response.posts;
+        // this.roleOptions = response.roles;
         this.open = true;
-        this.title = "添加用户";
-        this.form.password = this.initPassword;
-      });
+        this.title = "添加专业";
+        // this.form.password = this.initPassword;
+      // });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
+      const majorId = row.majorId || this.ids;
+      getMajor(majorId).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.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 = "";
+        this.title = "修改专业";
+        // this.form.password = "";
       });
     },
-    /** 重置密码按钮操作 */
-    handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
-        inputValidator: (value) => {
-          if (/<|>|"|'|\||\\/.test(value)) {
-            return "不能包含非法字符：< > \" ' \\\ |"
-          }
-        },
-      }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {});
-    },
-    /** 分配角色操作 */
-    handleAuthRole: function(row) {
-      const userId = row.userId;
-      this.$router.push("/system/user-auth/role/" + userId);
-    },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+          if (this.form.majorId != undefined) {
+            updateMajor(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            addMajor(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -414,46 +321,14 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
+      const majorIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除编号为"' + majorIds + '"的数据项？').then(function() {
+        return delMajor(majorIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('system/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>
+</script>

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

@@ -10,7 +10,6 @@
               icon="el-icon-refresh"
               size="mini"
               @click="refreshTable1"
-              v-hasPermi="['system:user:add']"
             >刷新</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -19,7 +18,6 @@
               plain
               icon="el-icon-edit"
               size="mini"
-              v-hasPermi="['system:user:edit']"
             >批量确认已送</el-button>
           </el-col>
         </el-row>
@@ -46,14 +44,12 @@
                 type="text"
                 icon="el-icon-position"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
               >已送</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-finished"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
               >驳回</el-button>
             </template>
           </el-table-column>
@@ -230,7 +226,7 @@
 }
 </style>
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listStudent, getStudent, delStudent, addStudent, updateStudent } from "@/api/sim/student";
 import { getToken } from "@/utils/auth";
 export default {
   // name: "User",
@@ -526,7 +522,7 @@ export default {
     // 刷新
     refreshTable1(){
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -537,7 +533,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;

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

@@ -81,7 +81,6 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -91,7 +90,6 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['system:user:export']"
             >导出</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -102,7 +100,6 @@
               size="mini"
               :disabled="single"
               @click="handleView"
-              v-hasPermi="['system:user:view']"
             >成绩详情</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -342,7 +339,7 @@
 
 </style>
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listStudent, getStudent, delStudent, addStudent, updateStudent } from "@/api/sim/student";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -675,7 +672,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -758,26 +755,26 @@ export default {
     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);
+      // 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.dialogVisible1 = true;
         this.title = "修改成绩";
         this.form.password = "";
-      });
+      // });
     },
      /** 成绩详情按钮操作 */
      handleView(row) {
       this.reset();
-      const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
-        this.form = response.data;
+      // const userId = row.userId || this.ids;
+      // getUser(userId).then(response => {
+        // this.form = response.data;
         this.dialogVisible2 = true;
         this.title = "";
-      });
+      // });
     },
     /** 提交按钮 */
     submitForm: function() {

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

@@ -4,9 +4,9 @@
       <!--用户数据1-->
       <el-col :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
-          <el-form-item label="学号" prop="className">
+          <el-form-item label="学号" prop="UserName">
             <el-input
-              v-model="queryParams.className"
+              v-model="queryParams.UserName"
               placeholder="请输入学号"
               clearable
               style="width: 150px"
@@ -14,9 +14,9 @@
             />
           </el-form-item>
 
-          <el-form-item label="姓名" prop="className">
+          <el-form-item label="姓名" prop="nickName">
             <el-input
-              v-model="queryParams.className"
+              v-model="queryParams.nickName"
               placeholder="请输入姓名"
               clearable
               style="width: 150px"
@@ -24,7 +24,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="班级名称" prop="className">
+          <!-- <el-form-item label="班级名称" prop="className">
             <el-input
               v-model="queryParams.className"
               placeholder="请输入班级名称"
@@ -41,7 +41,7 @@
               style="width: 200px"
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
         
           <el-form-item label="创建时间">
             <el-date-picker
@@ -99,8 +99,8 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="学号" align="center" key="xuehao" prop="xuehao" v-if="columns[1].visible" />
-          <el-table-column label="姓名" align="center" key="xingming" prop="xingming" v-if="columns[2].visible" />
+          <el-table-column label="学号" align="center" key="userName" prop="userName" v-if="columns[1].visible" />
+          <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" />
           <el-table-column label="区队/班级" align="center" key="className" prop="className" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="专业名称" align="center" key="majorName" prop="majorName" v-if="columns[4].visible" :show-overflow-tooltip="true" />
           <el-table-column label="备注" align="center" key="remark" prop="remark" v-if="columns[5].visible" :show-overflow-tooltip="true" />
@@ -155,19 +155,58 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="班级名称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入班级名称" maxlength="30" />
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="学号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入学号" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="登录密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="20" show-password/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="专业" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入专业" maxlength="30" />
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+          </el-col> 
         </el-row>
+
+        <el-row>-->
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col :span="12">
+            <el-form-item label="角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+                <el-option
+                  v-for="item in roleOptions"
+                  :key="item.roleId"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -187,13 +226,13 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listStudent, getStudent, delStudent, addStudent, updateStudent } from "@/api/sim/student";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "User",
+  name: "Student",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
   components: { Treeselect },
   data() {
@@ -232,21 +271,6 @@ export default {
         children: "children",
         label: "label"
       },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
-      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -261,8 +285,8 @@ export default {
         { key: 0, label: `编号`, visible: true },
         { key: 1, label: `编号`, visible: true },
         { key: 2, label: `姓名`, visible: true },
-        { key: 3, label: `班级名称`, visible: true },
-        { key: 4, label: `专业`, visible: true },
+        { key: 3, label: `班级名称`, visible: false },
+        { key: 4, label: `专业`, visible: false },
         { key: 5, label: `备注`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
@@ -280,20 +304,6 @@ export default {
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
           { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
         ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
       }
     };
   },
@@ -314,7 +324,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -346,17 +356,11 @@ export default {
     reset() {
       this.form = {
         userId: undefined,
-        deptId: undefined,
         userName: undefined,
         nickName: undefined,
         password: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
         status: "0",
         remark: undefined,
-        postIds: [],
-        roleIds: []
       };
       this.resetForm("form");
     },
@@ -394,26 +398,26 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
+      // getUser().then(response => {
+        // this.postOptions = response.posts;
+        // this.roleOptions = response.roles;
         this.open = true;
-        this.title = "添加用户";
+        this.title = "添加学员";
         this.form.password = this.initPassword;
-      });
+      // });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
+      getStudent(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.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.title = "修改学员";
         this.form.password = "";
       });
     },
@@ -446,13 +450,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+            updateStudent(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            addStudent(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -464,45 +468,14 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
+      this.$modal.confirm('是否确认删除编号为"' + userIds + '"的数据项？').then(function() {
+        return delStudent(userIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('system/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/peoples/task/index.vue

@@ -104,8 +104,8 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="任务名称" align="center" key="nickName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="模拟器型号" align="center" key="userName" prop="userName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="任务名称" align="center" key="mingc" prop="mingc" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="模拟器型号" align="center" key="mingc" prop="mingc" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="故障现象数量" align="center" key="xianxiang" prop="xianxiang" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="故障部位数量" align="center" key="buwei" prop="buwei" v-if="columns[4].visible" :show-overflow-tooltip="true" />
           <el-table-column label="创建者" align="center" key="creater" prop="creater" v-if="columns[5].visible" :show-overflow-tooltip="true" />
@@ -482,7 +482,7 @@
   }
 </style>
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listStudent, getStudent, delStudent, addStudent, updateStudent } from "@/api/sim/student";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -2871,7 +2871,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           //将返回值注释
           this.userList = response.rows;
           this.total = response.total;
@@ -2985,23 +2985,23 @@ export default {
     handleAdd() {
 
       this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
+      // 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 => {
+      // getUser().then(response => {
         //this.postOptions = response.posts;
         //this.roleOptions = response.roles;
         this.zijianopen = true;
         this.title = "故障设置自检";
-      });
+      // });
     },
 
     /** 修改按钮操作 */

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

@@ -70,7 +70,6 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['simulator:task:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -81,7 +80,6 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['simulator:user:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -92,11 +90,10 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['simulator:user:remove']"
             >删除</el-button>
           </el-col>
 
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="warning"
               plain
@@ -105,7 +102,7 @@
               :disabled="single"
               @click="handleKaoshi"
             >当前练习</el-button>
-          </el-col>
+          </el-col> -->
           
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
@@ -113,7 +110,7 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <!-- <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
-          <el-table-column label="练习名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="练习名称" align="center" key="userName1" prop="userName1" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="练习时间" align="center" key="kaoshiTime" prop="kaoshiTime" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="模拟器类型" align="center" key="liexing" prop="liexing" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="创建老师" align="center" key="creater" prop="creater" v-if="columns[4].visible" :show-overflow-tooltip="true" />
@@ -144,14 +141,12 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['simulator:user:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['simulator:user:remove']"
               >删除</el-button>
               
             </template>
@@ -391,7 +386,7 @@
 }
 </style>
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listStudent, getStudent, delStudent, addStudent, updateStudent } from "@/api/sim/student";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -916,7 +911,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listStudent(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           //将返回值注释
           this.userList = response.rows;
           this.total = response.total;
@@ -997,29 +992,29 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
+      // getUser().then(response => {
+      //   this.postOptions = response.posts;
+      //   this.roleOptions = response.roles;
         this.open = true;
         this.title = "新增练习";
         this.form.password = this.initPassword;
-      });
+      // });
     },
 
     /** 修改按钮操作 */
     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);
+      // 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 = "";
-      });
+      // });
     },
 
     /** 当前考试查询 */
@@ -1032,12 +1027,12 @@ export default {
     handleSelectType(row) {
       this.reset();
       const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
-        this.form = response.data;
+      // getUser(userId).then(response => {
+        // this.form = response.data;
         this.selectopen = true;
         // this.open = false;
         this.title = "选择考题";
-      });
+      // });
     },
     
     /** 提交按钮 */

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

@@ -19,6 +19,18 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </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>
@@ -182,6 +194,8 @@ export default {
       open: false,
       // 是否展开，默认全部展开
       isExpandAll: true,
+      // 日期范围
+      dateRange: [],
       // 重新渲染表格状态
       refreshTable: true,
       // 查询参数
@@ -226,7 +240,7 @@ export default {
     /** 查询部门列表 */
     getList() {
       this.loading = true;
-      listDept(this.queryParams).then(response => {
+      listDept(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.deptList = this.handleTree(response.data, "deptId");
         this.loading = false;
       });
@@ -267,6 +281,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

ruoyi-ui/src/views/system/user/profile/userInfo.vue

@@ -48,7 +48,7 @@ export default {
           }
         ],
         phonenumber: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          { required: false, message: "手机号码不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",

ruoyi-ui/src/views/teacher/index.vue

@@ -4,10 +4,10 @@
       <!--教师数据-->
       <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="教工号" prop="userName">
+          <el-form-item label="账号" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入教工号"
+              placeholder="请输入账号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -71,7 +71,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['system:user:add']"
+              v-hasPermi="['sim:teacher:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -82,7 +82,7 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
+              v-hasPermi="['sim:teacher:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -93,7 +93,7 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
+              v-hasPermi="['sim:teacher:remove']"
             >删除</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -102,7 +102,7 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="ID" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="教工号" align="center" key="userName" prop="userName" v-if="columns[1].visible" />
+          <el-table-column label="账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" />
           <el-table-column label="教师名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[3].visible" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[4].visible">
@@ -132,21 +132,21 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
+                v-hasPermi="['sim:teacher:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
+                v-hasPermi="['sim:teacher:remove']"
               >删除</el-button>
 
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['sim:teacher:resetPwd', 'sim:teacher: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="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                    v-hasPermi="['sim:teacher:resetPwd']">重置密码</el-dropdown-item>
                   <!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
                     v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item> -->
                 </el-dropdown-menu>
@@ -170,8 +170,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="教工号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入教工号" maxlength="30" />
+            <el-form-item v-if="form.userId == undefined" label="账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入账号" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -239,13 +239,13 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listTeacher, getTeacher, delTeacher, addTeacher, updateTeacher } from "@/api/sim/teacher";
 import { getToken } from "@/utils/auth";
 // import Treeselect from "@riophae/vue-treeselect";
 // import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "User",
+  name: "Teacher",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
   // components: { Treeselect },
   data() {
@@ -311,8 +311,8 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `ID`, visible: false },
-        { key: 1, label: `教工号`, visible: true },
+        { key: 0, label: `ID`, visible: true },
+        { key: 1, label: `账号`, visible: true },
         { key: 2, label: `教师名称`, visible: true },
         { key: 3, label: `手机号码`, visible: true },
         { key: 4, label: `状态`, visible: true },
@@ -359,7 +359,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listTeacher(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -431,27 +431,27 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
+      // getUser().then(response => {
+      //   this.postOptions = response.posts;
+      //   this.roleOptions = response.roles;
         this.open = true;
         this.title = "添加教师";
         this.form.password = this.initPassword;
-      });
+      // });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
+      getTeacher(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.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 = "";
+        // this.form.password = "";
       });
     },
     /** 重置密码按钮操作 */
@@ -483,13 +483,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+            updateTeacher(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            addTeacher(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -501,8 +501,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
+      this.$modal.confirm('是否确认删除编号为"' + userIds + '"的数据项？').then(function() {
+        return delTeacher(userIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");