From 86b9ba16f2d6949c69414c011bd56da3a569f85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com>
Date: Wed, 22 Feb 2023 00:53:12 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CheckStu.vue |   6 +-
 src/components/drawers/SeeStu.vue   | 399 ++++++++++++++--------------
 2 files changed, 207 insertions(+), 198 deletions(-)

diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index 7c8f4a5b..e0134078 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -22,8 +22,8 @@
             <img src="../../assets/images/studentimg/character.png" />
           </div>
           <div class="stumation">
-            <div class="stuname">{{pro.routerInfo.userName}}</div>
-            <div class="stugangw">{{pro.routerInfo.deptName?pro.routerInfo.deptName:"" + '-' + pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div>
+            <div class="stuname">{{pro.routerInfo.name}}</div>
+            <div class="stugangw">{{pro.routerInfo.organizationName?pro.routerInfo.organizationName:"" + '-' + pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div>
           </div>
           <div class="sortbox">
             <div class="sortname">进度排名</div>
@@ -57,7 +57,7 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">{{pro.certCnt?pro.certCnt:0}}</span>
+              <span class="nub1">{{pro.routerInfo.certCnt?pro.routerInfo.certCnt:0}}</span>
             </div>
           </div>
         </div>
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index 82017f3b..89221cfd 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -1,22 +1,14 @@
 <!-- eslint-disable vue/no-use-v-if-with-v-for -->
 <template>
-  <a-drawer
-    :visible="Seevisible"
-    class="drawerStyle seestu"
-    placement="right"
-    width="70%"
-    @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :visible="Seevisible" class="drawerStyle seestu" placement="right" width="70%"
+    @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">查看</div>
-        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
-      <a-spin v-if="loading" :spinning="loading"/>
+      <a-spin v-if="loading" :spinning="loading" />
       <div v-if="!loading" class="main">
         <div class="stuinfor">
           <div class="portrait">
@@ -29,18 +21,15 @@
           <div class="sortbox">
             <div class="sortname">进度排名</div>
             <div class="sortnub">
-              <span class="nub1">{{rank.current}}</span>
-              <span class="total">/{{rank.total}}</span>
+              <span class="nub1">{{ rank.current }}</span>
+              <span class="total">/{{ rank.total }}</span>
             </div>
           </div>
-          <a-divider
-            type="vertical"
-            style="
-              height: 49px;
-              margin-left: 34px;
-              background-color: rgba(170, 166, 166, 0.3);
-            "
-          />
+          <a-divider type="vertical" style="
+                height: 49px;
+                margin-left: 34px;
+                background-color: rgba(170, 166, 166, 0.3);
+              " />
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">完成必修</div>
             <div class="sortnub">
@@ -48,115 +37,96 @@
               <span class="total">/{{ totalReqCnt }}</span>
             </div>
           </div>
-          
-          <a-divider
-            type="vertical"
-            style="
-              height: 49px;
-              margin-left: 34px;
-              background-color: rgba(170, 166, 166, 0.3);"
-          />
+
+          <a-divider type="vertical" style="
+                height: 49px;
+                margin-left: 34px;
+                background-color: rgba(170, 166, 166, 0.3);" />
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">{{ certCnt?certCnt:0 }}</span>
+              <span class="nub1">{{ 0 }}</span>
             </div>
           </div>
-      
+
         </div>
         <div class="secondrow">
-          <div class="rowleft">{{ name }}  </div>
+          <div class="rowleft">{{ name }} </div>
           <div class="rowRight"> 排序号：{{ sort }}</div>
         </div>
         <div class="mainbox">
           <a-collapse v-model:activeKey="stageListActive">
             <template #expandIcon="{ isActive }">
-              <img
-                style="margin-right: 20px"
-                :src="
-                  isActive
-                    ? require('../../assets/images/studentimg/open.png')
-                    : require('../../assets/images/studentimg/close.png')
-                "
-              />
+              <img style="margin-right: 20px" :src="
+                isActive
+                  ? require('../../assets/images/studentimg/open.png')
+                  : require('../../assets/images/studentimg/close.png')
+              " />
               <div></div>
             </template>
-            <a-collapse-panel
-              v-for="value in stageList"
-              :key="value.stageId"
-              :header="value.stageName"
-             
-            > 
-            <template #extra >
-            <div @click.stop="">
-              <div class="rowbox">
-                <a-popover title="阶段说明">
-                <template #content>
-                  <p>{{value.remark}}</p>
-                </template>
-              <div class="shuom">说明</div>
-              </a-popover>
-              <div><img src="../../assets/images/studentimg/chak.png" /></div>
-            </div>
-           </div> 
-            </template>
-         
-              <div 
-                class="rowclass"
-                v-for="(item, key) in value.taskList"
-                :key="key"
-              >
-            
+            <a-collapse-panel v-for="value in stageList" :key="value.stageId" :header="value.stageName">
+              <template #extra>
+                <div @click.stop="">
+                  <div class="rowbox">
+                    <a-popover title="阶段说明">
+                      <template #content>
+                        <p>{{ value.remark }}</p>
+                      </template>
+                      <div class="shuom">说明</div>
+                    </a-popover>
+                    <div><img src="../../assets/images/studentimg/chak.png" /></div>
+                  </div>
+                </div>
+              </template>
+
+              <div class="rowclass" v-for="(item, key) in value.taskList" :key="key">
+
                 <div class="leftclass">
                   <div>
-                    <img
-                      :src="
-                        item.course === '在线'
-                          ? require('../../assets/images/leveladd/zai.png')
-                          : item.course === '面授'
+                    <img :src="
+                      item.course === '在线'
+                        ? require('../../assets/images/leveladd/zai.png')
+                        : item.course === '面授'
                           ? require('../../assets/images/leveladd/mian.png')
                           : item.course === '案例'
-                          ? require('../../assets/images/leveladd/an.png')
-                          : item.course === '作业'
-                          ? require('../../assets/images/leveladd/zuo.png')
-                          : item.course === '考试'
-                          ? require('../../assets/images/leveladd/kao.png')
-                          : item.course === '直播'
-                          ? require('../../assets/images/leveladd/zhi.png')
-                          : item.course === '外链'
-                          ? require('../../assets/images/leveladd/wai.png')
-                          : item.course === '讨论'
-                          ? require('../../assets/images/leveladd/tao.png')
-                          : item.course === '活动'
-                          ? require('../../assets/images/leveladd/huo.png')
-                          : item.course === '测评'
-                          ? require('../../assets/images/leveladd/ce.png')
-                          : item.course === '调研'
-                          ? require('../../assets/images/leveladd/diao.png')
-                          : item.course === '投票'
-                          ? require('../../assets/images/leveladd/tou.png')
-                          : item.course === '评估'
-                          ? require('../../assets/images/leveladd/diao.png')
-                          : null
-                      "
-                    />
+                            ? require('../../assets/images/leveladd/an.png')
+                            : item.course === '作业'
+                              ? require('../../assets/images/leveladd/zuo.png')
+                              : item.course === '考试'
+                                ? require('../../assets/images/leveladd/kao.png')
+                                : item.course === '直播'
+                                  ? require('../../assets/images/leveladd/zhi.png')
+                                  : item.course === '外链'
+                                    ? require('../../assets/images/leveladd/wai.png')
+                                    : item.course === '讨论'
+                                      ? require('../../assets/images/leveladd/tao.png')
+                                      : item.course === '活动'
+                                        ? require('../../assets/images/leveladd/huo.png')
+                                        : item.course === '测评'
+                                          ? require('../../assets/images/leveladd/ce.png')
+                                          : item.course === '调研'
+                                            ? require('../../assets/images/leveladd/diao.png')
+                                            : item.course === '投票'
+                                              ? require('../../assets/images/leveladd/tou.png')
+                                              : item.course === '评估'
+                                                ? require('../../assets/images/leveladd/diao.png')
+                                                : null
+                    " />
                   </div>
                   <div class="text1">{{ item.course }}</div>
                   <div class="text2">{{ item.name }}</div>
                 </div>
                 <div class="alreadyclass">
                   <div class="alimg">
-                    <img
-                      :src="
-                        item.complete === '已完成'
-                          ? require('../../assets/images/studentimg/complete.png')
-                          : require('../../assets/images/studentimg/notice.png')
-                      "
-                    />
+                    <img :src="
+                      item.complete === '已完成'
+                        ? require('../../assets/images/studentimg/complete.png')
+                        : require('../../assets/images/studentimg/notice.png')
+                    " />
                   </div>
                   <div class="altext">{{ item.complete }}</div>
                 </div>
-               
+
               </div>
             </a-collapse-panel>
           </a-collapse>
@@ -173,7 +143,7 @@
 <script>
 import { reactive, toRefs } from "vue";
 import ProMess from "./ProMess.vue";
-import {studentProcess, studentRank} from "../../api/indexProjStu";
+import { studentProcess, studentRank } from "../../api/indexProjStu";
 export default {
   name: "SeeStu",
   components: { ProMess },
@@ -193,7 +163,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      loading:false,
+      loading: false,
       userName: null, //用户名
       deptName: null, //部门
       jobName: null, //岗位
@@ -204,8 +174,8 @@ export default {
       Provisible: false,
       showDown: true,
       showDown1: false,
-      rank:{total:1,current:1},
-      sort:null,
+      rank: { total: 1, current: 1 },
+      sort: null,
       stageList: [
         // {
         //   stageName: "阶段1腾飞班阶段1",
@@ -249,8 +219,8 @@ export default {
       studentRank({
         projectId: props.projectId,
         studentId: props.checkStuId,
-        type:1
-      }).then(res=>{
+        type: 1
+      }).then(res => {
         state.rank = res.data.data
       })
     }
@@ -275,52 +245,54 @@ export default {
       let data = tableData;
       console.log('我排序了吗--------------------------》', data)
       let array = [];
-      if(data!=undefined){
+      if (data != undefined) {
         data.map((value) => {
-        let obj = {
-          course:
-            value.type == 1
-              ? "在线"
-              : value.type == 2
-              ? "面授"
-              : value.type == 3
-              ? "案例"
-              : value.type == 4
-              ? "作业"
-              : value.type == 5
-              ? "考试"
-              : value.type == 6
-              ? "直播"
-              : value.type == 7
-              ? "外链"
-              : value.type == 8
-              ? "讨论"
-              : value.type == 9
-              ? "活动"
-              : value.type == 10
-              ? "测评"
-              : value.type == 11
-              ? "评估"
-              : value.type == 12
-              ? "投票"
-              : "-",
-          name: value.name,
-          projectId: value.projectId,
-          complete:
-            value.status == -1
-              ? "未开始"
-              : value.status == 1
-              ? "已完成"
-              : value.status == 0
-              ? "未完成"
-              : "-",
-          flag: value.flag == 0 ? "选修" : "必修",
-          currentRatio: value.currentRatio,
-          routerTaskId: value.routerTaskId,
-        };
-        array.push(obj);
-      });
-      array.sort((a,b)=>{return a.projectId - b.projectId})
+          console.log('我排序了吗---------value-----------------》', value)
+          let obj = {
+            course:
+              value.type == 1
+                ? "在线"
+                : value.type == 2
+                  ? "面授"
+                  : value.type == 3
+                    ? "案例"
+                    : value.type == 4
+                      ? "作业"
+                      : value.type == 5
+                        ? "考试"
+                        : value.type == 6
+                          ? "直播"
+                          : value.type == 7
+                            ? "外链"
+                            : value.type == 8
+                              ? "讨论"
+                              : value.type == 9
+                                ? "活动"
+                                : value.type == 10
+                                  ? "测评"
+                                  : value.type == 11
+                                    ? "评估"
+                                    : value.type == 12
+                                      ? "投票"
+                                      : "-",
+            name: value.name,
+            projectId: value.projectId,
+            complete:
+              value.status == -1
+                ? "未开始"
+                : value.status == 1
+                  ? "已完成"
+                  : value.status == 0
+                    ? "未完成"
+                    : "-",
+            flag: value.flag == 0 ? "选修" : "必修",
+            currentRatio: value.currentRatio,
+            routerTaskId: value.routerTaskId,
+          };
+          console.log('我排序了吗---------obj-----------------》', obj)
+          array.push(obj);
+        });
+        array.sort((a, b) => { return a.projectId - b.projectId })
       }
 
       console.log('我排序了吗-----------1---------------》', array)
@@ -331,31 +303,34 @@ export default {
       console.log("查看了学员1", data);
       let array = [];
       //无阶段任务
-      if(data?.length ==1 && data[0].stageId ==0){
+      if (data?.length == 1 && data[0].id == 0) {
+        console.log("无阶段任务", data);
         data.map((value) => {
-        let obj = {
-          stageName:"无阶段任务",
-          stageId:0,
-          remark:value.remark,
-          taskList: taskList(value.taskList),
-        };
-        array.push(obj);
-      });
-      }else{ //有阶段
-        data.map((value) => {
-        let obj = {
-          stageName: value.stageName,
-          stageId: value.stageId,
-          remark:value.remark,
-          taskList: taskList(value.taskList),
-        };
-        if(value.stageId >0){
+          let obj = {
+            stageName: "无阶段任务",
+            stageId: 0,
+            remark: value.remark,
+            taskList: taskList(value.taskList),
+          };
           array.push(obj);
-        }
-       
-      });
+        });
+      } else { //有阶段
+        console.log("有阶段", data);
+        data.map((value) => {
+          console.log("有阶段value", value);
+          let obj = {
+            stageName: value.name,
+            stageId: value.id,
+            remark: value.remark,
+            taskList: taskList(value.taskList),
+          };
+          if (value.id > 0) {
+            array.push(obj);
+          }
+          console.log("有阶段array", array);
+        });
       }
-     
+
       state.stageList = array;
     };
     const check = () => {
@@ -366,19 +341,20 @@ export default {
       };
       studentProcess(obj).then((res) => {
         state.loading = false
-        console.log("查看了学员", res.data.data);
+        console.log("查看了学员", res.data);
         let result = res.data.data;
-        state.userName = result.projectInfo.userName;
+        console.log("查看了学员result:", result);
+        state.userName = result.projectInfo.name;
         state.deptName = result.projectInfo.deptName;
         state.jobName = result.projectInfo.jobName;
         state.certCnt = result.projectInfo.certCnt == null ? 0 : result.projectInfo.certCnt;
         state.name = result.projectInfo.name;
         state.currentReqCnt = result.projectInfo.currentReqCnt;
         state.totalReqCnt = result.projectInfo.totalReqCnt;
-       
+
         if (result.stageList.length > 0) {
           state.sort = result.stageList[0].sort;
-          
+
         }
         setStageList(result.stageList);
       });
@@ -403,20 +379,24 @@ export default {
 <style lang="scss">
 .seestu {
   .ant-drawer-content-wrapper {
+
     // max-width: 1000px;
     .ant-drawer-header {
       display: none !important;
     }
+
     .ant-drawer-body {
       padding: 0;
     }
   }
+
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
     overflow-x: auto;
     display: flex;
     flex-direction: column;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -426,6 +406,7 @@ export default {
       // background-color: red;
       margin-bottom: 20px;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -434,11 +415,13 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       display: flex;
       flex-direction: column;
       overflow-y: auto;
       padding-bottom: 80px;
+
       .stuinfor {
         display: flex;
         align-items: center;
@@ -448,35 +431,43 @@ export default {
         background-image: url("../../assets/images/studentimg/bgimg.png");
         background-repeat: no-repeat;
         background-position: right;
+
         .stumation {
           margin-left: 24px;
+
           .stuname {
             color: #333333;
             font-size: 18px;
           }
+
           .stugangw {
             color: #999999;
             font-size: 16px;
             margin-top: 7px;
           }
         }
+
         .sortbox {
           display: flex;
           flex-direction: column;
           justify-content: center;
           margin-left: 114px;
+
           .sortname {
             color: #666660;
             font-size: 14px;
           }
+
           .sortnub {
             display: flex;
             justify-content: center;
             margin-top: 7px;
+
             .nub1 {
               color: #0060ff;
               font-size: 22px;
             }
+
             .total {
               color: #999999;
               font-size: 22px;
@@ -484,19 +475,23 @@ export default {
           }
         }
       }
+
       .secondrow {
         margin-top: 32px;
         display: flex;
+
         .rowleft {
           color: rgba(51, 51, 51, 1);
           font-size: 16px;
         }
-        
+
       }
+
       .mainbox {
         // height: 463px;
         margin-right: 37px;
         margin-top: 32px;
+
         //border: 1px solid rgba(221, 238, 255, 1);
         //border-radius: 6px;
         .rowbox {
@@ -510,6 +505,7 @@ export default {
           background: rgba(64, 158, 255, 0.1);
           margin-right: 480px;
           cursor: pointer;
+
           .shuom {
             color: rgba(64, 158, 255, 1);
             font-size: 14px;
@@ -517,23 +513,28 @@ export default {
             margin-right: 5px;
           }
         }
+
         .ant-collapse {
           background-color: #ffffff;
           border: 0;
         }
-        .ant-collapse-content > .ant-collapse-content-box {
+
+        .ant-collapse-content>.ant-collapse-content-box {
           padding: 0;
           border: 0;
         }
-        .ant-collapse > .ant-collapse-item {
+
+        .ant-collapse>.ant-collapse-item {
           border: 1px solid rgba(221, 238, 255, 1);
           border-radius: 6px;
           margin-bottom: 15px;
           border-bottom: 0px;
         }
+
         .ant-collapse-content {
           border-top: 0;
         }
+
         .ant-collapse-header {
           display: flex;
           align-items: center;
@@ -543,52 +544,60 @@ export default {
           color: rgba(51, 51, 51, 1);
           font-weight: 500;
         }
+
         .rowclass {
           height: 81px;
           border-bottom: 1px solid rgba(221, 238, 255, 1);
           display: flex;
           justify-content: space-between;
           align-items: center;
+
           .leftclass {
             display: flex;
             margin-left: 25px;
             align-items: center;
+
             .text1 {
               color: #000000;
               font-size: 14px;
               font-weight: 500;
               margin-left: 25px;
-              word-break:keep-all;
-              white-space:nowrap;
+              word-break: keep-all;
+              white-space: nowrap;
             }
+
             .text2 {
               color: rgba(51, 51, 51, 0.8);
               font-size: 14px;
               margin-left: 65px;
-              word-break:keep-all;
-              white-space:nowrap;
-              overflow:hidden;
-              text-overflow:ellipsis;
+              word-break: keep-all;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
             }
           }
+
           .alreadyclass {
             display: flex;
             margin-right: 57px;
+
             .alimg {
               height: 16px;
               width: 16px;
             }
+
             .altext {
               color: rgba(56, 125, 247, 1);
               font-size: 14px;
               margin-left: 16px;
-              word-break:keep-all;
-              white-space:nowrap;
+              word-break: keep-all;
+              white-space: nowrap;
             }
           }
         }
       }
     }
+
     .btnn {
       height: 72px;
       width: 100%;
@@ -600,6 +609,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn2 {
         cursor: pointer;
         width: 100px;
@@ -612,5 +622,4 @@ export default {
       }
     }
   }
-}
-</style>
+}</style>