Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # src/views/courselibrary/CoursewareManage.vue # src/views/learningpath/LearningPath.vue # src/views/learningpath/LevelAdd.vue
2025-12-20 08:16:46 +08:00 · 2023-02-01 20:25:12 +08:00
parent 2b00230efa 5e4b712a18
commit 39faeee056
7 changed files with 252 additions and 117 deletions
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1279,11 +1279,11 @@
            </div>
          </div>
          <div class="qrm_btnbox">
-            <div class="qrm_btn btn1">
-              <div class="btnText" @click="graduate_exit">取消</div>
+            <div class="qrm_btn btn1" @click="graduate_exit">
+              <div class="btnText">取消</div>
            </div>
-            <div class="qrm_btn btn2">
-              <div class="btnText" @click="handleJie">确定</div>
+            <div class="qrm_btn btn2" @click="handleJie">
+              <div class="btnText">确定</div>
            </div>
          </div>
        </div>
@@ -1550,15 +1550,10 @@ import {checkPer} from "@/utils/utils";
 const columns1 = [
  {
    title: "课程编号",
-    width: 100,
-    dataIndex: "num",
-    key: "num",
+    width: 130,
+    dataIndex: "offcourseNumber",
+    key: "offcourseNumber",
    align: "center",
-    customRender: ({ index, record }) => {
-      const pageNum =
-        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
-      return index + 1 + pageNum;
-    },
  },
  {
    title: "名称",
@@ -1619,7 +1614,7 @@ const columns1 = [
  {
    title: "学习人数",
    width: 130,
-    dataIndex: "stunum",
+    dataIndex: "studentCnt",
    key: "4",
    align: "center",
    customRender: ({ text }) => {
@@ -1720,7 +1715,7 @@ const columns1 = [
  },
  {
    title: "操作",
-    width: 320,
+    width: 370,
    dataIndex: "operation",
    key: "operation",
    fixed: "right",
@@ -1927,7 +1922,6 @@ const columns6 = [
      return text ? text : "-";
    },
  },
-  // 新加学员数
  {
    title: "学员数",
    dataIndex: "studentCnt",
@@ -2215,18 +2209,19 @@ export default defineComponent({
          customRender: ({ record }) => {
            return (
              <div class="racona">
-                {record.workScore ? (
+                {record.workScore === -2 ? (
+                  "-"
+                ) : record.workScore ? (
                  <span>{record.workScore}</span>
                ) : (
-                  // <span
-                  //   style={{ color: "#4EA6FF", cursor: "pointer" }}
-                  //   onClick={() => {
-                  //     handlJoinStu(record);
-                  //   }}
-                  // >
-                  //   成绩录入
-                  // </span>
-                  <span></span>
+                  <span
+                    style={{ color: "#4EA6FF", cursor: "pointer" }}
+                    onClick={() => {
+                      handlJoinStu(record);
+                    }}
+                  >
+                    成绩录入
+                  </span>
                )}
              </div>
            );
@@ -2256,15 +2251,35 @@ export default defineComponent({
          key: "8",
          align: "center",
        },
-        // 2023-1-12 隐藏 后面放开
-        // {
-        //   title: "结业状态",
-        //   width: "15%",
-        //   dataIndex: "completionStatus",
-        //   key: "8",
-        //   align: "center",
-        //   customRender: ({ record }) => <div>{{1:'结业'}[record.completionStatus] || '-'}</div>,
-        // },
+        {
+          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,
@@ -2518,6 +2533,7 @@ export default defineComponent({
      regisCom: false,
      comLeave: false,
      studentId: 0,
+      homeWorkId: null,
      studentItem: {},
      addOnlineCoursevisible: false, //新建面授弹窗

@@ -2910,6 +2926,7 @@ export default defineComponent({
        endTime: endTime,
        beginTime: startTime,
      });
+      console.log("获取面授课列表", res);
      const { rows, total, pageNo } = res.data.data;
      console.log(res.data.data);
      state.tableDataTotal1 = total;
@@ -3021,7 +3038,7 @@ export default defineComponent({
      state.scoreId = itm.id;
    };
    const handleOverStu = (itm) => {
-      console.log(itm);
+      console.log("点击结业", itm);
      state.studentId = itm.studentId;
      state.studentItem = itm;

@@ -3794,7 +3811,7 @@ export default defineComponent({
      state.kk_eidt = true;
    };
    const handelGuan = (itm) => {
-      console.log(676766);
+      console.log("开课信息", itm);
      state.offcourseId = itm.offcourseId;
      state.offcoursePlanId = itm.offcoursePlanId;
      state.studentId = itm.studentId;
@@ -3807,6 +3824,7 @@ export default defineComponent({

      state.sm_hs = true;
      // getTableDate2();
+      state.homeWorkId = itm.homeWorkId;
    };
    const sm_exit = () => {
      state.sm_hs = false;
@@ -3891,16 +3909,18 @@ export default defineComponent({
      if (state.rg_hs) {
        if (state.piliang) {
          api1.updateStudent({
-            score: state.lrcj_inputV1,
-            id: state.scoreId,
+            workScore: state.lrcj_inputV1,
+            workId: state.homeWorkId,
+            studentId: state.studentId,
          });
          getTableDate2();
          delete_exit1();
        } else {
          api1
            .updateStudent({
-              score: state.lrcj_inputV1,
-              id: state.scoreId,
+              workScore: state.lrcj_inputV1,
+              workId: state.homeWorkId,
+              studentId: state.studentId,
            })
            .then((res) => {
              console.log("成绩录入", res);
@@ -3920,17 +3940,20 @@ export default defineComponent({
    };
    const handleJie = async () => {
      if (state.graduate_hs) {
-        handleStudent({
-          offcoursePlanId: state.offcoursePlanId,
-          score: "",
-          studentIds: [state.studentId],
-          type: 2,
-        }).then((res) => {
-          if (res.data.code === 200) {
-            getTableDate2();
-            delete_exit1();
-          }
-        });
+        // state.studentItem.id
+        // console.log("state.studentItem.id", state.studentItem.id);
+        api1
+          .batchUpdateStatus({
+            completionStatus: 1,
+            ids: [state.studentItem?.id],
+            // status: 1,
+          })
+          .then((res) => {
+            if (res.data.code === 200) {
+              getTableDate2();
+              delete_exit1();
+            }
+          });
      }
    };
    //确认复制
@@ -4448,15 +4471,13 @@ export default defineComponent({

    // 管理开课
    const handleGuan22 = (item) => {
-      if (String(item.courseform) === '1') {
+      if (String(item.courseform) === "1") {
        return;
      }
-      if (String(item.courseform) === ('1' || '线上')) {
+      if (String(item.courseform) === ("1" || "线上")) {
        state.om_1 = true;
        state.ft_1 = false;
-      } else if (
-          String(item.courseform) === ('2' || '面授')
-      ) {
+      } else if (String(item.courseform) === ("2" || "面授")) {
        state.om_1 = true;
        state.ft_1 = true;
      }
@@ -4824,7 +4845,7 @@ export default defineComponent({
      handelChangePageTea2,
      submitReview,
      reviewClick,
-      checkPer,
+
      showPrower,
      showOwnPrower,
      showViewPrower,
@@ -7301,24 +7322,24 @@ export default defineComponent({
  margin-bottom: 20px;
 }

- .tableSelect {
-   position: relative;
-   .hoverList {
-     display: none;
-   }
-   &:hover {
-     .hoverList {
-       display: block;
-       position: absolute;
-       top: 20px;
-       left: -20px;
-       background: #fff;
-       box-sizing: border-box;
-       // padding: 20px;
-       color: #000000;
-     }
-   }
- }
+.tableSelect {
+  position: relative;
+  .hoverList {
+    display: none;
+  }
+  &:hover {
+    .hoverList {
+      display: block;
+      position: absolute;
+      top: 20px;
+      left: -20px;
+      background: #fff;
+      box-sizing: border-box;
+      // padding: 20px;
+      color: #000000;
+    }
+  }
+}

 // ::v-deep .w-e-toolbar {
 //   .w-e-bar-item {