Merge branch 'compulsory_professional_skills' into test20250220

src/components/growthpath/CommonHomework.vue

@@ -94,6 +94,7 @@ const formData = useResetRef({
 });
 const emit = defineEmits(["update:info", "close"]);
 const dateTime = ref([]);
+// 验证
 const rulesRef = ref({
   workName: [
     {
@@ -121,7 +122,7 @@ const rulesRef = ref({
   ],
 });
 
-const { resetFields, validate } = Form.useForm(formData, rulesRef);
+const { validate } = Form.useForm(formData, rulesRef);
 
 onMounted(() => {
   formData.value = props.info;
@@ -135,7 +136,7 @@ const closeDrawer = () => {
   dateTime.value = [];
   emit("close");
 };
-
+// 开始时间结束时间处理
 function timeChange(time, timeStr) {
   formData.value.submitStartTime = timeStr[0];
   formData.value.submitEndTime = timeStr[1];

src/views/growthpath/PathManage.vue

@@ -403,7 +403,6 @@
                                 <div
                                   style="
                                     height: 200px;
-                                    width: 180px;
                                     overflow: auto;
                                   "
                                 >

src/views/report/Employeelearning.vue

@@ -363,14 +363,14 @@ export default {
         width: 120,
         align: "center",
       },
-      {
+      // {
-        title: "专业力学习",
+      //   title: "专业力学习",
-        dataIndex: "growthStudy",
+      //   dataIndex: "growthStudy",
-        ellipsis: true,
+      //   ellipsis: true,
-        key: "growthStudy",
+      //   key: "growthStudy",
-        width: 120,
+      //   width: 120,
-        align: "center",
+      //   align: "center",
-      },
+      // },
       {
         title: "学习时长",
         dataIndex: "learningDuration",

src/views/report/Operational.vue

@@ -106,10 +106,10 @@
                   label: '学习路径图',
                   value: 6,
                 },
-                {
+                // {
-                  label: '专业力必修',
+                //   label: '专业力必修',
-                  value: 7,
+                //   value: 7,
-                },
+                // },
               ]"
             ></a-select>
           </div>

src/views/report/Overvoew.vue

@@ -361,7 +361,7 @@ export default {
           { text: "课程", num: res.data.result?.courseTotal },
           { text: "考试", num: res.data.result?.examTotal },
           { text: "案例", num: res.data.result?.caseTotal },
-          { text: "专业力", num: 10 },
+          // { text: "专业力", num: 10 },
         ];
         tabData.value = list;
       });
@@ -899,7 +899,7 @@ export default {
       { text: "课程", num: "11" },
       { text: "考试", num: "10" },
       { text: "案例", num: "10" },
-      { text: "专业力必修", num: "10" },
+      // { text: "专业力必修", num: "10" },
     ]);
     const tabClick = (index) => {
       state.selectedRowKeys = [];