Merge branch 'compulsory_professional_skills' into test20250220

src/components/growthpath/GrowthFaceStu.vue

@@ -125,16 +125,11 @@ div
             style="margin-top: 20px; flex-wrap: wrap"
             v-if="data?.length"
           >
-            <div
+            <div class="btn btn1" @click="step = 2">
-              :class="{ notClick: courseSelectRows.length > 0 }"
-              class="btn btn1"
-              @click="step = 2"
-            >
               <div class="img3"></div>
               <div class="wz">添加学员</div>
             </div>
             <div
-              :class="{ notClick: courseSelectRows.length > 0 }"
               class="btn btn1"
               style="margin-right: 20px; margin-left: 20px"
               @click="step = 3"
@@ -147,7 +142,6 @@ div
                 class="btn btn1"
                 style="margin-right: 20px"
                 @click="qrcodeVisibleSign()"
-                :class="{ notClick: courseSelectRows.length > 0 }"
               >
                 <div class="wz">签到二维码</div>
               </div>
@@ -156,7 +150,6 @@ div
                 style="margin-right: 20px"
                 v-if="data[coursePlanIndex]?.assessmentId"
                 @click="qrcodeAssement()"
-                :class="{ notClick: courseSelectRows.length > 0 }"
               >
                 <div class="wz">评估二维码</div>
               </div>
@@ -164,7 +157,6 @@ div
                 class="btn btn1"
                 style="margin-right: 20px"
                 @click="qrcodeVisible()"
-                :class="{ notClick: courseSelectRows.length > 0 }"
               >
                 <div class="wz">开课二维码</div>
               </div>
@@ -187,7 +179,6 @@ div
                 class="btn btn1"
                 @click="exportTaskStu"
                 style="margin-right: 20px"
-                :class="{ notClick: courseSelectRows.length > 0 }"
               >
                 <div class="img2"></div>
                 <div class="wz">导出签到数据</div>
@@ -196,7 +187,6 @@ div
                 class="btn btn1"
                 @click="exportAssessment"
                 v-if="data[coursePlanIndex]?.assessmentId"
-                :class="{ notClick: courseSelectRows.length > 0 }"
               >
                 <div class="img2"></div>
                 <div class="wz">导出评估数据</div>
@@ -460,8 +450,6 @@ const columns = ref([
     title: "考勤情况",
     ellipsis: true,
     className: "h",
-    dataIndex: "opacation",
-    key: "opacation",
     width: 130,
     align: "center",
     customRender: (text) =>
@@ -470,13 +458,19 @@ const columns = ref([
         <div class="opa">
           <a-radio
             checked={text.record.signStatus}
-            onClick={() => stuSign(text)}
+            onClick={(event) => {
+              event.stopPropagation();
+              stuSign(text);
+            }}
           >
             签到
           </a-radio>
           <a-radio
             checked={text.record.leaveStatus}
-            onClick={() => stuSign(text)}
+            onClick={(event) => {
+              event.stopPropagation();
+              stuSign(text);
+            }}
           >
             请假
           </a-radio>
@@ -491,7 +485,7 @@ const columns = ref([
     className: "h",
     dataIndex: "opacation",
     key: "opacation",
-    width: 130,
+    width: 80,
     align: "center",
     customRender: ({ record }) =>
       data.value[coursePlanIndex.value].type == 4 ||
@@ -570,17 +564,17 @@ const batchSign = () => {
         .attendanceSign({
           courseId: offcoursePlanId.value,
           ids: courseSelectRows.value?.map((t) => t.studentId),
-          taskId: props.datasource.id,
           taskType: props.datasource.taskType,
           type: 3,
         })
         .then((res) => {
           message.success("签到成功");
+          tableRef.value.fetch();
         })
         .catch((err) => {
           message.error("签到失败");
         });
-      tableRef.value.fetch();
+      
     },
   });
 };
@@ -603,7 +597,6 @@ const batchSignAll = () => {
         .catch((err) => {
           message.error("签到失败");
         });
-      tableRef.value.fetch();
     },
   });
 };
@@ -630,7 +623,7 @@ function stuSign(text) {
       // taskId: props.datasource.id,
       taskType: props.datasource.taskType,
       type: 3,
-    });
+    })
 }
 
 //搜索学员

src/components/growthpath/GrowthFaceTaskManage.vue

@@ -315,7 +315,7 @@ const columns = ref([
     dataIndex: "studentName",
     key: "studentName",
     width: 50,
-    align: "left",
+    align: "center",
     className: "classify",
     scopedSlots: { customRender: "action" },
     customRender: (text) => (

src/components/growthpath/GrowthOnlineManage.vue

@@ -286,7 +286,6 @@ export default {
           dataIndex: "stdPositionName",
           key: "stdPositionName",
           align: "center",
-          ellipsis: true,
           className: "h",
           customRender: (text) => {
             return (
@@ -306,7 +305,6 @@ export default {
           dataIndex: "qualsLevelDesr",
           key: "qualsLevelDesr",
           align: "center",
-          ellipsis: true,
           className: "h",
           customRender: (text) => {
             return (
@@ -326,7 +324,6 @@ export default {
           dataIndex: "bandCode",
           key: "bandCode",
           align: "center",
-          ellipsis: true,
           className: "h",
           customRender: (text) => {
             return (
@@ -344,7 +341,6 @@ export default {
           dataIndex: "joinMethod",
           key: "joinMethod",
           align: "center",
-          ellipsis: true,
           className: "h",
           customRender: ({ record: { joinMethod } }) =>
             ({
@@ -357,7 +353,6 @@ export default {
           dataIndex: "progress",
           key: "progress",
           align: "center",
-          ellipsis: true,
           className: "h",
           customRender: (text) => {
             return (
@@ -372,8 +367,7 @@ export default {
           dataIndex: "finishTime",
           key: "finishTime",
           align: "center",
-          width: 150,
+          width: 180,
-          ellipsis: true,
           customRender: (text) => {
             return (
               <div class="racona">
@@ -390,7 +384,6 @@ export default {
           dataIndex: "completionStatus",
           key: "completionStatus",
           align: "center",
-          ellipsis: true,
           className: "h",
           customRender: (text) => {
             return (

src/components/growthpath/GrowthOpenCourse.vue

@@ -603,6 +603,7 @@ const columns = ref([
     dataIndex: "teacher",
     key: "teacher",
     width: "20%",
+    ellipsis: true,
     align: "center",
     customRender: ({ record }) => {
       // const teachers = record.offteachers;

src/components/growthpath/ImportStu.vue

@@ -66,7 +66,7 @@
                         上传失败
                       </div>
                       <div v-else class="stateloading">
-                        {{ uploadpercent == 100 ? "上传成功" : "正在上传" }}
+                        {{ uploadpercent == 100 ? "导入成功" : "正在上传" }}
                       </div>
                     </div>
                     <div class="prog">
@@ -189,8 +189,8 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn2" @click="closeDrawer(false)">取消</button>
+        <button class="btn2" @click="closeDrawer(false)">关闭</button>
-        <button class="btn2" @click="closeDrawer(true)">确定</button>
+        <!-- <button class="btn2" @click="closeDrawer(true)">确定</button> -->
       </div>
     </div>
     <!--  加载动画 -->
@@ -346,7 +346,7 @@ export default {
         });
         state.fileName = info.file.name;
         let i = 0;
-        message.success("上传成功");
+        message.success("导入成功");
         if (info.file.response.code == 1) {
           state.fileList = [];
           state.addLoading = false;