修改教师管理

src/components/Register.vue

@@ -7,7 +7,7 @@
         :close-on-click-modal="false"
         width="40%"
         style="border-radius: 40px"
-        top="5vh"
+        top="15vh"
       >
         <div slot="title">
           <el-form
@@ -42,7 +42,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="name">
+                <el-form-item label="性别" prop="sex">
                   <el-radio-group v-model="ruleForm.sex" style="margin-left: 20px">
                     <el-radio label="1">男</el-radio>
                     <el-radio label="0">女</el-radio>
@@ -51,7 +51,7 @@
               </el-col>
             </el-row>
 
-            <el-form-item v-if="isView" label="密码" prop="password">
+            <!-- <el-form-item v-if="isView" label="密码" prop="password">
               <el-input
                 type="password"
                 v-model="ruleForm.password"
@@ -64,7 +64,7 @@
                 v-model="ruleForm.comPassword"
                 autocomplete="off"
               ></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <div class="dig_button">
               <el-button type="info" round @click="resetData()">重置</el-button>
               <!-- <el-button type="success" round @click="submitForm('ruleForm')"
@@ -159,10 +159,11 @@ export default {
       rules: {
         group: [{ required: true, message: "请选择组织架构", trigger: "blur" }],
         studentNumber: [{ required: true, message: "请输入学号", trigger: "blur" }],
-        name: [{ required: true, message: "请输入学号", trigger: "blur" }],
+        name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+        sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
         // password: [{ required: true, message: "请输密码", trigger: "blur" }],
-        password: [{ required: true, validator: validatePass, trigger: "blur" }],
-        comPassword: [{ required: true, validator: validateComPass, trigger: "blur" }],
+        // password: [{ required: true, validator: validatePass, trigger: "blur" }],
+        // comPassword: [{ required: true, validator: validateComPass, trigger: "blur" }],
       },
     };
   },
@@ -177,8 +178,8 @@ export default {
       this.ruleForm.group = "";
       this.ruleForm.name = "";
       this.ruleForm.studentNumber = "";
-      this.ruleForm.password = "";
-      this.ruleForm.comPassword = "";
+      // this.ruleForm.password = "";
+      // this.ruleForm.comPassword = "";
       this.ruleForm.sex = "";
     },
     //获取组织架构方法--------------------开始-----------------------
@@ -354,8 +355,8 @@ export default {
       this.ruleForm.group = "";
       this.ruleForm.name = "";
       this.ruleForm.studentNumber = "";
-      this.ruleForm.password = "";
-      this.ruleForm.comPassword = "";
+      // this.ruleForm.password = "";
+      // this.ruleForm.comPassword = "";
       this.ruleForm.sex = "";
       this.dialogVisible = false;
     },
