Merge remote-tracking branch 'yx/compulsory_professional_skills_test' into master_1202

src/api/growthpath.js

@@ -92,3 +92,6 @@ export const openOrCloseSortSwitch = (growthId) => http.get('/professional/task/
 
 // 新建专业力必修
 export const saveGrowth = (data) => http.post('/professional/compulsory/saveGrowth', data)
+
+// 催促学习
+export const batchSendMessage = (data) => http.post('/professional/urgeLearning/batchSendMessage', data)

src/components/growthpath/GrowthOnlineManage.vue

@@ -298,8 +298,8 @@ export default {
         },
         {
           title: "Band职级",
-          dataIndex: "stdPositionName",
-          key: "stdPositionName",
+          dataIndex: "bandCode",
+          key: "bandCode",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -307,7 +307,10 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>-</span>
+                <span>
+                  {" "}
+                  {text.record.bandCode ? text.record.bandCode : "-"}
+                </span>
               </div>
             );
           },
@@ -433,13 +436,13 @@ export default {
     //催促
     const godie = () => {
       var obj = {
-        courseId: props.datasource.courseId, //任务的Id
+        courseId: props.datasource.taskId
+          ? props.datasource.taskId
+          : props.datasource.info.id, //任务的Id
         courseName: props.datasource.taskName, //任务的名称
-        logo: "14", //项目或径的标识 1-项目 2-路径图 3面授课
-        routerTaskId: props.datasource.id, //任务的routerTaskld或projectTaskld
-        targetId: props.datasource.targetId, //路径图的就是routerId,项目的是projectId;根据这张图来看的话
+        taskId: props.datasource.id, //项目或径的标识 1-项目 2-路径图 3面授课
         taskType: props.datasource.taskType, //催促的任务的类型
-        chapterId: null, //阶段或关卡Id
+        growthId: props.datasource.growthId,
       };
       batchSendMessage(obj)
         .then((res) => {

src/components/growthpath/StudentManage.vue

@@ -46,6 +46,22 @@
           </div>
         </a-form-item>
       </a-col>
+      <a-col>
+        <a-form-item title="状态" style="width: 193px">
+          <div class="select in">
+            <a-select
+              v-model:value="tableParam.completionStatus"
+              placeholder="请选择状态"
+              :options="[
+                { value: '0', label: '未开始' },
+                { value: '1', label: '已完成' },
+                { value: '2', label: '进行中' },
+              ]"
+              allowClear
+            ></a-select>
+          </div>
+        </a-form-item>
+      </a-col>
       <a-col>
         <a-form-item title="姓名：" style="width: 170px">
           <a-input
@@ -575,6 +591,7 @@ function reset() {
   tableParam.value.stdPosition = null;
   tableParam.value.organizationId = null;
   tableParam.value.bandCode = null;
+  tableParam.value.completionStatus = null;
   getStuList();
 }
 

src/components/growthpath/StudentSeeStu.vue

@@ -34,7 +34,7 @@
               <img v-else src="../../assets/images/studentimg/character.png" />
             </div>
             <div class="stumation">
-              <div class="stuname">{{ info.username }}</div>
+              <div class="stuname">{{ info.userNickName }}</div>
               <div class="stugangw">
                 {{ info.stdPositionName }}
               </div>

src/views/growthpath/PathManage.vue

@@ -124,7 +124,7 @@
                     :width="140"
                   />
                   <div class="protext">
-                    {{ TASK_TYPE[item.taskType].name }}完成率
+                    {{ TASK_TYPE[item.taskType].name }}课程完成率
                   </div>
                   </template>
                 </div>