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

2025-12-22 09:16:46 +08:00 · 2023-02-26 01:01:50 +08:00
parent be5704f2d6 9e1f010d9f
commit bba12e350a
17 changed files with 413 additions and 279 deletions
--- 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">
@@ -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">
@@ -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);
--- 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);
--- 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: "各层级人员",
--- 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}上传失败`);
--- 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) => {
--- 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>
              );
            },
--- 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>
              );
            },
--- 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 = {
--- 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 : "-",
        };
@@ -458,8 +459,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 +743,7 @@ const resetStu = () => {
 const deleteDepSelect = () => {
  stuSelectKeys.value = [];
  selectedOrgKeys.value = [];
+  projectSelectKeys.value = [];
 };
 //重置组织
 const resetOrg = () => {
@@ -775,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("添加小组学员超过最大值");
    }
    // 判断是否是组长，组长不能添加
--- 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)