@@ -371,7 +372,7 @@ export default {
       this.disableFlag = true;
       let validSp = [];
       if (this.isView) {
-        validSp = ["group", "studentNumber", "name", "sex", "password", "comPassword"];
+        validSp = ["group", "studentNumber", "name", "sex"];
       } else {
         validSp = ["group", "studentNumber", "name", "sex"];
       }
@@ -381,7 +382,7 @@ export default {
           aa.push(valid);
           //判断是编辑还是新增
           if (this.isView) {
-            if (aa.length == 6) {
+            if (aa.length == 4) {
               this.register();
             } else {
               this.disableFlagStatus();
@@ -402,13 +403,13 @@ export default {
       });
     },
     register() {
-      if (this.ruleForm.group.length == 1) {
-        this.$message({
-          message: "请选择专业节点",
-          type: "warning",
-        });
-        return;
-      }
+      // if (this.ruleForm.group.length == 1) {
+      //   this.$message({
+      //     message: "请选择专业节点",
+      //     type: "warning",
+      //   });
+      //   return;
+      // }
       this.queryOrgName();
 
       console.log(this.ruleForm.group);
@@ -422,8 +423,8 @@ export default {
           userNo: this.ruleForm.studentNumber,
           userName: this.ruleForm.name,
           gender: this.ruleForm.sex,
-          password: md5(this.ruleForm.password),
-          //roleType     1普通用户    roleType   管理员
+          // password: md5(this.ruleForm.password),
+          //roleType     1学生
           roleType: "1",
         },
         (res) => {
@@ -522,6 +523,7 @@ export default {
 }
 
 .dig_button {
+  margin-top: 20px;
   display: flex;
   width: 100%;
   justify-content: space-around;

src/components/TeacherRegister.vue

@@ -42,7 +42,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="name">
+                <el-form-item label="性别" prop="sex">
                   <el-radio-group v-model="ruleForm.sex" style="margin-left: 20px">
                     <el-radio label="1">男</el-radio>
                     <el-radio label="0">女</el-radio>
@@ -160,6 +160,7 @@ export default {
         // group: [{ required: true, message: "请选择组织架构", trigger: "blur" }],
         studentNumber: [{ required: true, message: "请输入编号", trigger: "blur" }],
         name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+        sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
         // password: [{ required: true, message: "请输密码", trigger: "blur" }],
         // password: [{ required: true, validator: validatePass, trigger: "blur" }],
         // comPassword: [{ required: true, validator: validateComPass, trigger: "blur" }],

src/components/instructorRegister.vue

@@ -58,7 +58,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="name">
+                <el-form-item label="性别" prop="sex">
                   <el-radio-group v-model="ruleForm.sex" style="margin-left: 20px">
                     <el-radio label="1">男</el-radio>
                     <el-radio label="0">女</el-radio>
@@ -165,7 +165,8 @@ export default {
       rules: {
         grade: [{ required: true, message: "请选择管理班级", trigger: "blur" }],
         studentNumber: [{ required: true, message: "请输入编号", trigger: "blur" }],
-        name: [{ required: true, message: "请输入编号", trigger: "blur" }],
+        name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+        sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
         // password: [{ required: true, message: "请输密码", trigger: "blur" }],
         // password: [{ required: true, validator: validatePass, trigger: "blur" }],
         // comPassword: [{ required: true, validator: validateComPass, trigger: "blur" }],

src/views/manage/instructorManage.vue

@@ -153,7 +153,7 @@
             </div>
           </div>
           <div class="user_out">
-            <div class="user_out_sub">学号</div>
+            <div class="user_out_sub">编号</div>
             <div class="user_out_subNext">
               {{ view.studentNumber }}
             </div>

src/views/manage/teacherManage.vue

@@ -10,7 +10,7 @@
             <el-input
               v-model="studentNumber"
               clearable
-              placeholder="请输入学号"
+              placeholder="请输入编号"
             ></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
             <el-cascader
@@ -79,7 +79,7 @@
             width=""
           >
           </el-table-column>
-          <el-table-column prop="userNo" label="学号" align="center" width="">
+          <el-table-column prop="userNo" label="编号" align="center" width="">
           </el-table-column>
           <el-table-column
             prop="gender"
@@ -152,7 +152,7 @@
             </div>
           </div>
           <div class="user_out">
-            <div class="user_out_sub">学号</div>
+            <div class="user_out_sub">编号</div>
             <div class="user_out_subNext">
               {{ view.studentNumber }}
             </div>
@@ -337,8 +337,6 @@ export default {
         : "",
     };
 
-    console.log("this.userInfo");
-    console.log(this.userInfo);
     this.getChannel();
     if (!this.userInfo) {
       //如果用户信息不存在跳转登陆页

src/views/manage/userManage.vue

@@ -14,7 +14,7 @@
             ></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
             <el-cascader
-             v-show="userInfo.roleType=='3'"
+              v-show="userInfo.roleType == '3'"
               placeholder="请选择组织架构"
               v-model="group"
               :options="groupData"
@@ -23,11 +23,9 @@
             ></el-cascader>
             <!-- :props="{ checkStrictly: true }" -->
             <el-cascader
-              v-show="userInfo.roleType=='2'"
               placeholder="请选择组织架构"
               v-model="group"
               :options="groupData"
-            
               clearable
             ></el-cascader>
             &nbsp;&nbsp;&nbsp;&nbsp;
@@ -424,7 +422,7 @@ export default {
               // console.log(forRes)
               let resultRes = this.deleteChildren(forRes);
               console.log("格式化的结构且去掉children");
-              
+
               this.groupData = resultRes[0].children;
             } else {
               this.groupData = [];
@@ -546,7 +544,7 @@ export default {
     searchList() {
       let url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
         this.pageNum
-      }${this.sex == "" ? "" : `&gender=${this.sex}`}${
+      }&roleType=1${this.sex == "" ? "" : `&gender=${this.sex}`}${
         this.group.length == 0
           ? `&orgNo=${this.userInfo.orgNo}`
           : `&orgNo=${this.group[this.group.length - 1]}`