From 2d8687324fd224721eba59677f47c12ca5bdd68d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com>
Date: Sat, 25 Feb 2023 20:07:07 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/AddCertificate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index 317a3088..67a3980f 100644
--- a/src/components/drawers/project/AddCertificate.vue
+++ b/src/components/drawers/project/AddCertificate.vue
@@ -603,6 +603,7 @@ export default {
               props.ACertificateEdit ? "证书修改成功" : "证书添加成功"
             );
             props.getCertificate && props.getCertificate();
+            closeDrawer();
           }
         })
         .catch((err) => {

From dd87c14781aed34697573c8912173aa02498ff11 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sat, 25 Feb 2023 20:33:44 +0800
Subject: [PATCH 02/16] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8F=8A=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/courseModal.vue           | 13 ++++---------
 src/views/research/components/ResearchAddItem.vue |  5 +++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 416ae6f0..e1b08b74 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -904,21 +904,16 @@ export default defineComponent({
       ];
       console.log("checkList", checkList);
       if (
-        !postData.organizationIds &&
-        !postData.jobTypeIds &&
-        !postData.bandIds
+        (!postData.organizationIds &&
+          !postData.jobTypeIds &&
+          !postData.bandIds) ||
+        !checkVal(checkList)
       ) {
         message.destroy();
         return message.error("请输入必填项");
       } else {
         state.addLoading = true;
       }
-      if (!checkVal(checkList)) {
-        message.destroy();
-        return message.error("请输入必填项");
-      } else {
-        state.addLoading = true;
-      }
 
       edit(postData).then((res) => {
         state.addLoading = false;
diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue
index 075b42f7..84b25443 100644
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -17,7 +17,7 @@
       </div>
       <div class="delete" @click="handleDel">删除</div>
     </div>
-    
+
     <div class="name uploadContent">
       <a-upload
         v-show="!curItem.imgVal"
@@ -44,7 +44,6 @@
         />
       </div>
     </div>
-   
   </div>
 </template>
 <script>
@@ -64,6 +63,8 @@ export default {
   },
   setup(props, { emit }) {
     const curItem = ref(props.item);
+    console.log("选项信息", curItem.value, process.env.VUE_APP_FILE_PATH);
+    curItem.value.imgVal = process.env.VUE_APP_FILE_PATH + curItem.value.imgVal;
     const state = reactive({
       hasImgName: "",
     });

From 7f616f52780cb220add6b3723e9557c63de6c553 Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Sat, 25 Feb 2023 21:09:26 +0800
Subject: [PATCH 03/16] =?UTF-8?q?fix=EF=BC=9A=E9=A1=B9=E7=9B=AE=3D?=
 =?UTF-8?q?=E3=80=8B=E6=A8=A1=E6=9D=BF=E5=BA=93=3D=E3=80=8B=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/LibraryAdd.vue | 119 ++++++++++++++-----------
 1 file changed, 68 insertions(+), 51 deletions(-)

diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 3649eb52..05faec23 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -1163,29 +1163,34 @@ export default defineComponent({
     };
     const getScoreRule = () => {
       scoreRule({
-        projectId: localStorage.getItem("projectTemplateId"),
+        projectId: projectTemplateId,
       })
           .then((res) => {
-            console.log("获取了项目积分规则", res.data.data);
             let result = res.data.data;
-            console.log("获取了项目积分规则:", result);
-            if (result.size > 0) {
-              scoresum.value = result.totalScore == null ? 0 : result.totalScore; //Write operation failed: computed value is readonly
-              state.seven1 = result.leaderScore;
-              state.score1 = result.courseScore;
-              state.done2 = result.homeworkItem[1].scoreLimit;
-              state.done3 = result.homeworkItem[1].score;
-              state.four1 = result.topCompleteCourseItem[0].numLimit;
-              state.four2 = result.topCompleteCourseItem[0].score;
-              state.four3 = result.homeworkItem[0].numLimit;
-              state.four4 = result.homeworkItem[0].scoreLimit;
-              state.four5 = result.homeworkItem[0].score;
-              state.five1 = result.examItem[0].scoreLimit;
-              state.five2 = result.examItem[0].score;
-              state.six1 = result.signScore;
-              state.seven1 = result.leaderScore;
-              state.seven2 = result.topStudentScore;
-            }
+           //Write operation failed: computed value is readonly 总积分
+
+            state.scoresum = Number(result[0].pointsCount) + Number(result[1].pointsCount) + Number(result[2].pointsCount) + Number(result[3].pointsCount) + Number(result[4].pointsCount) + Number(result[5].pointsCount) + Number(result[6].pointsCount) + Number(result[7].pointsCount)
+
+            state.score1 = result[0].pointsCount; 
+
+            state.done2 = result[1].typeDescConfig;
+            state.done3 = result[1].pointsCount;
+
+            state.four1 = result[2].typeDescConfig;
+            state.four2 = result[2].pointsCount;
+
+            state.four3 = result[3].typeDescConfig.slice(0,result[3].typeDescConfig.indexOf(';'));
+            state.four4 = result[3].typeDescConfig.slice(result[3].typeDescConfig.indexOf(';')+1);
+            state.four5 = result[3].pointsCount;
+
+            state.five1 = result[4].typeDescConfig;
+            state.five2 = result[4].pointsCount;
+
+            state.six1 = result[5].pointsCount;
+
+            state.seven1 = result[6].pointsCount;
+
+            state.seven2 = result[7].pointsCount;
 
           })
           .catch((err) => {
@@ -1307,45 +1312,57 @@ export default defineComponent({
     //设置积分规则
     const editRule = () => {
       let obj = {
-        courseScore: state.score1,
-        examItem: [
+        projectId: projectTemplateId,
+        datas:[
           {
-            numLimit: 0,
-            score: state.five2,
-            scoreLimit: state.five1,
-            type: 3,
+              "type": 1,
+              "pointsCount": Number(state.score1),
+              "typeDesc": "完成【必修/选修】获得%p积分",
+              "typeDescConfig": ""
           },
-        ],
-
-        homeworkItem: [
-          //有名次要求的提交作业
           {
-            numLimit: state.four3,
-            score: state.four5,
-            scoreLimit: state.four4,
-            type: 2,
+              "type": 2,
+              "pointsCount": Number(state.done3),
+              "typeDesc": "完成作业成绩不低于%d分获得%p积分",
+              "typeDescConfig": state.done2
           },
-          //无名次要求的提交作业
           {
-            numLimit: 0,
-            score: state.done3,
-            scoreLimit: state.done2,
-            type: 2,
+              "type": 3,
+              "pointsCount": Number(state.four2),
+              "typeDesc": "前%d名学完在线课程获得%p积分",
+              "typeDescConfig": state.four1
           },
-        ],
-        leaderScore: state.seven1,
-        projectId: localStorage.getItem("projectTemplateId"),
-        signScore: state.six1,
-        topCompleteCourseItem: [
           {
-            numLimit: state.four1,
-            score: state.four2,
-            scoreLimit: 0,
-            type: 1,
+              "type": 4,
+              "pointsCount": Number(state.four5),
+              "typeDesc": "前%d名提交作业且成绩不低于%d分获得%p积分",
+              "typeDescConfig":  state.four3 + ';' + state.four4
           },
-        ],
-        topStudentScore: state.seven2,
-        totalScore: scoresum.value,
+          {
+              "type": 5,
+              "pointsCount": Number(state.five2),
+              "typeDesc": "考试成绩高于%d分获得%p积分",
+              "typeDescConfig": state.five1
+          },
+          {
+              "type": 6,
+              "pointsCount": Number(state.six1),
+              "typeDesc": "考勤正常学员获得%p积分",
+              "typeDescConfig": ""
+          },
+          {
+              "type": 7,
+              "pointsCount": Number(state.seven1),
+              "typeDesc": "成为小组长获得%p积分",
+              "typeDescConfig": ""
+          },
+          {
+              "type": 8,
+              "pointsCount": Number(state.seven2),
+              "typeDesc": "优秀学员可获得%p积分",
+              "typeDescConfig": ""
+          }
+        ]
       };
       console.log(obj);
       setScoreRule(obj)

From 6089ab74f9b3130a372ed54379e1d6ef36651b50 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 21:29:18 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E7=BB=84=E5=91=98=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue | 2 +-
 src/components/student/CommonStudent.vue    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 1fedd458..90fa94af 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -71,7 +71,7 @@
           </div>
           <div class="btn btn1" @click="exportTaskStu">
             <div class="img2"></div>
-            <div class="wz">导出数据1</div>
+            <div class="wz">导出数据</div>
           </div>
         </div>
         <!-- <div class="line">
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 7ddcaedc..55e37577 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -395,6 +395,7 @@ const getStu = () => {
           realName: value.studentName,
           userNo: value.studentId,
           isLeader: value.isLeader,
+          groupId: value.groupId,
           orgName: value.studentOrgName ? value.studentOrgName : "-",
           departName: value.studentDepartName ? value.studentDepartName : "-",
         };
@@ -411,6 +412,7 @@ const projectChangePagination = (page) => {
   getStu();
 };
 function onProjectSelectChange(e, l) {
+  debugger
   console.log("eeeee", e, l);
   projectSelectKeys.value = e;
   selectsData.value.projectMemberList = l;
@@ -458,8 +460,8 @@ const searchOrgName = ref({
 const stageIds = computed(() => props.stage);
 const {
   data: stuData,
-  fetch: searchStu,
   page: stuPageNo,
+  fetch: searchStu,
   pageSize: stuPageSize,
   loading: stuLoading,
   total: stuTotal,
@@ -742,6 +744,7 @@ const resetStu = () => {
 const deleteDepSelect = () => {
   stuSelectKeys.value = [];
   selectedOrgKeys.value = [];
+  projectSelectKeys.value = [];
 };
 //重置组织
 const resetOrg = () => {
@@ -765,6 +768,7 @@ const resetAudienceInfo = () => {
 // };
 //确定添加授权
 const submitAuth = () => {
+  debugger
   if (props.type === 2) {
     stageVisible.value = true;
   } else {
@@ -784,6 +788,7 @@ function handleStageOk() {
       return message.warning("当前选中学员"+leaderArray[0].realName+"已是小组长，请勿重复选择。");
     }
     // 对选中的人员进行判断是否已经分组了
+    debugger
     let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
     if (haveGroupNum.length > 0) {
       message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");

From c5d3f6fdd95da48342a7fc56d77b86263401d5d5 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 21:42:12 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E5=AD=A6=E5=91=98=E4=BA=BA=E6=95=B0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 55e37577..de01dd4d 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -412,7 +412,6 @@ const projectChangePagination = (page) => {
   getStu();
 };
 function onProjectSelectChange(e, l) {
-  debugger
   console.log("eeeee", e, l);
   projectSelectKeys.value = e;
   selectsData.value.projectMemberList = l;
@@ -768,7 +767,6 @@ const resetAudienceInfo = () => {
 // };
 //确定添加授权
 const submitAuth = () => {
-  debugger
   if (props.type === 2) {
     stageVisible.value = true;
   } else {
@@ -779,7 +777,17 @@ const submitAuth = () => {
 function handleStageOk() {
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
-    if (props.groupMemberCount < selectsData.value.projectMemberList.length + Number(props.groupMemberNumber)) {
+    let selectMember = 0;
+    if (activeKey.value === 4) { // 项目内选人
+      selectMember = selectsData.value.projectMemberList.length
+    } else if (activeKey.value === 1) {
+      selectMember = selectsData.value.studentList.length
+    } else if (activeKey.value === 2) {
+      selectMember = selectsData.value.groupList.length
+    } else if (activeKey.value === 3) {
+      selectMember = selectsData.value.deptList.length
+    }
+    if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
       return message.warning("添加小组学员超过最大值");
     }
     // 判断是否是组长，组长不能添加
@@ -788,7 +796,6 @@ function handleStageOk() {
       return message.warning("当前选中学员"+leaderArray[0].realName+"已是小组长，请勿重复选择。");
     }
     // 对选中的人员进行判断是否已经分组了
-    debugger
     let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
     if (haveGroupNum.length > 0) {
       message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");

From 468741695215bfc560f149f366abc3872b0aef49 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sat, 25 Feb 2023 21:46:12 +0800
Subject: [PATCH 06/16] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E5=BC=80=E8=AF=BE=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 333 ++++++++++---------
 1 file changed, 180 insertions(+), 153 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 5dc54a08..ae3845b8 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1211,7 +1211,11 @@
                   {{ currentPlanItem.name }}课程-第1期-
                   {{ currentPlanItem.createTime }}
                 </span>
-                <span style="color: #ffb751">已开课 4.5</span>
+                <span
+                  style="color: #ffb751"
+                  v-if="currentPlanItem.courseScore !== -1"
+                  >已开课 {{ currentPlanItem.courseScore }}</span
+                >
               </div>
               <div class="stmm_i2">
                 <span style="color: #999ba3">时间：</span>
@@ -2327,159 +2331,7 @@ export default defineComponent({
           slots: { customRender: "operation" },
         },
       ],
-      //新加
-      stuColumns: [
-        {
-          title: "岗位",
-          width: "8%",
-          dataIndex: "studentJobName",
-          key: "7",
-          align: "center",
-          customRender: (text) => {
-            return (
-              <div class="racona">
-                <span>
-                  {text && text.record.studentJobName
-                    ? text.record.studentJobName
-                    : "-"}
-                </span>
-              </div>
-            );
-          },
-        },
-        {
-          title: "Band",
-          width: "8%",
-          dataIndex: "studentBandDesc",
-          key: "7",
-          align: "center",
-          customRender: (record) => {
-            return (
-              <div class="racona">
-                <span>
-                  {record.studentBandDesc ? record.studentBandDesc : "-"}
-                </span>
-              </div>
-            );
-          },
-        },
-        {
-          title: "报名状态",
-          width: "8%",
-          dataIndex: "status",
-          key: "5",
-          align: "center",
-          customRender: ({ record }) => {
-            switch (String(record.status)) {
-              case "0":
-                return "审核通过";
-              case "1":
-                return "待审核";
-              case "2":
-                return "审核拒绝";
-            }
-          },
-        },
 
-        {
-          title: "签到状态",
-          width: "8%",
-          dataIndex: "signstatus",
-          key: "7",
-          align: "center",
-          customRender: ({ record }) =>
-            record.signStatus ? "已签到" : "未签到",
-        },
-        {
-          title: "评估状态",
-          width: "8%",
-          dataIndex: "evastatus",
-          key: "8",
-          align: "center",
-          customRender: ({ record }) =>
-            record.assessmentStatus ? "已评估" : "未评估",
-        },
-        {
-          title: "作业成绩",
-          width: "8%",
-          dataIndex: "workScore",
-          key: "7",
-          align: "center",
-          customRender: ({ record }) => {
-            return (
-              <div class="racona">
-                {record.workScore === -2 ? (
-                  "-"
-                ) : record.workScore ? (
-                  <span>{record.workScore}</span>
-                ) : (
-                  <span
-                    style={{ color: "#4EA6FF", cursor: "pointer" }}
-                    onClick={() => {
-                      handlJoinStu(record);
-                    }}
-                  >
-                    成绩录入
-                  </span>
-                )}
-              </div>
-            );
-            // switch (String(record.status)) {
-            //   case "0":
-            //     return (
-            //       <span
-            //         style={{ color: "#4EA6FF", cursor: "pointer" }}
-            //         onClick={() => {
-            //           handlJoinStu(record);
-            //         }}
-            //       >
-            //         成绩录入
-            //       </span>
-            //     );
-            //   case "1":
-            //     return "-";
-            //   case "2":
-            //     return "-";
-            // }
-          },
-        },
-        {
-          title: "考试成绩",
-          width: "8%",
-          dataIndex: "examinationScore",
-          key: "8",
-          align: "center",
-        },
-        {
-          title: "结业状态",
-          width: "15%",
-          dataIndex: "completionStatus",
-          key: "8",
-          align: "center",
-          customRender: ({ record }) => {
-            return (
-              <div>
-                {record.finishStatus == 1 &&
-                record.workScore != -2 &&
-                record.signStatus == 1 ? (
-                  <div
-                    style={{ color: "#4EA6FF", cursor: "pointer" }}
-                    onClick={() => {
-                      handleOverStu(record);
-                    }}
-                  >
-                    结业
-                  </div>
-                ) : record.completionStatus == 1 ? (
-                  <div>已结业</div>
-                ) : (
-                  <div>-</div>
-                )}
-              </div>
-            );
-          },
-        },
-      ],
       shipType: 1,
       addLoading: false,
       currentPlanItem: {},
@@ -2586,6 +2438,7 @@ export default defineComponent({
         //   overstatus: "-",
         // },
       ],
+      stuColumns: [],
       currentPage1: 1,
       tableDataTotal1: -1,
       pageSize1: 10,
@@ -3891,6 +3744,173 @@ export default defineComponent({
       state.cstm_hs = true;
       state.kk_eidt = true;
     };
+    const columnFun = (itm) => {
+      //新加
+      state.stuColumns = [
+        {
+          title: "岗位",
+          width: "8%",
+          dataIndex: "studentJobName",
+          key: "7",
+          align: "center",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span>
+                  {text && text.record.studentJobName
+                    ? text.record.studentJobName
+                    : "-"}
+                </span>
+              </div>
+            );
+          },
+        },
+        {
+          title: "Band",
+          width: "8%",
+          dataIndex: "studentBandDesc",
+          key: "7",
+          align: "center",
+          customRender: (record) => {
+            return (
+              <div class="racona">
+                <span>
+                  {record.studentBandDesc ? record.studentBandDesc : "-"}
+                </span>
+              </div>
+            );
+          },
+        },
+        {
+          title: "报名状态",
+          width: "8%",
+          dataIndex: "status",
+          key: "5",
+          align: "center",
+          customRender: ({ record }) => {
+            switch (String(record.status)) {
+              case "0":
+                return "审核通过";
+              case "1":
+                return "待审核";
+              case "2":
+                return "审核拒绝";
+            }
+          },
+        },
+
+        {
+          title: "签到状态",
+          width: "8%",
+          dataIndex: "signstatus",
+          key: "7",
+          align: "center",
+          customRender: ({ record }) =>
+            record.signStatus ? "已签到" : "未签到",
+        },
+        {
+          title: "评估状态",
+          width: "8%",
+          dataIndex: "evastatus",
+          key: "8",
+          align: "center",
+          customRender: ({ record }) =>
+            record.assessmentStatus ? "已评估" : "未评估",
+        },
+
+        {
+          title: "作业成绩",
+          width: "8%",
+          dataIndex: "workScore",
+          key: "7",
+          align: "center",
+          customRender: ({ record }) => {
+            return (
+              <div class="racona">
+                {record.workScore === -2 ? (
+                  "-"
+                ) : record.workScore ? (
+                  <span>{record.workScore}</span>
+                ) : (
+                  <span
+                    style={{ color: "#4EA6FF", cursor: "pointer" }}
+                    onClick={() => {
+                      handlJoinStu(record);
+                    }}
+                  >
+                    成绩录入
+                  </span>
+                )}
+              </div>
+            );
+            // switch (String(record.status)) {
+            //   case "0":
+            //     return (
+            //       <span
+            //         style={{ color: "#4EA6FF", cursor: "pointer" }}
+            //         onClick={() => {
+            //           handlJoinStu(record);
+            //         }}
+            //       >
+            //         成绩录入
+            //       </span>
+            //     );
+            //   case "1":
+            //     return "-";
+            //   case "2":
+            //     return "-";
+            // }
+          },
+        },
+        {
+          title: "考试成绩",
+          width: "8%",
+          dataIndex: "examinationScore",
+          key: "8",
+          align: "center",
+        },
+        {
+          title: "结业状态",
+          width: "15%",
+          dataIndex: "completionStatus",
+          key: "8",
+          align: "center",
+          customRender: ({ record }) => {
+            return (
+              <div>
+                {record.finishStatus == 1 &&
+                record.workScore != -2 &&
+                record.signStatus == 1 ? (
+                  <div
+                    style={{ color: "#4EA6FF", cursor: "pointer" }}
+                    onClick={() => {
+                      handleOverStu(record);
+                    }}
+                  >
+                    结业
+                  </div>
+                ) : record.completionStatus == 1 ? (
+                  <div>已结业</div>
+                ) : (
+                  <div>-</div>
+                )}
+              </div>
+            );
+          },
+        },
+      ];
+      if (itm.courseScore !== -1) {
+        let obj = {
+          title: "评分",
+          width: "8%",
+          dataIndex: "studentScore",
+          key: "8",
+          align: "center",
+        };
+
+        state.stuColumns.splice(6, 0, obj);
+      }
+    };
     const handelGuan = (itm) => {
       console.log("开课信息", itm);
       state.offcourseId = itm.id;
@@ -3906,6 +3926,7 @@ export default defineComponent({
       state.sm_hs = true;
       // getTableDate2();
       state.homeWorkId = itm.homeWorkId;
+      columnFun(itm);
     };
     const sm_exit = () => {
       state.sm_hs = false;
@@ -7166,6 +7187,12 @@ export default defineComponent({
       }
     }
   }
+  .tableShow2 {
+    display: inline-block;
+  }
+  .tableHiddle2 {
+    display: none;
+  }
 }
 
 .tag-content {

From 96a63b8c0958e509bc23825f2c2c18b33c40bfe7 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sat, 25 Feb 2023 21:54:32 +0800
Subject: [PATCH 07/16] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/EvList.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index a74d39b4..be338469 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -129,10 +129,16 @@
             如项目中有测评需求，请您联系BOEU测评部
           </div>
         </div>
-        <div class="limitsRow">
+        <div class="limitsRow" style="align-items: flex-start">
           <div class="limitsRowDrop"></div>
-          <div class="limitsRowText">
-            联系人：王逸（10167304） 联系电话：010-60965646
+          <div style="margin-top: 10px">
+            <div class="limitsRowText">联系人：</div>
+            <div class="limitsRowText">
+              王逸（10167304） 联系电话：010-60965646
+            </div>
+            <div class="limitsRowText">
+              宋哲（10157955） 联系电话：010-60965435
+            </div>
           </div>
         </div>
       </div>
@@ -186,10 +192,6 @@ const toolList = ref([
         text1: "PDP性格类型测验",
         text2: "各层级人员",
       },
-      {
-        text1: "RTC综合评估",
-        text2: "各层级人员",
-      },
       {
         text1: "大五职业性格测评",
         text2: "各层级人员",

From 5b24b8ef58d6de1665ae2d3e7f21d797bf37d3fb Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sat, 25 Feb 2023 22:00:41 +0800
Subject: [PATCH 08/16] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 63 +++++++++++++++-----
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index ae3845b8..c1ed3866 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1211,10 +1211,13 @@
                   {{ currentPlanItem.name }}课程-第1期-
                   {{ currentPlanItem.createTime }}
                 </span>
-                <span
-                  style="color: #ffb751"
-                  v-if="currentPlanItem.courseScore !== -1"
-                  >已开课 {{ currentPlanItem.courseScore }}</span
+                <span style="color: #ffb751"
+                  >已开课
+                  {{
+                    currentPlanItem.courseScore !== -1
+                      ? currentPlanItem.courseScore
+                      : "-"
+                  }}</span
                 >
               </div>
               <div class="stmm_i2">
@@ -3817,7 +3820,37 @@ export default defineComponent({
           customRender: ({ record }) =>
             record.assessmentStatus ? "已评估" : "未评估",
         },
-
+        {
+          title: "评分",
+          width: "8%",
+          dataIndex: "studentScore",
+          key: "8",
+          align: "center",
+          customRender: ({ record }) => {
+            return (
+              <div class="racona">
+                {record.studentScore !== -1 ? record.studentScore : "-"}
+              </div>
+            );
+            // switch (String(record.status)) {
+            //   case "0":
+            //     return (
+            //       <span
+            //         style={{ color: "#4EA6FF", cursor: "pointer" }}
+            //         onClick={() => {
+            //           handlJoinStu(record);
+            //         }}
+            //       >
+            //         成绩录入
+            //       </span>
+            //     );
+            //   case "1":
+            //     return "-";
+            //   case "2":
+            //     return "-";
+            // }
+          },
+        },
         {
           title: "作业成绩",
           width: "8%",
@@ -3899,17 +3932,17 @@ export default defineComponent({
           },
         },
       ];
-      if (itm.courseScore !== -1) {
-        let obj = {
-          title: "评分",
-          width: "8%",
-          dataIndex: "studentScore",
-          key: "8",
-          align: "center",
-        };
+      // if (itm.courseScore !== -1) {
+      //   let obj = {
+      //     title: "评分",
+      //     width: "8%",
+      //     dataIndex: "studentScore",
+      //     key: "8",
+      //     align: "center",
+      //   };
 
-        state.stuColumns.splice(6, 0, obj);
-      }
+      //   state.stuColumns.splice(6, 0, obj);
+      // }
     };
     const handelGuan = (itm) => {
       console.log("开课信息", itm);

From 729d25527e32abd405cd679fb4b8645014a2c4a3 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 22:02:17 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E9=95=BF=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=8D=A2=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 3a486ee1..3703d254 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -769,7 +769,7 @@
                     <a-button @click="settingTopFlag(record)" type="link"
                       >{{ record.topFlag ? "取消优秀" : "优秀学员" }}
                     </a-button>
-                    <a-button type="link" @click="showChangeGroupModal(record)"
+                    <a-button type="link" :disabled="record.isLeader === '1'" @click="showChangeGroupModal(record)"
                       >换组
                     </a-button>
                   </template>

From c855f03fc91d6a312a8e778b7a83725a5083660f Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 25 Feb 2023 22:02:21 +0800
Subject: [PATCH 10/16] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=8A=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ExportScore.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index c555a587..b3ee5147 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -236,6 +236,12 @@ export default {
       if (status === "done") {
         state.fileName = info.file.name;
         let i = 0;
+        let timeouts = setTimeout(() => {
+          clearInterval(timer)
+          state.addLoading = false;
+          message.destroy(); 
+          message.error(`文件导入超时`);
+        }, 30000);
         let timer = setInterval(() => {
           let uid = info.file.response.data;
           api
@@ -256,25 +262,21 @@ export default {
                   state.downloadErrUrl = res.data.data.url;
                   console.log("props.getStudent", props.getStudent);
                   clearInterval(timer);
+                  clearTimeout(timeouts);
                 }
               } else {
                 state.addLoading = false;
                 message.destroy();
-                message.error(`文件导入超时`);
+                clearTimeout(timeouts);
               }
             })
             .catch((err) => {
               state.addLoading = false;
               clearInterval(timer);
+              clearTimeout(timeouts);
               console.log("查询导入状态失败", err);
             });
         }, 500);
-        setTimeout(() => {
-          clearInterval(timer)
-          state.addLoading = false;
-          message.destroy();
-          message.error(`文件导入超时`);
-        }, 30000);
       } else if (status === "error") {
         state.uploadErr = true;
         message.error(`${info.file.name}上传失败`);

From 6a401739618ad3fc5cf532aa4e95438cdf34e534 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 25 Feb 2023 22:07:46 +0800
Subject: [PATCH 11/16] =?UTF-8?q?fix:=E5=A4=96=E9=83=A8=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=88=90=E7=BB=A9=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectExternalExamManage.vue    | 2 +-
 .../drawers/router/RouterExaminationExternalManage.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue
index 61f62857..49b7f074 100644
--- a/src/components/drawers/project/ProjectExternalExamManage.vue
+++ b/src/components/drawers/project/ProjectExternalExamManage.vue
@@ -296,7 +296,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.score?text.record.score:"-"}</span>
+                  <span> {text.record.score?text.record.score<0?"-":text.record.score:"-"} </span>
                 </div>
               );
             },
diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue
index 84cc0c66..cae1c3ed 100644
--- a/src/components/drawers/router/RouterExaminationExternalManage.vue
+++ b/src/components/drawers/router/RouterExaminationExternalManage.vue
@@ -300,7 +300,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.score?text.record.score:"-"}</span>
+                  <span> {text.record.score?text.record.score<0?"-":text.record.score:"-"}</span>
                 </div>
               );
             },

From 6a17b59a080a6de3e261c73b63cd55218935a244 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sat, 25 Feb 2023 22:12:09 +0800
Subject: [PATCH 12/16] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9itm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index c1ed3866..336a7f14 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3748,6 +3748,7 @@ export default defineComponent({
       state.kk_eidt = true;
     };
     const columnFun = (itm) => {
+      console.log("itm", itm);
       //新加
       state.stuColumns = [
         {

From afe9b38669e1fec2dda343394cd32a1e43df8ffc Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Sat, 25 Feb 2023 22:28:10 +0800
Subject: [PATCH 13/16] update

---
 src/views/projectcenter/LibraryAdd.vue  |  2 +-
 src/views/projectcenter/templateAdd.vue | 68 ++++++++++++++++++-------
 2 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 05faec23..229bd68b 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -1114,7 +1114,7 @@ export default defineComponent({
       routered.push({
         path: "/templateAdd",
         query: {
-          projectTemplateId: state.projectInfo.projectTemplateId,
+          projectTemplateId: projectTemplateId,
         },
       });
     };
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 67b90b61..a03aa715 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -4,10 +4,10 @@
     <div class="header">
       <span class="title">创建/编辑单层模板</span>
       <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/libraryAdd"
-          class="goback"
+        @click="backPage"
+        style="cursor: pointer"
+        to="/libraryAdd"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -31,18 +31,18 @@
             />
           </div>
         </div>
-        <div class="name" style="align-items: flex-start">
+        <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
-          <div class="in select" style="display: flex">
+          <div class="in select" style="flex: 1; display: flex">
             <div
-                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-                style="
+              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+              style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -50,23 +50,52 @@
                 position: relative;
                 overflow: hidden;
               "
-                v-for="(src, index) in projectPic"
-                :key="index"
-                @click="() => (projectInfo.picUrl = src.value)"
+              v-for="(src, index) in projectPic"
+              :key="index"
+              :style="{
+                display: index >= 3 ? 'none' : 'flex',
+              }"
+              @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                  style="
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                  :src="src.value"
-                  alt="avatar"
+                :src="src.value"
+                alt="avatar"
               />
             </div>
+            <div
+              @click="showLearnBgMore"
+              v-if="projectPic.length > 3"
+              style="
+                width: 100px;
+                height: 100px;
+                padding-left: 15px;
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                border: 1px solid #c7cbd2;
+                font-size: 14px;
+                font-weight: 400;
+                color: #4ea6ff;
+                line-height: 36px;
+              "
+            >
+              查看更多
+              <img src="../../assets/images/projectadd/go.png" alt="" />
+            </div>
           </div>
         </div>
+
+
         <div class="name">
           <div class="namebox">
             <img
@@ -262,11 +291,14 @@ const getDetail = () =>
       projectInfo.value.rangeTime = [dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
         dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"),
       ];
-      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
+      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
+      console.log("查询到的模板库数据：" + JSON.stringify(projectInfo.value));
     });
 
 const backPage = () => {
-  router.back();
+  router.push({
+    path: "/libraryAdd",
+  });
 };
 
 function timeChange(e) {

From 0efc5e54857b44b9e622b9dad33b3ef3aaefe23b Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Sat, 25 Feb 2023 22:43:24 +0800
Subject: [PATCH 14/16] =?UTF-8?q?fix:=E8=AE=BE=E7=BD=AE-=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=EF=BC=9A=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/templateAdd.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index a03aa715..d376df65 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -271,7 +271,7 @@ const projectPic = ref([]);
 const courseSyncFlag = ref(true)
 onMounted(() => {
   getDetail();
-  projectPic.value = store.state.projectPic.map((e) => ({
+  projectPic.value = store.state.project_pic.map((e) => ({
     value: e.dictValue,
     label: e.dictName,
   }));
@@ -298,6 +298,7 @@ const getDetail = () =>
 const backPage = () => {
   router.push({
     path: "/libraryAdd",
+    query: { projectTemplateId : route.query.projectTemplateId}
   });
 };
 

From 2c0ee70d8d8b2d087356a3f9c9a352e1440cef1b Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sat, 25 Feb 2023 23:15:56 +0800
Subject: [PATCH 15/16] =?UTF-8?q?fix:=E8=AE=A8=E8=AE=BA=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddDiscuss.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 29ed863b..b521e30c 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -41,6 +41,12 @@
           </div>
           <div class="main_item2">
             <div class="signbox">
+              <div class="sign">
+                <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                />
+              </div>
               <span style="margin-right: 3px">讨论说明：</span>
             </div>
             <div class="textarea">
@@ -91,6 +97,12 @@ const rulesRef = ref({
       message: '请输入讨论名称',
     },
   ],
+  discussExplain: [
+    {
+      required: true,
+      message: '请输入讨论说明',
+    },
+  ],
 });
 
 const {resetFields, validate} = Form.useForm(formData, rulesRef);

From ab70395a76bfe11bb30de746c649f3f0e45244a7 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sun, 26 Feb 2023 00:57:55 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue  | 36 +++++++++-----------
 src/components/student/ChangeGroupModal.vue  |  1 -
 src/components/student/TableStudent.vue      |  1 -
 src/views/courselibrary/CoursewareManage.vue |  2 +-
 vue.config.js                                |  4 +--
 5 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 90fa94af..2c5b5b16 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -11,14 +11,14 @@
         <div class="titl">
           <div class="endtime">
             起止时间：{{
-              datasource.info && datasource.info.liveStartTime ? datasource.info.liveStartTime : "-"
+              datasource.startTime ? datasource.startTime : "-"
             }}
             ～
-            {{ datasource.info && datasource.info.liveEndTime ? datasource.info.liveEndTime : "-" }}
+            {{ datasource.endTime ? datasource.endTime : "-" }}
           </div>
 
-          <div class="endtime" style="margin-left: 64px">签到时间：{{ beginTime }}</div>
-          <div class="endtime" style="margin-left: 40px">签退时间：{{ endTime }}</div>
+          <div class="endtime" style="margin-left: 64px">签到时间：{{ beginTime }} ～ {{ endTime }}</div>
+            <!--<div class="endtime" style="margin-left: 40px">签退时间：{{ endTime }}</div>-->
         </div>
 
         <div class="search">
@@ -354,25 +354,24 @@ export default {
 
     // 计算签到时间
     const isSignClick = () => {
-      // debugger
-      console.log("计算签到时间", props.datasource.info);
-      let beginTime = new Date(props.datasource.info.liveStartTime).getTime();
-      let endTime = !props.datasource.info.afterSignIn
-        ? new Date(props.datasource.info.liveEndTime).getTime()
-        : new Date(props.datasource.info.liveStartTime).getTime();
+      console.log("计算签到时间", props.datasource);
+      let beginTime = new Date(props.datasource.startTime).getTime();
+      let endTime = !props.datasource.afterStart
+        ? new Date(props.datasource.endTime).getTime()
+        : new Date(props.datasource.startTime).getTime();
 
-      if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+      if (props.datasource.beforeStart && props.datasource.afterStart) {
         //有开始前有开始后
-        beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
-        endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+        endTime = endTime + props.datasource.afterStart * 60 * 1000;
         console.log("1111", beginTime, endTime);
-      } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) {
+      } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
         //只有开始前无开始后
-        beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
+        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
         console.log("11112222", beginTime);
-      } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+      } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
         //无开始前有开始后
-        endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+        endTime = endTime + props.datasource.afterStart * 60 * 1000;
         console.log("1111333", endTime);
       }
 
@@ -393,7 +392,6 @@ export default {
     };
 
     const getTableData = () => {
-      debugger
       // debugger
       console.log('当前是项目还是路径图 1 项目 2 路径图', props)
       console.log('当前是项目还是路径图 1 项目 2 路径图', props.types)
@@ -690,7 +688,6 @@ export default {
               <div class="opa" style='display:flex;justify-content:center;align-items:center;'>
                 <div
                   onClick={() => {
-                    debugger
                     {/* debugger */ }
                     console.log("点击签到", value);
                     // 获取当前时间
@@ -858,7 +855,6 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
-      debugger
       {/* debugger */ }
       console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
       console.log("props.datasource", props.datasource);
diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue
index ab4fa38f..c88bb7d8 100644
--- a/src/components/student/ChangeGroupModal.vue
+++ b/src/components/student/ChangeGroupModal.vue
@@ -85,7 +85,6 @@ const selectGroup = (e, v) => {
 };
 //确认换组
 const changeGroup = (item) => {
-  debugger
   console.log("换组", selectGroupId.value, item);
   props.checkgroupStuId.forEach(stu => {
     let obj = {
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index e6ce26d4..bd9e004a 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -427,7 +427,6 @@ const stuRowSelection = computed(() => ({
 
 //显示学员换组弹窗
 function showChangeGroupModal() {
-  debugger
   console.log("批量")
   const d = props.groupList
   console.log("d" + d)
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index c1ed3866..b9b1e719 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3747,7 +3747,7 @@ export default defineComponent({
       state.cstm_hs = true;
       state.kk_eidt = true;
     };
-    const columnFun = (itm) => {
+    const columnFun = () => {
       //新加
       state.stuColumns = [
         {
diff --git a/vue.config.js b/vue.config.js
index 6723a260..dd5b1af5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,8 +15,8 @@ module.exports = defineConfig({
         port: 8070,
         proxy: {
             "/manageApi": {
-                target: 'http:' + process.env.VUE_APP_PROXY_URL,
-                //target: 'http://localhost:30001',
+                // target: 'http:' + process.env.VUE_APP_PROXY_URL,
+                target: 'http://localhost:30001',
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",