Merge branch 'compulsory_professional_skills' into compulsory_professional_skills_copy

src/components/growthpath/StudentManage.vue

@@ -441,10 +441,23 @@ const tablecolumns = ref([
     title: "归属组织",
     dataIndex: "orgName",
     key: "orgName",
-    width: 230,
+    width: 210,
     align: "center",
     className: "h",
-    ellipsis: true,
+    customRender: ({ record }) => {
+      return (
+        <a-tooltip
+          getPopupContainer={(triggerNode) =>
+            triggerNode.parentNode || document.body
+          }
+          title={record.orgNamePath || record.orgName}
+          color="#fff"
+          style="color:#000"
+        >
+          <div>{record.orgName || "--"}</div>
+        </a-tooltip>
+      );
+    },
   },
   // {
   //   title: "标准岗位",
@@ -468,7 +481,7 @@ const tablecolumns = ref([
     title: "Band职级",
     dataIndex: "bandCode",
     key: "bandCode",
-    width: 100,
+    width: 90,
     align: "center",
     className: "h",
     ellipsis: true,
@@ -487,7 +500,7 @@ const tablecolumns = ref([
   },
   {
     title: "必修进度",
-    width: 100,
+    width: 90,
     align: "center",
     dataIndex: "progress",
     key: "progress",
@@ -498,7 +511,7 @@ const tablecolumns = ref([
   },
   {
     title: "选修进度",
-    width: 100,
+    width: 90,
     align: "center",
     dataIndex: "electivepProgress",
     key: "electivepProgress",
@@ -511,7 +524,7 @@ const tablecolumns = ref([
     title: "完成状态",
     dataIndex: "completionStatus",
     key: "completionStatus",
-    width: 100,
+    width: 90,
     align: "center",
     className: "h",
     ellipsis: true,
@@ -704,7 +717,7 @@ function closeDrawer() {
   GrowthDrawerRef.value.closeDrawer();
 }
 function confirmDrawer(selectList) {
-  GrowthDrawerRef.value.spinning = true
+  GrowthDrawerRef.value.spinning = true;
   tableData.value.loading = true;
   addLearners({
     growthId: props.id,
@@ -712,14 +725,14 @@ function confirmDrawer(selectList) {
   })
     .then((res) => {
       tableData.value.loading = false;
-      GrowthDrawerRef.value.spinning = false
+      GrowthDrawerRef.value.spinning = false;
       message.success("添加成功");
       closeDrawer();
       getStuList();
     })
     .catch((err) => {
       tableData.value.loading = false;
-      GrowthDrawerRef.value.spinning = false
+      GrowthDrawerRef.value.spinning = false;
     });
 }
 
@@ -746,6 +759,9 @@ function startLoading() {
 defineExpose({ getStuList, startLoading });
 </script>
 <style lang="scss" scoped>
+::v-deep .ant-tooltip-inner {
+  color: #000 !important;
+}
 ::v-deep .ant-pagination-total-text {
   color: #818a92;
 }
@@ -776,6 +792,7 @@ defineExpose({ getStuList, startLoading });
 .tips {
   padding: 20px 0 0 20px;
 }
+
 .stuName {
   display: flex;
   justify-content: center;

src/components/growthpath/StudentSeeStu.vue

@@ -146,7 +146,7 @@
   </a-drawer>
 </template>
 
-<script>
+<script lang="jsx">
 import { reactive, toRefs, watch, ref } from "vue";
 import { getGrowStudentDetail, markComplete } from "@/api/growthpath";
 import { message } from "ant-design-vue";
@@ -175,6 +175,7 @@ export default {
         dataIndex: "courseType",
         key: "courseType",
         align: "center",
+        width: 120,
         ellipsis: true,
         slots: { customRender: "courseType" },
       },
@@ -183,12 +184,14 @@ export default {
         dataIndex: "taskName",
         key: "taskName",
         align: "center",
+        width: 200,
         ellipsis: true,
       },
       {
         title: "必修/选修",
         dataIndex: "taskType",
         key: "taskType",
+        width: 100,
         align: "center",
         ellipsis: true,
         customRender: ({ record: { taskType } }) =>
@@ -201,26 +204,33 @@ export default {
         title: "学习进度",
         dataIndex: "progress",
         key: "progress",
+        width: 90,
         align: "center",
         ellipsis: true,
       },
       {
         title: "开始时间",
-        dataIndex: "startTime",
+        dataIndex: "taskStartTime",
-        key: "startTime",
+        key: "taskStartTime",
         align: "center",
-        ellipsis: true,
+        customRender: ({ record }) => {
+          return record.taskStartTime || "--";
+        },
       },
       {
         title: "完成时间",
         dataIndex: "finishTime",
         key: "finishTime",
         align: "center",
+        customRender: ({ record }) => {
+          return record.taskEndTime || "--";
+        },
       },
       {
         title: "任务状态",
         dataIndex: "completionStatus",
         key: "completionStatus",
+        width: 100,
         align: "center",
         customRender: ({ record: { completionStatus } }) =>
           ({