修改测试管理端所有显示问题

src/components/ComparePlanUser.vue

@@ -34,7 +34,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
@@ -138,12 +138,12 @@
                     姓名：{{ multipleSelection[0].userName }}
                   </div>
                   <div v-if="multipleSelection.length == 2">
-                    学号/编号：{{ multipleSelection[0].userNo }}
+                    工号：{{ multipleSelection[0].userNo }}
                   </div>
                   <div v-if="multipleSelection.length == 2">测试用时：{{ useTime1 }}</div>
                 </div>
               </div>
-              <div class="compare_group">所属组织架构</div>
+              <div class="compare_group">所属组织</div>
               <div class="compare_group_detail">
                 {{ orgName1 }}
               </div>
@@ -158,12 +158,12 @@
                     姓名：{{ multipleSelection[1].userName }}
                   </div>
                   <div v-if="multipleSelection.length == 2">
-                    学号/编号：{{ multipleSelection[1].userNo }}
+                    工号：{{ multipleSelection[1].userNo }}
                   </div>
                   <div v-if="multipleSelection.length == 2">测试用时：{{ useTime2 }}</div>
                 </div>
               </div>
-              <div class="compare_group">所属组织架构</div>
+              <div class="compare_group">所属组织</div>
               <div class="compare_group_detail">
                 {{ orgName2 }}
               </div>

src/components/CompareUser.vue

@@ -163,11 +163,11 @@
                 <div class="compare_user1_info">
                   <div>姓名：{{ userInfo.userName }}</div>
 
-                  <div>学号/编号：{{ userInfo.userNo }}</div>
+                  <div>工号：{{ userInfo.userNo }}</div>
                   <div>测试用时：{{ useTime1 }}</div>
                 </div>
               </div>
-              <div class="compare_group">所属组织架构</div>
+              <div class="compare_group">所属组织</div>
               <div class="compare_group_detail">
                 {{ orgName1 }}
               </div>
@@ -178,11 +178,11 @@
                 <img v-show="userInfo.gender=='0'" src="../assets/report/woman1.png" />
                 <div class="compare_user1_info">
                   <div>姓名：{{ userInfo.userName }}</div>
-                  <div>学号/编号：{{ userInfo.userNo }}</div>
+                  <div>工号：{{ userInfo.userNo }}</div>
                   <div>测试用时：{{ useTime2 }}</div>
                 </div>
               </div>
-              <div class="compare_group">所属组织架构</div>
+              <div class="compare_group">所属组织</div>
               <div class="compare_group_detail">
                 {{ orgName2 }}
               </div>

src/components/GroupCompare.vue

@@ -19,8 +19,8 @@
         >
           {{ planInfo.planName }}群体报告统计
         </p>
-        <div>
-          <el-form :inline="true">
+        <div style="margin-bottom: 60px;">
+          <!-- <el-form :inline="true">
             <el-form-item label="首选项" class="plan_lang">
               <el-select v-model="groupType" @change="groupChangeFun">
                 <el-option label="全院" value="1"> </el-option>
@@ -38,7 +38,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-form>
+          </el-form> -->
         </div>
         <div class="yiyu_class">
           <div class="yiyu_left">

src/components/PlanRegister.vue

@@ -35,14 +35,14 @@
                 <el-input v-model="ruleForm.planName"></el-input>
               </el-form-item>
               <!-- <el-button v-show="true">asasas</el-button> -->
-              <div v-if="userInfo.roleType != '3'">
+              <!-- <div v-if="userInfo.roleType != '3'">
                 <el-form-item label="测评对象" prop="planType">
                   <el-radio-group v-model="ruleForm.planType" @change="teacherChange">
                     <el-radio label="1">教师</el-radio>
                     <el-radio label="0">学生</el-radio>
                   </el-radio-group>
                 </el-form-item>
-              </div>
+              </div> -->
 
               <el-form-item label="结束时间" prop="endTime">
                 <el-date-picker
