Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

2025-12-24 10:12:54 +08:00 · 2023-01-18 09:08:56 +08:00
parent 8f0bf34883 e0f4c84ff0
commit 1c33d9ac64
11 changed files with 67 additions and 78 deletions
--- a/.env
+++ b/.env
@@ -20,7 +20,7 @@ VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVU

 # 课程二维码
 VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id=
-# 导入学员模板
+# 导入学员模板 -发版前记得修改
 VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673511599785.xlsx
 # 导入作业成绩学员模板
 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673511636808.xlsx
--- a/.env.prod
+++ b/.env.prod
@@ -13,4 +13,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading

 VUE_APP_COURSE_STUDY=https://u.boe.com/pc/course/studyindex?id=

-VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
+VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
+
+VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx
--- a/.env.release
+++ b/.env.release
@@ -13,4 +13,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading

 VUE_APP_COURSE_STUDY=https://u.boe.com/pc-release/course/studyindex?id=

-VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
+VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/
+
+VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.3------------");
+		console.log("版本2.1.4------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -28,8 +28,8 @@
          <div class="sortbox">
            <div class="sortname">进度排名</div>
            <div class="sortnub">
-              <span class="nub1">{{pro.currentChapterCnt}}</span>
-              <span class="total">/{{pro.totalChapterCnt}}</span>
+              <span class="nub1">{{rank.current}}</span>
+              <span class="total">/{{rank.total}}</span>
            </div>
          </div>
          <a-divider
@@ -209,6 +209,7 @@
 import { reactive, toRefs } from "vue";
 import CheckStuMess from "./CheckStuMess.vue";
 import {stuProgress} from "@/api/index1";
+import {studentRank} from "@/api/indexProjStu";
 // import {message} from "ant-design-vue";
 export default {
  name: "CheckStu",
@@ -234,17 +235,29 @@ export default {
      pro:null,
      loading:true,
      stageListActive: 0,
+      rank:{total:1,current:1},
    });
    const closeDrawer = () => {
      ctx.emit("update:CheckStuvisible", false);
    };

+    const getStuRank = () => {
+      studentRank({
+        projectId: props.routerId,
+        studentId: props.studentId,
+        type:2
+      }).then(res=>{
+        state.rank = res.data.data
+      })
+    }
+
    const showProMess = () => {
      state.StuMessvisible = true;
    };
    const afterVisibleChange = (bool) => {
      if(props.CheckStuvisible) {
        getStuProgress()
+        getStuRank()
      }
      console.log("state", bool);
    };
@@ -546,11 +559,17 @@ export default {
              font-size: 14px;
              font-weight: 500;
              margin-left: 25px;
+              word-break:keep-all;
+              white-space:nowrap;
            }
            .text2 {
              color: rgba(51, 51, 51, 0.8);
              font-size: 14px;
              margin-left: 65px;
+              word-break:keep-all;
+              white-space:nowrap;
+              overflow:hidden;
+              text-overflow:ellipsis;
            }
          }
          .alreadyclass {
@@ -564,6 +583,8 @@ export default {
              color: rgba(56, 125, 247, 1);
              font-size: 14px;
              margin-left: 16px;
+              word-break:keep-all;
+              white-space:nowrap;
            }
          }
        }
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -249,6 +249,7 @@ export default {
      studentRank({
        projectId: props.projectId,
        studentId: props.checkStuId,
+        type:1
      }).then(res=>{
        state.rank = res.data.data
      })
@@ -549,11 +550,17 @@ export default {
              font-size: 14px;
              font-weight: 500;
              margin-left: 25px;
+              word-break:keep-all;
+              white-space:nowrap;
            }
            .text2 {
              color: rgba(51, 51, 51, 0.8);
              font-size: 14px;
              margin-left: 65px;
+              word-break:keep-all;
+              white-space:nowrap;
+              overflow:hidden;
+              text-overflow:ellipsis;
            }
          }
          .alreadyclass {
@@ -567,6 +574,8 @@ export default {
              color: rgba(56, 125, 247, 1);
              font-size: 14px;
              margin-left: 16px;
+              word-break:keep-all;
+              white-space:nowrap;
            }
          }
        }
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -414,7 +414,10 @@ export default {

    {/* 导出数据 */}
    function  exportData() {
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
+      console.log(props.datasource)
+      console.log(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
+      
      {/* api.ExportExam({
        "chapterId": props.datasource.chapterId,
        "targetId": props.datasource.routerId,
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -317,7 +317,7 @@ export default {
            );
          },
        },
-        {
+       /** {
          title: "学员关卡",
          dataIndex: "chapterName",
          key: "chapterName",
@@ -334,7 +334,7 @@ export default {
              </div>
            );
          },
-        },
+        },*/ 
        {
          title: "作业成绩",
          dataIndex: "workScore",
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -982,9 +982,9 @@
        <div class="onlinemanage" :style="{ display: om_1 ? 'block' : 'none' }">
          <div class="om_main">
            <div class="om_body">
-              <div class="b_title">课程：{{ newCourseName }}</div>
              <div class="b_sub">
-                <div class="bs_type">类型：</div>
+                <div class="b_title">课程：{{ newCourseName }}</div>
+                <div class="bs_type" style="margin-left: 20px">类型：</div>
                <div class="bs_right">{{ faceType }}</div>
                <div class="bs_left">内容分类：</div>
                <div class="bs_right">{{ faceClassification }}</div>
@@ -2536,111 +2536,63 @@ const columns2 = [
    title: "姓名",
    dataIndex: "studentName",
    key: "studentName",
-    width: "12%",
+    width: "6%",
    align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span>
-            {" "}
-            {text.record.studentName ? text.record.studentName : "-"}
-          </span>
-        </div>
-      );
-    },
+    customRender: ({record: {studentName}}) => (studentName || "-")
  },
  {
    title: "工号",
    dataIndex: "studentUserNo",
    key: "studentUserNo",
    width: "12%",
+    ellipsis: true,
    align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span>
-            {" "}
-            {text.record.studentUserNo ? text.record.studentUserNo : "-"}
-          </span>
-        </div>
-      );
-    },
+    customRender: ({record: {studentUserNo}}) => (studentUserNo || "-")
  },
  {
    title: "开课名称",
    dataIndex: "name",
    key: "name",
    width: "12%",
+    ellipsis: true,
    align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span> {text.record.name ? text.record.name : "-"}</span>
-        </div>
-      );
-    },
+    customRender: ({record: {name}}) => (name || "-")
  },
  {
    title: "地点",
    dataIndex: "address",
    key: "address",
    width: "12%",
+    ellipsis: true,
    align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span> {text.record.address ? text.record.address : "-"}</span>
-        </div>
-      );
-    },
+    customRender: ({record: {address}}) => (address || "-")
  },
  {
    title: "数据来源",
    dataIndex: "courseSource",
    key: "courseSource",
+    ellipsis: true,
    width: "12%",
    align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span>
-            {" "}
-            {text.record.courseSource ? text.record.courseSource : "-"}
-          </span>
-        </div>
-      );
-    },
+    customRender: ({record:{courseName,routerName}}) => (courseName || routerName || "开课"),
  },
  {
    title: "学习时间",
    dataIndex: "lastStudyTime",
    key: "lastStudyTime",
-    width: "12%",
+    width: "10%",
    align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span>
-            {" "}
-            {text.record.lastStudyTime ? text.record.lastStudyTime : "-"}
-          </span>
-        </div>
-      );
-    },
+    ellipsis: true,
+    customRender: ({record:{lastStudyTime}}) => (lastStudyTime || "-")
  },
  {
    title: "签到时间",
    dataIndex: "signTime",
    key: "signTime",
-    width: "12%",
+    width: "10%",
    align: "center",
-    customRender: (text) => {
-      return (
-        <div class="racona">
-          <span> {text.record.signTime ? text.record.signTime : "-"}</span>
-        </div>
-      );
-    },
+    ellipsis: true,
+    customRender: ({record:{signTime}}) => (signTime || "-")
  },
  {
    title: "状态",
@@ -5515,7 +5467,7 @@ export default defineComponent({
            : process.env.VUE_APP_BASE_API +
              `/admin/student/studentSign?taskId=${
                record.offcoursePlanId
-              }&type=${3}`,
+              }&taskType=${2}&type=${3}`,
      };
      console.log("codeInfo", state.codeInfo);
      state.codeIndex = 0;
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1643,7 +1643,7 @@ export default {
          className: "h",
          customRender: ({ record }) => (
            <div>
-              {record.finishTaskNum}/{record.totalTaskNum}
+              {record.finishTaskNum || 0}/{record.totalTaskNum || 0}
            </div>
          ),
        },
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1839,7 +1839,7 @@ export default {
          ellipsis: true,
          customRender: ({ record }) => (
            <div>
-              {record.finishTaskNum}/{record.totalTaskNum}
+              {record.finishTaskNum|| 0}/{record.totalTaskNum || 0}
            </div>
          ),
        },