修改测试测试--教师查看报告

src/components/GroupCompare.vue

@@ -24,7 +24,7 @@
             <el-form-item label="首选项" class="plan_lang">
               <el-select v-model="groupType" @change="groupChangeFun">
                 <el-option label="全院" value="1"> </el-option>
-                <el-option label="年级" value="2"> </el-option>
+                <el-option label="年级" value="2" v-show="planInfo.planType=='0'"> </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="年级" class="plan_lang" v-show="groupType != '1'">

src/components/PlanReport.vue

@@ -65,7 +65,21 @@
                 width=""
               >
               </el-table-column>
-              <el-table-column prop="userNo" label="学号" align="center" width="">
+              <el-table-column
+                prop="userNo"
+                v-if="planType == '0'"
+                label="学号"
+                align="center"
+                width=""
+              >
+              </el-table-column>
+              <el-table-column
+                prop="userNo"
+                v-if="planType == '1'"
+                label="编号"
+                align="center"
+                width=""
+              >
               </el-table-column>
               <el-table-column
                 prop="orgName"
@@ -174,7 +188,21 @@
               width=""
             >
             </el-table-column>
-            <el-table-column prop="userNo" label="学号" align="center" width="">
+            <el-table-column
+              prop="userNo"
+              v-if="planType == '0'"
+              label="学号"
+              align="center"
+              width=""
+            >
+            </el-table-column>
+            <el-table-column
+              prop="userNo"
+              v-if="planType == '1'"
+              label="编号"
+              align="center"
+              width=""
+            >
             </el-table-column>
             <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
             </el-table-column>
@@ -281,7 +309,7 @@
               <el-option
                 v-for="item in gradeList"
                 :key="item.id"
-                :label="item == '全部' ? '' : item + '级'"
+                :label="item == '全部' ? '' : item == -1 ? '教师组' : `${item}级`"
                 :value="item"
               ></el-option>
             </el-select>
@@ -426,7 +454,21 @@
               width=""
             >
             </el-table-column>
-            <el-table-column prop="userNo" label="学号" align="center" width="">
+            <el-table-column
+              prop="userNo"
+              v-if="planType == '0'"
+              label="学号"
+              align="center"
+              width=""
+            >
+            </el-table-column>
+            <el-table-column
+              prop="userNo"
+              v-if="planType == '1'"
+              label="编号"
+              align="center"
+              width=""
+            >
             </el-table-column>
             <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
             </el-table-column>
@@ -512,7 +554,21 @@
               width=""
             >
             </el-table-column>
-            <el-table-column prop="userNo" label="学号" align="center" width="">
+            <el-table-column
+              prop="userNo"
+              v-if="planType == '0'"
+              label="学号"
+              align="center"
+              width=""
+            >
+            </el-table-column>
+            <el-table-column
+              prop="userNo"
+              v-if="planType == '1'"
+              label="编号"
+              align="center"
+              width=""
+            >
             </el-table-column>
             <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
             </el-table-column>