@@ -229,7 +229,7 @@ export default {
       ruleForm: {
         //所属组织架构
         planName: "",
-        planType: "0",
+        planType: "1",
         endTime: "",
         checkboxGroup2: [],
         checkedList: [],

src/components/PlanReport.vue

@@ -68,7 +68,7 @@
               <el-table-column
                 prop="userNo"
                 v-if="planType == '0'"
-                label="学号"
+                label="工号"
                 align="center"
                 width=""
               >
@@ -76,14 +76,14 @@
               <el-table-column
                 prop="userNo"
                 v-if="planType == '1'"
-                label="编号"
+                label="工号"
                 align="center"
                 width=""
               >
               </el-table-column>
               <el-table-column
                 prop="orgName"
-                label="所属组织架构"
+                label="所属组织"
                 align="center"
                 width=""
               >
@@ -204,7 +204,7 @@
               width=""
             >
             </el-table-column>
-            <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
+            <el-table-column prop="orgName" label="所属组织" align="center" width="">
             </el-table-column>
             <el-table-column label="症状" align="center" v-if="userType == '心理异常'">
               <template slot-scope="scope">
@@ -304,7 +304,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="年级选择">
+          <!-- <el-form-item label="年级选择">
             <el-select v-model="grade" placeholder="请选择年级" @change="gradeChange">
               <el-option
                 v-for="item in gradeList"
@@ -313,7 +313,7 @@
                 :value="item"
               ></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="组织架构选择" class="org_class">
             <el-select
               :popper-append-to-body="false"
@@ -457,7 +457,7 @@
             <el-table-column
               prop="userNo"
               v-if="planType == '0'"
-              label="学号"
+              label="工号"
               align="center"
               width=""
             >
@@ -465,12 +465,12 @@
             <el-table-column
               prop="userNo"
               v-if="planType == '1'"
-              label="编号"
+              label="工号"
               align="center"
               width=""
             >
             </el-table-column>
-            <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
+            <el-table-column prop="orgName" label="所属组织" align="center" width="">
             </el-table-column>
             <el-table-column
               prop="dimensionName"
@@ -557,7 +557,7 @@
             <el-table-column
               prop="userNo"
               v-if="planType == '0'"
-              label="学号"
+              label="工号"
               align="center"
               width=""
             >
@@ -565,12 +565,12 @@
             <el-table-column
               prop="userNo"
               v-if="planType == '1'"
-              label="编号"
+              label="工号"
               align="center"
               width=""
             >
             </el-table-column>
-            <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
+            <el-table-column prop="orgName" label="所属组织" align="center" width="">
             </el-table-column>
             <el-table-column
               prop="usedTime1"

src/components/PlanUserStatus.vue

@@ -53,7 +53,7 @@
                 >
                 </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="userNo" label="学号" align="center" width=""  v-if="proDataLin.planType=='0'">
                 </el-table-column> -->
@@ -102,7 +102,7 @@
                 </el-table-column>
                 <el-table-column
                   prop="orgName"
-                  label="所属组织架构"
+                  label="所属组织"
                   align="center"
                   width=""
                 >

src/components/Report.vue

@@ -229,15 +229,15 @@
                     <div class="report_info_user">
                       <span class="info">姓名:&nbsp;&nbsp;{{ proDataLin.userName }}</span>
                       <span class="info" v-show="proDataLin.roleType == '2'"
-                        >编号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
+                        >工号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
                       >
                       <span class="info" v-show="proDataLin.roleType == '1'"
-                        >学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
+                        >工号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
                       >
                       <!-- roleType -->
                       <span class="info">测试用时:&nbsp;&nbsp;{{ useTime }}</span>
                       <span class="info"
-                        >所属组织结构:&nbsp;&nbsp;<span style="">{{
+                        >所属组织:&nbsp;&nbsp;<span style="">{{
                           orgName
                         }}</span></span
                       >
@@ -689,6 +689,7 @@ export default {
       let url = `/userRecordScore/findByFlagAndUserNo?planId=${params.planId}&userNo=${params.userNo}&flag=${params.flag}`;
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {
+          debugger;
           // this.reportData = res.data;
           let listTmp1 = [];
           listTmp1 = res.data.dimensionScore.filter((item) => {
@@ -896,6 +897,7 @@ export default {
       }
     },
     open(val) {
+  
       this.proDataLin = val;
       this.dialogVisible = true;
       //查询用户下边的计划

src/components/Report1.vue

@@ -173,14 +173,14 @@
                       <span class="info">姓名:&nbsp;&nbsp;{{ proDataLin.userName }}</span>
 
                       <span class="info" v-show="proDataLin.planType == '0'"
-                        >学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
+                        >工号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
                       >
                       <span class="info" v-show="proDataLin.planType == '1'"
-                        >编号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
+                        >工号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
                       >
                       <span class="info">测试用时:&nbsp;&nbsp;{{ useTime }}</span>
                       <span class="info"
-                        >所属组织结构:&nbsp;&nbsp;<span style="">{{
+                        >所属组织:&nbsp;&nbsp;<span style="">{{
                           orgName
                         }}</span></span
                       >

src/components/TeacherRegister.vue

@@ -32,7 +32,7 @@
                 clearable
               ></el-cascader>
             </el-form-item>
-            <el-form-item label="编号" prop="studentNumber">
+            <el-form-item label="工号" prop="studentNumber">
               <el-input v-model="ruleForm.studentNumber"></el-input>
             </el-form-item>
             <el-row>
@@ -160,7 +160,7 @@ export default {
       isView: true,
       rules: {
         group: [{ required: true, message: "请选择组织架构", trigger: "blur" }],
-        studentNumber: [{ required: true, message: "请输入编号", trigger: "blur" },{ min: 3, max: 18, message: "编号需3到18位", trigger: "blur" }],
+        studentNumber: [{ required: true, message: "请输入工号", trigger: "blur" },{ min: 3, max: 18, message: "工号需3到18位", trigger: "blur" }],
         name: [{ required: true, message: "请输入姓名", trigger: "blur" },{ min: 1, max: 20, message: "姓名最长长度为20位", trigger: "blur" }],
         sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
         // password: [{ required: true, message: "请输密码", trigger: "blur" }],

src/router/router.js

@@ -35,8 +35,8 @@ export const routerList = [
         },
       //教师管理
       {
-        path: "teacherManage",
-        name: "teacherManage",
+        path: "employeeManage",
+        name: "employeeManage",
         component: () => import("../views/manage/teacherManage"),
       },
       //辅导员管理

src/views/manage/channelInfo/channelUserManage.vue

@@ -10,7 +10,7 @@
             <el-input
               v-model="studentNumber"
               clearable
-              placeholder="请输入学号/编号"
+              placeholder="请输入工号"
             ></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
             <el-cascader
@@ -53,7 +53,7 @@
               <el-radio v-model="sex" label="0">女</el-radio>
             </div>
             &nbsp;&nbsp;&nbsp;&nbsp; -->
-            <div style="display: flex; flex-direction: row; align-items: center">
+            <!-- <div style="display: flex; flex-direction: row; align-items: center">
               <span
                 style="
                   font-size: 16px;
@@ -66,7 +66,7 @@
               <el-radio v-model="userType" label="2">教师</el-radio>
               <el-radio v-model="userType" label="1">学生</el-radio>
             </div>
-            &nbsp;&nbsp;&nbsp;&nbsp;
+            &nbsp;&nbsp;&nbsp;&nbsp; -->
             <el-button type="primary" round icon="el-icon-search" @click="searchTarget"
               >搜索</el-button
             >
@@ -92,7 +92,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="roleType"
@@ -112,7 +112,7 @@
             :formatter="genderFun"
           >
           </el-table-column>
-          <el-table-column prop="orgName" label="所属专业" align="center" width="">
+          <el-table-column prop="orgName" label="所属组织" align="center" width="">
           </el-table-column>
           <el-table-column label="操作" width="auto" align="center">
             <template slot-scope="scope">
@@ -176,7 +176,7 @@ export default {
       //搜索的组织架构
       // 搜索需要的性别
       sex: "",
-      userType: "",
+      userType: "2",
 
       group: "",
       ppData: [],
@@ -383,7 +383,7 @@ export default {
       // 搜索需要的性别
       this.sex = "";
       this.group = "";
-      this.userType='';
+      this.userType='2';
       this.searchTarget();
     },
 

src/views/manage/channelInfo/invite.vue

@@ -17,7 +17,7 @@
               >
               </el-option>
             </el-select>
-            &nbsp;&nbsp;&nbsp;&nbsp;
+            <!-- &nbsp;&nbsp;&nbsp;&nbsp;
             <div style="display: flex; flex-direction: row; align-items: center">
               <span
                 style="
@@ -30,7 +30,7 @@
               >
               <el-radio v-model="planType" label="1">教师</el-radio>
               <el-radio v-model="planType" label="0">学生</el-radio>
-            </div>
+            </div> -->
             
             &nbsp;&nbsp;&nbsp;&nbsp;
             <el-button type="primary" round icon="el-icon-search" @click="searchTarget"
@@ -96,13 +96,13 @@
             align="center"
             width=""
           ></el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="planType"
             label="测评对象"
             align="center"
             width=""
             :formatter="planTypeFun"
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             prop="planStatus"
             label="状态"
@@ -259,12 +259,12 @@
               {{ view.creatUser }}
             </div>
           </div>
-          <div class="user_out">
+          <!-- <div class="user_out">
             <div class="user_out_sub">测试对象</div>
             <div class="user_out_subNext">
               {{ view.planType=='1'?'教师':'学生' }}
             </div>
-          </div>
+          </div> -->
           <div class="user_out">
             <div class="user_out_sub">状态</div>
             <div class="user_out_subNext">
@@ -397,7 +397,7 @@ export default {
   },
   data() {
     return {
-      planType:'',
+      planType:'1',
       basePath: basePath,
       //上传文件的弹出款的标志
       fileVisible: false,
@@ -674,7 +674,7 @@ export default {
       this.planName = "";
       //搜索的用户编号
       this.planStatus = "";
-      this.planType=''
+      this.planType='1'
       this.searchTarget();
     },
 

src/views/manage/channelInfo/orderSettlement.vue

@@ -428,22 +428,22 @@ export default {
       if (data.val == "1") {
         //管理员编辑
         if (this.userInfo.roleType == "5" && data.data.level == "3") {
-          this.isShowGrade = true;
+          this.isShowGrade = false;
         }
         //院管理员编辑
         if (this.userInfo.roleType == "4" && data.data.level == "2") {
-          this.isShowGrade = true;
+          this.isShowGrade = false;
         }
       }
 
       if (data.val == "0") {
         //管理员新增  是否显示届数
         if (this.userInfo.roleType == "5" && data.data.level == "2") {
-          this.isShowGrade = true;
+          this.isShowGrade = false;
         }
         //院管理员新增 是否显示届数
         if (this.userInfo.roleType == "4" && data.data.level == "1") {
-          this.isShowGrade = true;
+          this.isShowGrade = false;
         }
       }
       //当是管理员登录时
@@ -547,7 +547,7 @@ export default {
         // data.id = this.treeData.id;
         //将参数调用接口
         this.currentSelectObj.orgName = this.ruleForm.orgName;
-        this.currentSelectObj.extend = this.ruleForm.grade;
+        this.currentSelectObj.extend = '-1';
         this.$http.post(`/org/addOrUpdateOrg`, this.currentSelectObj, (res) => {
           //  this.$toast.success({message:'成功'});
           if (res && res.code == 200) {
@@ -569,7 +569,7 @@ export default {
         let data = {
           parentOrgNo: this.currentSelectObj.orgNo,
           orgName: this.ruleForm.orgName,
-          extend: this.ruleForm.grade,
+          extend: '-1',
         };
         //将参数调用接口
         this.$http.post(`/org/addOrUpdateOrg`, data, (res) => {

src/views/manage/channelManagement/channelManagement.vue

@@ -39,7 +39,7 @@
                 :key="item.id"
               ></el-option>
             </el-select>
-            &nbsp;&nbsp;&nbsp;&nbsp;
+            <!-- &nbsp;&nbsp;&nbsp;&nbsp;
             <div style="display: flex; flex-direction: row; align-items: center">
               <span
                 style="
@@ -52,7 +52,7 @@
               >
               <el-radio v-model="planType" label="1">教师</el-radio>
               <el-radio v-model="planType" label="0">学生</el-radio>
-            </div>
+            </div> -->
             &nbsp;&nbsp;&nbsp;&nbsp;
             <el-button type="primary" round icon="el-icon-search" @click="searchTarget"
               >搜索</el-button
@@ -509,7 +509,7 @@ export default {
       //搜索的组织架构
       // 搜索需要的性别
       sex: "",
-      planType: "",
+      planType: "1",
 
       planName: "",
       planTime: "",
@@ -1066,7 +1066,7 @@ export default {
       this.planTime = "";
       this.group = "";
       this.planStatus = "";
-      this.planType = "";
+      this.planType = "1";
       this.searchTarget();
     },
 

src/views/manage/channelManagement/contract.vue

@@ -28,7 +28,7 @@
               v-show="isUser"
               v-model="studentNumber"
               clearable
-              placeholder="请输入学号"
+              placeholder="请输入工号"
             ></el-input>
             <div v-show="isUser">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             <el-input
@@ -54,7 +54,7 @@
               :options="groupData"
               clearable
             ></el-cascader>
-            &nbsp;&nbsp;&nbsp;&nbsp;
+            <!-- &nbsp;&nbsp;&nbsp;&nbsp;
             <div
               style="display: flex; flex-direction: row; align-items: center"
               v-show="isUser"
@@ -70,10 +70,10 @@
               >
               <el-radio v-model="userType" label="2">教师</el-radio>
               <el-radio v-model="userType" label="1">学生</el-radio>
-            </div>
+            </div> -->
             <div v-show="isUser">&nbsp;&nbsp;&nbsp;&nbsp;</div>
 
-            <div
+            <!-- <div
               style="display: flex; flex-direction: row; align-items: center"
               v-show="!isUser"
             >
@@ -90,7 +90,7 @@
               <el-radio v-model="planType" label="0">学生</el-radio>
             </div>
 
-            &nbsp;&nbsp;&nbsp;&nbsp;
+            &nbsp;&nbsp;&nbsp;&nbsp; -->
             <el-button type="primary" round icon="el-icon-search" @click="searchTarget"
               >搜索</el-button
             >
@@ -120,7 +120,7 @@
           <el-table-column
             v-if="isUser"
             prop="userNo"
-            label="学号"
+            label="工号"
             align="center"
             width=""
           >
@@ -139,7 +139,7 @@
           <el-table-column
             v-if="isUser"
             prop="orgName"
-            label="所属组织架构"
+            label="所属组织"
             align="center"
             width=""
           >
@@ -419,9 +419,9 @@ export default {
       studentNumber: "",
       //搜索的组织架构
       // 搜索需要的性别
-      planType: "",
+      planType: "1",
       sex: "",
-      userType: "",
+      userType: "2",
       group: "",
       ppData: [],
       groupData: [],
@@ -714,8 +714,8 @@ export default {
       // 搜索需要的性别
       this.planName = "";
       this.group = "";
-      this.userType = "";
-      this.planType = "";
+      this.userType = "2";
+      this.planType = "1";
       this.searchTarget();
     },
 

src/views/manage/individualTendency.vue

@@ -217,6 +217,8 @@ export default {
       if (obj) {
         this.userInfoLin = obj;
       }
+      // console.log('11111111111')
+      // console.log(JSON.stringify(obj) )
       this.initGroup();
     }
   },
@@ -461,8 +463,11 @@ export default {
       }
     },
     initGroup() {
+    
       // 最新的级数
       let ji = parseInt(this.userInfoLin.grade);
+      // console.log('222222222')
+      // console.log(ji)
       //获取当前年
       let currentYear = new Date().getFullYear();
 

src/views/manage/manageMain.vue

@@ -128,7 +128,7 @@
             </div>
             <div class="user_out" @mouseenter="mouseenterFun" @mouseleave="mouseLeaveFun">
               <img class="user_out_img" src="../../assets/menu/userAdmin.png" />
-              <div class="user_out_des">{{ userInfo.userName }}老师</div>
+              <div class="user_out_des">{{ userInfo.userName }}</div>
               <div v-if="isShowMenu" class="user_out_ab">
                 <div class="exit" @click="escape()">退出</div>
                 <div class="update_pass" @click="changePwd()">修改密码</div>
@@ -494,27 +494,27 @@ export default {
             showItem: true,
             path: "/manage/generalSituation",
           },
-          {
-            id: "0",
-            name: "学生管理",
-            icon: require("../../assets/menu/yuan.png"),
-            showItem: true,
-            path: "/manage/userManage",
-          },
+          // {
+          //   id: "0",
+          //   name: "学生管理",
+          //   icon: require("../../assets/menu/yuan.png"),
+          //   showItem: true,
+          //   path: "/manage/userManage",
+          // },
           {
             id: "5",
-            name: "教师管理",
-            icon: require("../../assets/menu/yuan.png"),
-            showItem: true,
-            path: "/manage/teacherManage",
-          },
-          {
-            id: "6",
-            name: "辅导员管理",
+            name: "员工管理",
             icon: require("../../assets/menu/yuan.png"),
             showItem: true,
-            path: "/manage/instructorManage",
+            path: "/manage/employeeManage",
           },
+          // {
+          //   id: "6",
+          //   name: "辅导员管理",
+          //   icon: require("../../assets/menu/yuan.png"),
+          //   showItem: true,
+          //   path: "/manage/instructorManage",
+          // },
           {
             id: "2",
             name: "组织架构",

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"
@@ -89,7 +89,7 @@
             :formatter="genderFun"
           >
           </el-table-column>
-          <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
+          <el-table-column prop="orgName" label="所属组织" align="center" width="">
           </el-table-column>
           <el-table-column label="操作" width="510px" align="center">
             <template slot-scope="scope">
@@ -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>
@@ -164,7 +164,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.orgName }}
             </div>
@@ -278,7 +278,7 @@ export default {
       resetVisible: false,
       //根据名称搜索
       name: "",
-      //搜索的用户编号
+      //搜索的用户工号
       studentNumber: "",
       //搜索的组织架构
       // 搜索需要的性别
@@ -557,7 +557,7 @@ export default {
     },
     clearSearch() {
       this.name = "";
-      //搜索的用户编号
+      //搜索的用户工号
       this.studentNumber = "";
       //搜索的组织架构
       // 搜索需要的性别

src/views/manage/tendency.vue

@@ -30,7 +30,7 @@
               v-show="isUser"
               v-model="studentNumber"
               clearable
-              placeholder="请输入学号"
+              placeholder="请输入工号"
             ></el-input>
             <div v-show="isUser">&nbsp;&nbsp;&nbsp;&nbsp;</div>
 
@@ -71,7 +71,7 @@
             </el-select>
             &nbsp;&nbsp;&nbsp;&nbsp;
             <el-button v-show="!isUser && isJump" style="border-radius:20px;" @click="backParent"> 返回</el-button>
-            <div
+            <!-- <div
               style="display: flex; flex-direction: row; align-items: center"
               v-show="isUser"
             >
@@ -86,8 +86,8 @@
               >
               <el-radio v-model="userType" label="2">教师</el-radio>
               <el-radio v-model="userType" label="1">学生</el-radio>
-            </div>
-            <div v-show="isUser">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+            </div> -->
+            <!-- <div v-show="isUser">&nbsp;&nbsp;&nbsp;&nbsp;</div> -->
 
             <el-button
               type="primary"
@@ -125,7 +125,7 @@
           <el-table-column
             v-if="isUser"
             prop="userNo"
-            label="学号"
+            label="工号"
             align="center"
             width=""
           >
@@ -142,7 +142,7 @@
           <el-table-column
             v-if="isUser"
             prop="orgName"
-            label="所属组织架构"
+            label="所属组织"
             align="center"
             width=""
           >
@@ -286,7 +286,7 @@ export default {
       //搜索的组织架构
       // 搜索需要的性别
       sex: "",
-      userType: "",
+      userType: "2",
 
       group: "",
       ppData: [],
@@ -371,7 +371,6 @@ export default {
     }
     //获取到当前路径上的参数
     this.isClikcObj(false);
-
     //初始化最近10条数据的图表
     this.option_zhu = {
       title: {
@@ -692,15 +691,17 @@ export default {
       }
     },
     initGroup(val) {
+
       if (this.userInfo.roleType == "5") {
         if (val) {
           //当条件是真的时候----//
           //需要循环列表
           //且、路径上有参数的话
           let params = this.$route.query;
-          this.isJump = true;
+        
           if (params.hasOwnProperty("orgNo")) {
             //当存在该属性时
+            this.isJump = true;
             //  this. channelTmp
             //循环拿到orgNo 等于当前的数据
 
@@ -784,12 +785,14 @@ export default {
         }
       }
       if (this.userInfo.roleType == "4" || this.userInfo.roleType == "3") {
+     
         if (val) {
           let params = this.$route.query;
-          console.log(params.hasOwnProperty("orgNo"));
-          this.isJump = true;
+          // console.log(params.hasOwnProperty("orgNo"));
+        
           if (params.hasOwnProperty("orgNo")) {
             //当存在该属性时
+            this.isJump = true;
             this.group = [params.orgNo];
             //
           } else {
@@ -919,7 +922,7 @@ export default {
     handleSizeChange(val) {
       this.pageSize = val;
       this.searchTarget();
-      console.log(`每页 ${val} 条`);
+      // console.log(`每页 ${val} 条`);
       //将首页重置为1时---且总条数变化
       //设置为当前总条数
     },
@@ -1050,7 +1053,7 @@ export default {
       // 搜索需要的性别
       this.planName = "";
       this.group = "";
-      this.userType = "";
+      this.userType = "2";
       this.searchTarget();
     },