feat:修改版本号

2025-12-09 10:56:46 +08:00 · 2022-12-09 08:52:11 +08:00
parent f526d740c3 6b6fce5ebf
commit e99c9f1749
12 changed files with 990 additions and 887 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -141,6 +141,28 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
+//.ant-modal {
+//
+//  .ant-modal-content {
+//    background-image: linear-gradient(
+//            180deg, rgba(103, 64, 255, .2), rgba(166, 168, 255, 0), rgba(166, 168, 255, 0)) !important;
+//    border-radius: 4px;
+//
+//    .ant-modal-body {
+//      .ant-btn {
+//        border-radius: 8px;
+//        width: 100px;
+//        height: 40px;
+//      }
+//
+//      .ant-btn-primary {
+//        background: #4ea6ff;
+//        color: #fff;
+//      }
+//    }
+//  }
+//}
+
 #app {
  // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
  // sans-serif;
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -71,7 +71,13 @@ export const queryEvaluationDetailById = (obj) =>
      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
    },
  });
-
+  export const queryEvaluationMessageById = (obj) =>
+  http.post("/evaluation/queryEvaluationMessageById", obj, {
+    headers: {
+      token: "123",
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+  });
 //修改测评信息
 export const updateEvaluation = (obj) =>
  http.post("/evaluation/updateEvaluation", obj);
--- a/src/api/student.js
+++ b/src/api/student.js
@@ -0,0 +1,4 @@
+import http from "./config";
+
+export const studentDelAll = (params) => http.get('/admin/student/del', {params})
+
--- a/src/components/common/FJUpload.vue
+++ b/src/components/common/FJUpload.vue
@@ -24,7 +24,7 @@
        <div class="file_img"></div>
        <div class="file_detail">
          <div class="file_name">
-            <span style="color: #6f6f6f">{{ item.name }}</span>
+            <span style="color: #6f6f6f；width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.name }}</span>
          </div>
          <!--          <div class="file_size">-->
          <!--            <span style="color: #999ba3">{{ item.size }}</span>-->
@@ -167,21 +167,21 @@ function del(i) {

          .updataxq {
            position: absolute;
-            right: 2px;
+            right: -62px;
            top: -30px;
            color: #57c887;
          }

          .updataxq1 {
            position: absolute;
-            right: 2px;
+            right: -62px;
            top: -30px;
            color: #388be1;
          }

          .updataxq2 {
            position: absolute;
-            right: 2px;
+            right: -62px;
            top: -30px;
            color: #ff7474;
          }
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -237,14 +237,14 @@ export default {
        .then((res) => {
          message.destroy()
          message.success("获取测评信息成功");
-          state.inputV1 = res.data.data.evaluationName
-          state.evaluationTypeName = res.data.data.evaluationTypeName
+          state.inputV1 = res.data.data.evaluationName;
+          state.evaluationTypeName = res.data.data.evaluationTypeName;
          state.evaluationTypeId = res.data.data.evaluationTypeId;
          state.time = res.data.data.evaluationStartTime ? [
            dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
            dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
          ] : undefined;
-          state.description = res.data.data.evaluationExplain
+          state.description = res.data.data.evaluationExplain;
        })
        .catch((err) => {
          message.destroy()
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -352,11 +352,9 @@
            <div class="signbox">
              <span style="margin-right: 3px">已选考试:</span>
            </div>
-            <div class="btnbox" @click="showDrawerAddTest">
+            <div class="btnbox">
              <a-tag closable color="processing" @close="logT">
-                <span style="font-size: 14px; line-height: 33px">{{
-                  testName
-                }}</span>
+                <span style="font-size: 14px; line-height: 33px">{{testName}}</span>
              </a-tag>
            </div>
          </div>
@@ -396,10 +394,15 @@ import { debounce } from "lodash-es";
 import { queryFaceDetailById, editPlan } from "../../api/indexFace";
 import dayjs from "dayjs";
 import AssessmentList from "../drawers/ AssessmentList.vue";
+
 // import { toDate } from "../../api/method";、
 import { addTempTask } from "../../api/indexTaskadd";
 import ProjectManager from "@/components/project/ProjectManagerNew";

+import { detail } from "../../api/indexCourse";
+import { queryAppraiseDetailById } from "../../api/indexInvist";
+import {queryWorkDetailById} from "@/api/indexWork";
+import {queryExaminationDetailById} from "@/api/indexExam";
 export default {
  name: "AddFaceteach",
  components: {
@@ -495,6 +498,7 @@ export default {
      EditTestId: null,
      EditWorkId: null,
      workName: null,
+      testName: null,
      assessmentVisible: false,
      needEval: false,
      onlySign: false,
@@ -588,7 +592,6 @@ export default {
        state.before = result.beforeStart;
        state.afterStartValue = result.afterStart;
        state.fileList = JSON.parse(result.attach);
-        state.EditWorkId = result.homeWorkId;
        state.onlySign =
          result.completeType.split(",")[0] == "1" ? true : false;
        state.completeLeave =
@@ -602,7 +605,19 @@ export default {
        state.EditWorkId = result.homeWorkId;
        state.assessmentId = result.evaluateId;
        state.needEval = result.evaluateId;
+        detail({offcourseId:result.offcourseId}).then((res)=>{
+          state.chooseCourseName =res.data.data.name;

+        });
+        queryAppraiseDetailById({assessmentId:result.evaluateId}).then((res)=>{
+          state.assessmentName =res.data.data.assessmentName;
+        });
+        queryWorkDetailById({workId:result.homeWorkId}).then((res)=>{
+          state.workName = res.data.data.workName;
+        });
+        queryExaminationDetailById({ examinationId: result.testId }).then((res)=>{
+          state.testName = res.data.data.examinationName;
+        });
        console.log("state=======", state);
      });
    };
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -338,6 +338,7 @@ import { fileUp } from "../../api/indexEval";
 import AssessmentList from "../drawers/ AssessmentList.vue";
 import { debounce } from "lodash-es";
 import ProjectManager from "@/components/project/ProjectManagerNew";
+import { queryAppraiseDetailById } from "../../api/indexInvist";

 // import { useRouter } from "vue-router";
 function getBase64(img, callback) {
@@ -519,6 +520,9 @@ export default {
            value: res.data.data.liveTeacherId || "",
            label: res.data.data.liveTeacherName || "",
          };
+          queryAppraiseDetailById({assessmentId:res.data.data.assessmentId}).then((res)=>{
+          state.assessmentName =res.data.data.assessmentName;
+        });
        })
        .catch(() => {
          //message.error(`查询失败`);
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -554,6 +554,7 @@ export default {
      console.log("formState.testName", state.testName);
      localStorage.setItem("stageId", props.chooseStageId);
      localStorage.setItem("chapterId", props.isactive);
+      state.addLoading = false;
      resetForm();
    };
    const closeDrawer2 = () => {
@@ -561,6 +562,7 @@ export default {
      ctx.emit("update:edit", false);
      ctx.emit("update:addtestVisible", false);
      resetForm();
+      state.addLoading = false;
    };
    const afterVisibleChange = () => {
      console.log("props", props);
@@ -597,7 +599,6 @@ export default {
          state.paperName = res.data.data.examinationTestName;
          // state.paperId=
          state.paperId = res.data.data.examinationTestId;
-          state.paperName = res.data.data.examinationTestName;
          if (
            res.data.data.examinationEndTime &&
            res.data.data.examinationStartTime
@@ -617,6 +618,7 @@ export default {
    };
    const updateTest = () => {
      //state.addLoading = true;updateTask
+     
      let obj = {
        examinationDuration: formState.examinationDuration,
        examinationEndTime: dayjs(formState.choosedTime[1]).format(
@@ -656,7 +658,7 @@ export default {
        message.destroy();
        return message.warning("请输入考试时长");
      }
-
+      state.addLoading = true;
      if (props.edit) {
        // 编辑任务
        updateExamination(obj)
@@ -685,6 +687,8 @@ export default {
      state.EditTestId = res.data.data.examinationId;
      if (props.faceLevel) {
        state.EditTestId = res.data.data.examinationId;
+     
+        closeDrawer();
      } else {
        if (props.isLevel == 1) {
          let editObj1 = {
@@ -701,7 +705,7 @@ export default {
              console.log("props.edit", props.edit);
              message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
              ctx.emit("changeData", false);
-              state.addLoading = false;
+             
              closeDrawer();
            })
            .catch(() => {
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -221,7 +221,7 @@
                </div>
              </a-radio-group>
            </div>
-            <!--
+            
            <div class="b_sup" :style="{ display: bs_hs ? 'block' : 'none' }">
              <div class="ofmb_items">
                <div class="signbox">
@@ -257,7 +257,7 @@
                  </div>
                </a-radio-group>
              </div>
-            </div> -->
+            </div> 
            <div class="b_footer">
              <div class="btn btn5" @click="of_exit1">
                <div class="btnText">取消</div>
@@ -2979,28 +2979,6 @@ const columns6 = [
      return index + 1 + pageNum;
    },
  },
-  {
-    title: "创建人",
-    dataIndex: "createName",
-    key: "createName",
-    width: "10%",
-    align: "center",
-    ellipsis: true,
-    customRender: ({ text }) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "教师名称",
-    dataIndex: "teacher",
-    key: "teacher",
-    width: "10%",
-    align: "center",
-    ellipsis: true,
-    customRender: ({ text }) => {
-      return text ? text : "-";
-    },
-  },
    {
    title: "课程名称",
    dataIndex: "organization",
@@ -3023,6 +3001,21 @@ const columns6 = [
      return text ? text : "-";
    },
  },
+    {
+    title: "教师名称",
+    dataIndex: "teacher",
+    key: "teacher",
+    width: "10%",
+    align: "center",
+    ellipsis: true,
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },
+
+
+
+
  {
    title: "开始时间",
    dataIndex: "starttime",
@@ -3046,6 +3039,17 @@ const columns6 = [
      // return text ? getdateToTime(text * 1000) : "-";
      return text ? text : "-";
    },
+  },
+    {
+    title: "创建人",
+    dataIndex: "createName",
+    key: "createName",
+    width: "10%",
+    align: "center",
+    ellipsis: true,
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
  },
  {
    title: "操作",
@@ -3361,7 +3365,7 @@ export default defineComponent({
      faceManageTab: "1",
      of_hs: false,
      hideshow: true,
-      bs_hs: true,
+      bs_hs: false,
      ft_hs: false,
      lookMs: false,
      om_1: false,
@@ -4741,7 +4745,7 @@ export default defineComponent({
            completeType: item.completeType,
            endTime: new Date(item.endTime) / 1000,
            evalFlag: item.evalFlag,
-            name: '复制'+item.name,
+            name: item.name+'1',
            signFlag: item.signFlag, //是否允许未报名的签到:1是0否
            //signWordFlag: item.signWordFlag, //签到是否需要口令:1是0否
            teacherId: item.teacherId,
@@ -4765,7 +4769,7 @@ export default defineComponent({
          });
          const postData = {
            offcourseId: null, //不传代表新增
-            name: '复制'+item.name,
+            name: item.name+'1',
            picUrl: item.picUrl,
            targetUser: item.targetUser,
            meaning: item.meaning,
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -666,6 +666,16 @@ export default defineComponent({
            : "-";
          console.log("state.auditDescription", state.auditDescription);
        }
+        api2.auditList(obj).then((res)=>{
+         
+          if(res.data.data.rows &&res.data.data.rows.length > 0){
+            let i =res.data.data.rows.length ;
+            state.auditDescription =  res.data.data.rows[i-1].description?res.data.data.rows[i-1].description :"-";
+            console.log("state.auditDescription",state.auditDescription);
+          }
+         
+        })
+
      }

      state.qdms_inputV1 = item.name;
@@ -678,7 +688,13 @@ export default defineComponent({
      state.qdms_inputV6 = item.intro;
      state.member = { value: item.teacherId, name: item.teacher };
      valueHtml.value = item.outline;
-      state.attach = item.attach;
+      let arrss = item.attach.split(',')
+      let str =''
+      for(let i=0;i<arrss.length;i++){
+        i == arrss.length -1 ?  str += arrss[i].slice(arrss[i].lastIndexOf('/')+1) : str += arrss[i].slice(arrss[i].lastIndexOf('/')+1) + ','
+      }
+      console.log(str)
+      state.attach = str;
    };

    const handleTagChange = () => {
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -635,6 +635,7 @@
                  <span class="th">{{ stuTotal }}</span>
                  <span class="yi"> 条</span>
                </div>
+                <div class="clear" @click="clearChooseStu">清空</div>
              </div>
              <div class="tableBox" style="margin-top: 30px">
                <a-table
@@ -1288,6 +1289,7 @@ import * as api from "../../api/index1";
 import { editRoutered } from "../../api/indexLearningPath";
 import { codeUrl } from "../../api/method";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
+// import * as student from "@/api/student";
 export default {
  name: "LevelAdd",
  components: {
@@ -2307,9 +2309,22 @@ export default {
      };
      state.codeInfo = obj;
    };
+    //清空所选的学员
+    const clearChooseStu = () => {
+      Modal.confirm({
+        title: '确定清空所有学员吗？', onOk: async () => {
+          state.addAuthList = []
+          // student.studentDelAll({id: state.routerId, type: 2})
+          // state.tabledata = []
+          // state.tableDataTotal = 0;
+        }, bodyStyle: 'margin-top:70%'
+      });
+    };
+
    return {
      ...toRefs(state),
      ...toRefs(levelList),
+      clearChooseStu,
      showDeleteALLModal,
      closeDeleteALLModal,
      tableDataFunc,
@@ -2369,6 +2384,14 @@ export default {
 };
 </script>
 <style lang="scss">
+.clear {
+  cursor: pointer;
+  font-size: 14px;
+  color: #387df7;
+  line-height: 24px;
+  position: absolute;
+  right: 60px;
+}
 .pub {
  .ant-modal {
    .ant-modal-body {
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1883,7 +1883,6 @@
 import {reactive, toRefs, onMounted, watch, computed} from "vue";
 import {useRoute} from "vue-router";
 import {useRouter} from "vue-router";
-// import { CaretRightOutlined } from "@ant-design/icons-vue";
 import TimeManage from "../../components/drawers/TimeManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import SubsetManage from "../../components/drawers/SubsetManage";
@@ -1892,19 +1891,18 @@ import ActiveAttendance from "../../components/drawers/ActiveAttendance";
 import WorkManage from "../../components/drawers/WorkManage";
 import FaceStu from "../../components/drawers/FaceStu";
 import TestManage from "../../components/drawers/TestManage";
-// import StuAdd from "../../components/drawers/StuAdd";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import ImportStu from "../../components/drawers/ImportStu";
 import SeeStu from "../../components/drawers/SeeStu";
 import ChangeGroup from "../../components/drawers/ChangeGroup";
 import NoticePub from "../../components/drawers/NoticePub";
 import NoticeHis from "../../components/drawers/NoticeHis";
-// import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
 import {storage} from "../../api/storage";
 import * as api from "../../api/index1";
 import * as apis from "../../api/index";
 import * as apiproj from "../../api/index";
+import * as student from "../../api/student";
 import {
  getProjStu,
  deleteStu,
@@ -1913,7 +1911,7 @@ import {
  editGroup,
  topStudent,
 } from "../../api/indexProjStu";
-import { message } from "ant-design-vue";
+import {message, Modal} from "ant-design-vue";
 import * as apitl from "../../api/index";
 import {getTask} from "../../api/indexTaskadd";
 import {editProj} from "../../api/indexTaskadd";
@@ -1925,6 +1923,7 @@ import { useStore } from "vuex";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
+
 export default {
  name: "taskPage",
  components: {
@@ -3498,8 +3497,12 @@ export default {
    };
    //清空所选的学员
    const clearChooseStu = () => {
-      state.selectedRowKeys = [];
-      state.choosed = 0;
+      Modal.confirm({
+        title: '确定清空所有学员吗？', onOk: async () => {
+          state.tabledata = []
+          student.studentDelAll({id: state.projectId, type: 1})
+        }, bodyStyle: 'margin-top:70%'
+      });
    };
    //学员重置
    const resetCancel = () => {
@@ -5724,6 +5727,7 @@ export default {
        margin-left: 12px;
        margin-right: 50px;
        width: 120px;
+
        .iconame {
          //position: absolute;
          color: #4f5156;
@@ -5776,6 +5780,7 @@ export default {
        flex-grow: 1;
        margin-right: 50px;
        width: 100px;
+
        .timetext {
          font-size: 14px;
          color: #999ba3;