@@ -709,6 +765,7 @@ export default {
       fullmarkPageSize: 10,
       //满分人员每页多少条
       fullmarkTotal: 0,
+      planType: "",
     };
   },
   mounted() {
@@ -828,7 +885,7 @@ export default {
     window.removeEventListener("resize", this.echartsAllSize);
   },
   methods: {
-    queryQS(val){
+    queryQS(val) {
       let url = "/manage/tendency";
       this.bus.$emit("menuStatusUpdate", url);
       //跳转到趋势统计的页面
@@ -837,7 +894,6 @@ export default {
       sessionStorage.setItem("individualTendency", JSON.stringify(val));
       this.$router.push({
         path: "/manage/individualTendency",
-      
       });
     },
     selectAllFun() {
@@ -869,8 +925,10 @@ export default {
     },
     addRegisterUser(val) {
       let obj = val;
-      obj.planId=this.planId
+      obj.planId = this.planId;
       obj.planName = this.planName;
+      // obj.planType 
+      obj.planType =this.planType;
       this.$refs.register.open(obj);
     },
     //导出心理异常的人员
@@ -948,7 +1006,6 @@ export default {
     },
     //tab状态改变
     tabFun(a) {
-
       // this.tabNameCurrent=
       let linT = [];
       linT = this.subDimeList.filter((item) => {
@@ -995,6 +1052,7 @@ export default {
       this.queryBread(params);
     },
     open(val) {
+      this.planType = val.planType;
       this.planId = val.id;
       this.planName = val.planName;
       this.userType = "心理异常";
@@ -1013,7 +1071,6 @@ export default {
       this.doubtfulSearchList();
       //获取满分人员列表
       this.fullmarkSearchList();
-      
     },
     //查询计划下年级
     queryGrade() {
@@ -1305,7 +1362,14 @@ export default {
     },
     //获取维度下变的子项维度
     getSexList() {
-      this.$http.get(`/param/findAllByType?type=ques`, {}, (res) => {
+      let url;
+      if (this.planType == "0") {
+        url = `/param/findAllByType?type=ques`;
+      } else {
+        url = `/param/findAllByType?type=ques2`;
+      }
+
+      this.$http.get(url, {}, (res) => {
         if (res && res.code == 200) {
           this.subDimeList = res.data;
           //调用性别的选项
@@ -1347,7 +1411,6 @@ export default {
         {},
         (res) => {
           if (res && res.code == 200) {
-
             this.subAll = res.data.totalNum;
             this.subSingle = res.data.highNum;
             this.options7 = [

src/components/PlanUserStatus.vue

@@ -420,7 +420,6 @@ export default {
       }
     },
     open(val) {
-      debugger;
       // this.searchTarget();
       this.proDataLin = val;
       this.dialogVisible = true;

src/components/Report.vue

@@ -188,11 +188,23 @@
               <div style="padding: 20px 40px">
                 <div>
                   <div class="report_info_out">
-                    <img v-show="proDataLin.gender=='1'" src="../assets/report/man1.png" />
-                    <img v-show="proDataLin.gender=='0'" src="../assets/report/woman1.png" />
+                    <img
+                      v-show="proDataLin.gender == '1'"
+                      src="../assets/report/man1.png"
+                    />
+                    <img
+                      v-show="proDataLin.gender == '0'"
+                      src="../assets/report/woman1.png"
+                    />
                     <div class="report_info_user">
                       <span class="info">姓名:&nbsp;&nbsp;{{ proDataLin.userName }}</span>
-                      <span class="info">学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>
+                      <span class="info" v-show="proDataLin.roleType == '2'"
+                        >编号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
+                      >
+                      <span class="info" v-show="proDataLin.roleType == '1'"
+                        >学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
+                      >
+                      <!-- roleType -->
                       <span class="info">测试用时:&nbsp;&nbsp;{{ useTime }}</span>
                       <span class="info"
                         >所属组织结构:&nbsp;&nbsp;<span style="">{{
@@ -303,10 +315,10 @@
                     :key="index"
                     style="padding-top: 20px"
                   >
-                    <div class="des_zhishu"  >
+                    <div class="des_zhishu">
                       {{ item.dimensionName }}
                     </div>
-                    <div class="report_des_out"  >
+                    <div class="report_des_out">
                       <div class="score">
                         <div class="score_lin">
                           <img
@@ -432,7 +444,6 @@
                       </div>
                     </div>
                   </div>
-       
                 </div>
               </div>
             </div>
@@ -567,21 +578,29 @@ export default {
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {
           // this.reportData = res.data;
-          let listTmp1 =[]
+          let listTmp1 = [];
           listTmp1 = res.data.dimensionScore.filter((item) => {
             return item.dimensionName != "总分";
           });
 
-          let listTmp2 =[]
-          listTmp2=listTmp1.filter((item)=>{
-            return item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
-          })
+          let listTmp2 = [];
+          listTmp2 = listTmp1.filter((item) => {
+            return (
+              item.dimensionName == "躯体化" ||
+              item.dimensionName == "焦虑" ||
+              item.dimensionName == "抑郁"
+            );
+          });
 
-          let listTmp3 =[]
-          listTmp3=listTmp1.filter((item)=>{
-            return !(item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁')
-          })
-          this.reportDataAll=listTmp2.concat(listTmp3)
+          let listTmp3 = [];
+          listTmp3 = listTmp1.filter((item) => {
+            return !(
+              item.dimensionName == "躯体化" ||
+              item.dimensionName == "焦虑" ||
+              item.dimensionName == "抑郁"
+            );
+          });
+          this.reportDataAll = listTmp2.concat(listTmp3);
           //将数组中的躯体化---抑郁---焦虑 取出来
           //然后将数组中的不是焦虑--抑郁 --躯体化的 取出来 --进行排序
 
@@ -590,9 +609,6 @@ export default {
           // });
           //将三个维度提前
 
-       
-
-
           this.useTime = res.data.usedTime;
           this.orgName = res.data.dimensionScore[0].orgName;
 

src/components/Report1.vue

@@ -144,7 +144,9 @@
                     <img v-show="gender=='0'" src="../assets/report/woman1.png" />
                     <div class="report_info_user">
                       <span class="info">姓名:&nbsp;&nbsp;{{ proDataLin.userName }}</span>
-                      <span class="info">学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>
+                     
+                      <span class="info" v-show="proDataLin.planType=='0'">学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>
+                      <span class="info" v-show="proDataLin.planType=='1'">编号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>
                       <span class="info">测试用时:&nbsp;&nbsp;{{ useTime }}</span>
                       <span class="info"
                         >所属组织结构:&nbsp;&nbsp;<span style="">{{
@@ -517,7 +519,6 @@ export default {
     reportDetail(params) {
       let url = `/userRecordScore/findByFlagAndUserNo?planId=${params.planId}&userNo=${params.userNo}&flag=${params.flag}`;
       this.$http.get(url, {}, (res) => {
-        
         if (res.code == 200) {
           // this.reportData = res.data;
           this.gender=res.data.gender
@@ -722,6 +723,7 @@ export default {
       }
     },
     open(val) {
+      // debugger;
       this.proDataLin = val;
       this.dialogVisible = true;
       //查询用户下边的计划

src/components/TeacherRegister.vue

@@ -25,7 +25,7 @@
             <!-- :show-all-levels="false" -->
             <el-form-item label="所属组织架构" prop="group">
               <el-cascader
-              :disabled="!isView"
+                :disabled="!isView"
                 placeholder="请选择组织架构"
                 v-model="ruleForm.group"
                 :options="groupData"
@@ -121,6 +121,8 @@ export default {
       userDetailData: {},
       //组织架构名字
       groupName: "",
+      //属于哪一届
+      grade: "",
       ppData: [],
       groupData: [],
       options: [
@@ -255,6 +257,14 @@ export default {
         }
       }
     },
+    //查询属于哪一届
+    queryGrade() {
+      for (let i = 0; i < this.ppData.length; i++) {
+        if (this.ruleForm.group[this.ruleForm.group.length - 1] == this.ppData[i].orgNo) {
+          this.grade = this.ppData[i].extend;
+        }
+      }
+    },
     //获取组织架构方法--------------------结束-----------------------
     timeChange(val) {
       if (val !== null) {
@@ -373,9 +383,9 @@ export default {
       let validSp = [];
       if (this.isView) {
         // validSp = ["group", "studentNumber", "name", "sex", "password", "comPassword"];
-        validSp = ["group","studentNumber", "name", "sex"];
+        validSp = ["group", "studentNumber", "name", "sex"];
       } else {
-        validSp = ["group","studentNumber", "name", "sex"];
+        validSp = ["group", "studentNumber", "name", "sex"];
       }
       let aa = [];
       this.$refs["ruleForm"].validateField(validSp, (valid) => {
@@ -412,7 +422,7 @@ export default {
       //   return;
       // }
       this.queryOrgName();
-
+      this.queryGrade();
       console.log(this.ruleForm.group);
       let that = this;
       // this.ruleForm.password = md5(this.ruleForm.password);
@@ -421,6 +431,7 @@ export default {
         {
           // orgNo: this.userInfo.orgNo,
           // orgName: this.userInfo.orgName,
+          grade: this.grade,
           orgNo: this.ruleForm.group[this.ruleForm.group.length - 1],
           orgName: this.groupName,
           userNo: this.ruleForm.studentNumber,
@@ -455,10 +466,10 @@ export default {
       this.queryOrgName();
       this.userDetailData.orgNo = this.ruleForm.group[this.ruleForm.group.length - 1];
       this.userDetailData.orgName = this.groupName;
-      // this.userDetailData.userName = this.ruleForm.name;
+      this.userDetailData.userName = this.ruleForm.name;
       // this.userDetailData.userNo = this.ruleForm.studentNumber;
       this.userDetailData.gender = this.ruleForm.sex;
-     
+
       this.$http.post(
         `/user/addOrUpdateUser`,
         {

src/views/manage/channelManagement/channelManagement.vue

@@ -6,7 +6,7 @@
           <div class="search-head">
             <el-input v-model="planName" clearable placeholder="请输入计划名称"></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
-
+            <!-- 
             <el-date-picker
               :clearable="false"
               v-model="planTime"
@@ -14,8 +14,8 @@
               format="yyyy-MM-dd"
               placeholder="选择创建日期"
             >
-            </el-date-picker>
-            <el-cascader
+            </el-date-picker> -->
+            <!-- <el-cascader
               v-show="userInfo.roleType == '5'"
               placeholder="请选择组织架构"
               v-model="group"
@@ -23,14 +23,13 @@
               :props="{ checkStrictly: true }"
               clearable
             ></el-cascader>
-            <!-- :props="{ checkStrictly: true }" -->
             <el-cascader
               v-show="userInfo.roleType == '4'"
               placeholder="请选择组织架构"
               v-model="group"
               :options="groupData"
               clearable
-            ></el-cascader>
+            ></el-cascader> -->
             &nbsp;&nbsp;&nbsp;&nbsp;
             <el-select v-model="planStatus" placeholder="请选择计划状态">
               <el-option
@@ -40,7 +39,20 @@
                 :key="item.id"
               ></el-option>
             </el-select>
-
+            &nbsp;&nbsp;&nbsp;&nbsp;
+            <div style="display: flex; flex-direction: row; align-items: center">
+              <span
+                style="
+                  font-size: 16px;
+                  margin-right: 10px;
+                  line-height: 20px;
+                  min-width: 40px;
+                "
+                >测评对象:</span
+              >
+              <el-radio v-model="planType" label="1">教师</el-radio>
+              <el-radio v-model="planType" label="0">学生</el-radio>
+            </div>
             &nbsp;&nbsp;&nbsp;&nbsp;
             <el-button type="primary" round icon="el-icon-search" @click="searchTarget"
               >搜索</el-button
@@ -498,6 +510,7 @@ export default {
       //搜索的组织架构
       // 搜索需要的性别
       sex: "",
+      planType: "",
 
       planName: "",
       planTime: "",
@@ -675,6 +688,12 @@ export default {
     },
     //下载报告
     downloadFun() {
+      // dimensionality: 0,
+      // dimensionalityOption: [
+      //   { id: 0, name: "学院" },
+      //   { id: 1, name: "年级" },
+      //   { id: 2, name: "班级" },
+      // ],
       //在这里调用接口
       //判断当前选择是院还是届--还是班级
       let params = {};
@@ -797,6 +816,23 @@ export default {
     },
     //下载标志
     downloadButton(row) {
+      // dimensionality: 0,
+      // dimensionalityOption: [
+      //   { id: 0, name: "学院" },
+      //   { id: 1, name: "年级" },
+      //   { id: 2, name: "班级" },
+      // ],
+      this.dimensionality = 0;
+      if (row.planType == "1") {
+        this.dimensionalityOption = [{ id: 0, name: "学院" }];
+      } else {
+        this.dimensionalityOption = [
+          { id: 0, name: "学院" },
+          { id: 1, name: "年级" },
+          { id: 2, name: "班级" },
+        ];
+      }
+
       //在这里记录一下---数据
       //当查看报告时--如果显示的是
       if (this.userInfo.roleType != 5) {
@@ -1005,6 +1041,7 @@ export default {
       this.planTime = "";
       this.group = "";
       this.planStatus = "";
+      this.planType = "";
       this.searchTarget();
     },
 
@@ -1075,7 +1112,9 @@ export default {
         gp == "" ? `&orgNo=${this.userInfo.orgNo}` : `&orgNo=${gp}`
       }${time == "" ? "" : `&createDate=${time}`}${
         this.planStatus == "" ? "" : `&planStatus=${this.planStatus}`
-      }${this.planName == "" ? "" : `&planName=${this.planName}`}`;
+      }${this.planName == "" ? "" : `&planName=${this.planName}`}${
+        this.planType == "" ? "" : `&planType=${this.planType}`
+      }`;
       this.$http.get(url, {}, (res) => {
         if (res && res.code == 200) {
           let aa = [];

src/views/manage/channelManagement/contract.vue

@@ -39,7 +39,7 @@
             ></el-input>
             <div v-show="!isUser">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             <el-cascader
-              v-show="userInfo.roleType == '5'"
+              v-show="userInfo.roleType == '5'&&isUser"
               placeholder="请选择组织架构"
               v-model="group"
               :options="groupData"
@@ -48,12 +48,48 @@
             ></el-cascader>
             <!-- :props="{ checkStrictly: true }" -->
             <el-cascader
-              v-show="userInfo.roleType == '4'"
+              v-show="userInfo.roleType == '4'&&isUser"
               placeholder="请选择组织架构"
               v-model="group"
               :options="groupData"
               clearable
             ></el-cascader>
+            &nbsp;&nbsp;&nbsp;&nbsp;
+            <div
+              style="display: flex; flex-direction: row; align-items: center"
+              v-show="isUser"
+            >
+              <span
+                style="
+                  font-size: 16px;
+                  margin-right: 10px;
+                  line-height: 20px;
+                  min-width: 40px;
+                "
+                >用户类型:</span
+              >
+              <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
+              style="display: flex; flex-direction: row; align-items: center"
+              v-show="!isUser"
+            >
+              <span
+                style="
+                  font-size: 16px;
+                  margin-right: 10px;
+                  line-height: 20px;
+                  min-width: 40px;
+                "
+                >测评对象:</span
+              >
+              <el-radio v-model="planType" label="1">教师</el-radio>
+              <el-radio v-model="planType" label="0">学生</el-radio>
+            </div>
+
             &nbsp;&nbsp;&nbsp;&nbsp;
             <el-button type="primary" round icon="el-icon-search" @click="searchTarget"
               >搜索</el-button
@@ -348,13 +384,13 @@ import comparePlanUser from "../../../components/ComparePlanUser.vue";
 import { basePath } from "../../../utils/http";
 import userImgActive from "../../../assets/report/lv.png";
 import userImgDefault from "../../../assets/report/white.png";
-import groupCompare from '../../../components/GroupCompare.vue'
+import groupCompare from "../../../components/GroupCompare.vue";
 export default {
   name: "userManage",
   components: {
     CompareUser: compareUser,
     ComparePlanUser: comparePlanUser,
-    GroupCompare:groupCompare
+    GroupCompare: groupCompare,
   },
   data() {
     return {
@@ -383,8 +419,9 @@ export default {
       studentNumber: "",
       //搜索的组织架构
       // 搜索需要的性别
+      planType: "",
       sex: "",
-
+      userType: "",
       group: "",
       ppData: [],
       groupData: [],
@@ -445,9 +482,9 @@ export default {
     this.isClikcObj(false);
   },
   methods: {
-    groupCompare(val){
+    groupCompare(val) {
       //打开群体报告统计页面
-      this.$refs.groupUser.open(val)
+      this.$refs.groupUser.open(val);
     },
     titleFormatter(val) {
       if (val.planStatus == "1") {
@@ -656,6 +693,8 @@ export default {
       // 搜索需要的性别
       this.planName = "";
       this.group = "";
+      this.userType = "";
+      this.planType = "";
       this.searchTarget();
     },
 
@@ -672,11 +711,12 @@ export default {
     },
     //根据现有情况进行搜索
     searchList() {
+      // &roleType=1
       let url;
       if (this.isUser) {
         url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
           this.pageNum
-        }&roleType=1${
+        }${this.userType == "" ? "" : `&roleType=${this.userType}`}${
           this.group.length == 0
             ? `&orgNo=${this.userInfo.orgNo}`
             : `&orgNo=${this.group[this.group.length - 1]}`
@@ -684,13 +724,10 @@ export default {
           this.studentNumber == "" ? "" : `&userNo=${this.studentNumber}`
         }`;
       } else {
+        //planType
         url = `/plan/findListByPage?pageSize=${this.pageSize}&pageNum=${this.pageNum}${
-          this.planName == "" ? "" : `&planName=${this.planName}`
-        }${
-          this.group.length == 0
-            ? `&orgNo=${this.userInfo.orgNo}`
-            : `&orgNo=${this.group[this.group.length - 1]}`
-        }`;
+          this.planType == "" ? "" : `&planType=${this.planType}`
+        }${this.planName == "" ? "" : `&planName=${this.planName}`}`;
       }
       this.$http.get(url, {}, (res) => {
         if (res && res.code == 200) {

src/views/manage/individualTendency.vue

@@ -430,17 +430,11 @@ export default {
       let ji = parseInt(this.userInfoLin.grade);
       //获取当前年
       let currentYear = new Date().getFullYear();
-      //判断级数是和当前年相同吗
-      if (currentYear == ji) {
-        this.optionsYear = [
-          {
-            label: `${currentYear}年`,
-            value: ji,
-          },
-        ];
-      } else {
+
+      if (ji == -1) {
+        //则显示近10年
         let list = [];
-        for (let i = ji; i <= currentYear; i++) {
+        for (let i = currentYear - 5; i <= currentYear; i++) {
           let obj = {
             label: `${i}年`,
             value: i,
@@ -448,8 +442,30 @@ export default {
           list.push(obj);
         }
         this.optionsYear = list;
-        // this.year = list[0].value;
+      } else {
+        if (currentYear == ji) {
+          this.optionsYear = [
+            {
+              label: `${currentYear}年`,
+              value: ji,
+            },
+          ];
+        } else {
+          let list = [];
+          for (let i = ji; i <= currentYear; i++) {
+            let obj = {
+              label: `${i}年`,
+              value: i,
+            };
+            list.push(obj);
+          }
+          this.optionsYear = list;
+          // this.year = list[0].value;
+        }
       }
+
+      //判断级数是和当前年相同吗
+
       this.query4Score();
     },
     planReport(val) {

src/views/manage/leaveManage.vue

@@ -91,8 +91,18 @@
           <!-- <el-table-column prop="userPhone" label="本人手机号码" width="" /> -->
           <!-- <el-table-column prop="monitorName" label="班长姓名" width="" />
           <el-table-column prop="dormitory" label="宿舍" width="" /> -->
-          <el-table-column prop="reason" label="请假原因" :show-overflow-tooltip='true' width="" />
-          <el-table-column prop="destination" label="出行目的地" :show-overflow-tooltip='true' width="" />
+          <el-table-column
+            prop="reason"
+            label="请假原因"
+            :show-overflow-tooltip="true"
+            width=""
+          />
+          <el-table-column
+            prop="destination"
+            label="出行目的地"
+            :show-overflow-tooltip="true"
+            width=""
+          />
           <!-- <el-table-column
             prop="isKnow"
             label="父母是否知情"
@@ -103,24 +113,52 @@
           <el-table-column prop="motherPhone" label="母亲电话" width="" />
           <el-table-column prop="fatherPhone" label="父亲电话" width="" /> -->
           <!-- <el-table-column prop="travelMode" label="出行方式" width="" /> -->
-          <el-table-column prop="startTime" label="请假时间" :show-overflow-tooltip='true' width="" />
-          <el-table-column prop="endTime" label="返校时间" :show-overflow-tooltip='true' width="" />
+          <el-table-column
+            prop="startTime"
+            label="请假时间"
+            :show-overflow-tooltip="true"
+            width=""
+          />
+
+          <el-table-column
+            prop="endTime"
+            label="返校时间"
+            :show-overflow-tooltip="true"
+            width=""
+          />
           <!-- <el-table-column prop="auditSuggest" label="审核建议" width="" /> -->
           <el-table-column
-          
             prop="auditStatus"
             label="审核状态"
             width=""
             :formatter="auditStatusFormatter"
           />
-          <el-table-column
+          <!-- <el-table-column
            
             prop="auditResult"
             label="审核结果"
             width="100"
             :formatter="auditResultFormatter"
-          />
-          <el-table-column label="操作"  width="150" align="center">
+          /> -->
+          <el-table-column prop="auditResult" label="审核结果" width="100" align="center">
+            <template slot-scope="scope">
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-show="scope.row.auditResult == '1'"
+              >
+                <img style="width: 14px" src="../../assets/img/table/dui.png" alt="" />&nbsp;
+                <div>通过</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-show="scope.row.auditResult == '0'"
+              >
+                <img style="width: 14px" src="../../assets/img/table/cuo.png" alt="" />&nbsp;
+                <div>驳回</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="150" align="center">
             <template slot-scope="scope">
               <div class="detail_button_out">
                 <div
@@ -288,7 +326,7 @@
 
             <div class="user_out">
               <div class="user_out_sub">审核结果</div>
-              <div class="user_out_subNext" >
+              <div class="user_out_subNext">
                 <div style="display: flex; align-items: center">
                   <img
                     src="../../assets/img/table/dui.png"
@@ -296,16 +334,24 @@
                     alt=""
                     v-show="view.auditResult == '1'"
                   />
-                  <div v-show="view.auditResult == '1'" style="color: #12bb65;font-weight: 700;">
-                   &nbsp; 已同意
+                  <div
+                    v-show="view.auditResult == '1'"
+                    style="color: #12bb65; font-weight: 700"
+                  >
+                    &nbsp; 已同意
                   </div>
                   <img
                     src="../../assets/img/table/cuo.png"
                     alt=""
-                     style="width: 20px; height: 20px"
+                    style="width: 20px; height: 20px"
                     v-show="view.auditResult == '0'"
                   />
-                  <div v-show="view.auditResult == '0'" style="color: #FF9000;font-weight: 700;">  &nbsp;已驳回</div>
+                  <div
+                    v-show="view.auditResult == '0'"
+                    style="color: #ff9000; font-weight: 700"
+                  >
+                    &nbsp;已驳回
+                  </div>
                   &nbsp;
                 </div>
                 <!-- {{
@@ -336,12 +382,25 @@
               >
                 <el-input v-model="record" placeholder="请输入审核建议" />
               </div>
-              
             </div>
           </div>
           <div class="user_button_detail" v-show="view.auditStatus == '0'">
-            <el-button type="success" round @click="submitCom(true)" style="padding:10px 40px" > 通过 </el-button>
-            <el-button type="info" round @click="submitCom(false)" style="padding:10px 40px"> 驳回 </el-button>
+            <el-button
+              type="success"
+              round
+              @click="submitCom(true)"
+              style="padding: 10px 40px"
+            >
+              通过
+            </el-button>
+            <el-button
+              type="info"
+              round
+              @click="submitCom(false)"
+              style="padding: 10px 40px"
+            >
+              驳回
+            </el-button>
           </div>
         </div>
       </div>
@@ -925,7 +984,7 @@ export default {
 }
 .user_button_detail {
   width: 60%;
-  margin-left:20%;
+  margin-left: 20%;
   display: flex;
   justify-content: space-around;
   margin-top: 40px;
@@ -998,7 +1057,7 @@ export default {
 
 .user_out_sub {
   // flex: 1;
-  width:95px;
+  width: 95px;
   // background-color: #fafafa;
   text-align: center;
   height: 100%;

src/views/manage/tendency.vue

@@ -70,6 +70,26 @@
               </el-option>
             </el-select>
             &nbsp;&nbsp;&nbsp;&nbsp;
+
+            <div
+              style="display: flex; flex-direction: row; align-items: center"
+              v-show="isUser"
+            >
+              <span
+                style="
+                  font-size: 16px;
+                  margin-right: 10px;
+                  line-height: 20px;
+                  min-width: 40px;
+                "
+                >用户类型:</span
+              >
+              <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>
+
+
             <el-button
               type="primary"
               round
@@ -266,6 +286,7 @@ export default {
       //搜索的组织架构
       // 搜索需要的性别
       sex: "",
+      userType:'',
 
       group: "",
       ppData: [],
@@ -1003,7 +1024,6 @@ export default {
       this.$refs.planUser.open(val);
     },
     addUser(val) {
-      debugger;
       this.$router.push({ name: "individualTendency" });
       sessionStorage.setItem("individualTendency", JSON.stringify(val));
     },
@@ -1015,6 +1035,7 @@ export default {
       // 搜索需要的性别
       this.planName = "";
       this.group = "";
+      this.userType='';
       this.searchTarget();
     },
 
@@ -1035,7 +1056,7 @@ export default {
       if (this.isUser) {
         url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
           this.pageNum
-        }&roleType=1${
+      }${this.userType==''?'':`&roleType=${this.userType}`}${
           this.group.length == 0
             ? `&orgNo=${this.userInfo.orgNo}`
             : `&orgNo=${this.group[this.group.length - 1]}`