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

2025-12-24 18:22:55 +08:00 · 2023-03-07 09:21:04 +08:00
parent 87a4ba7502 9336956cb1
commit 8bd0d07041
9 changed files with 63 additions and 50 deletions
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -940,6 +940,7 @@ export default {
    };
    const signQR = () => {
      console.log("props.datasource", props.datasource);
+      console.log("是项目还是路径图啊")
      state.codevisible = true;
      state.codeInfo = {
        title: "【签到】二维码",
@@ -948,7 +949,7 @@ export default {
          process.env.VUE_APP_BASE_API +
          `/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${
            props.datasource.type
-          }&type=${1}`,
+          }&type=${props.datasource.routerId?2:1}`,
      };
      console.log("codeInfo", state.codeInfo);
      state.codeIndex = 0;
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -219,7 +219,7 @@
            </div>
            <div class="btnbox">
              <a-input v-model:value="formData.source"
-              style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0 && isEdit"
+              style="width: 400px; height: 40px; border-radius: 8px"
                placeholder="请输入数据来源" show-count :maxlength="420" />
            </div>
          </div>
@@ -228,7 +228,7 @@
              <span style="margin-right: 3px">考试说明：</span>
            </div>
            <div class="textarea">
-              <a-textarea v-model:value="formData.externalExplain" placeholder="请输入考试说明" allow-clear show-count :disabled="taskIndex >= 0 && isEdit"
+              <a-textarea v-model:value="formData.examinationExplain" placeholder="请输入考试说明" allow-clear show-count
                :maxlength="200" :rows="6" />
            </div>
          </div>
@@ -266,7 +266,8 @@ const initValue = {
  showAnalysis: 2,
  scoringModel: 2,
  questionArrangement: 4,
-  externalExplain: ""
+  externalExplain: "",
+  examinationExplain: ""
 }
 const formData = ref(initValue)
 const innerRule = {
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -117,13 +117,22 @@
                </div>
                <div class="alreadyclass">
                  <div class="alimg">
-                    <img :src="
-                      item.complete === '已完成'
+                    <!-- <img :src="
+                      item.complete === '已完成' 
                        ? require('../../assets/images/studentimg/complete.png')
                        : require('../../assets/images/studentimg/notice.png')
                    "/>
                  </div>
-                  <div class="altext">{{ item.complete }}</div>
+                  <div class="altext">{{ item.complete }}</div> -->
+                  <img
+                  :src="
+                  item.status === 1
+                    ? require('../../assets/images/studentimg/complete.png')
+                    : require('../../assets/images/studentimg/notice.png')
+                "
+              />
+            </div>
+            <div class="altext">{{ item.status === 0 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}</div>
                </div>
              </div>
            </a-collapse-panel>
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -500,7 +500,6 @@ export default {

    // 导出数据
    function exportTaskStu() {
-      debugger
      if(props.datasource.type==1){
        {/* 在线课导出 */}
        window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -692,7 +692,6 @@ const deleteId = ref(null);
 const deleteTargetId = ref(null);
 const deleteType = ref(null);
 function del(id, row) {
-  debugger
  if (row.isLeader === "1") {
    return message.warning("" + row.name + "是小组长，请勿删除!");
  }
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1251,6 +1251,7 @@
                  :id="offcoursePlanId"
                  :columns="stuColumns"
                  :visable="sm_hs"
+                  :permissions="permissions"
                  :isgetStudent="isgetStudent"
                >
                  <template #extension="{ data: { record } }">
@@ -2154,6 +2155,8 @@ export default defineComponent({
    const sysTypeOptions = computed(() => store.state.content_type);

    const state = reactive({
+      permissions:null,
+      createId:null,
      workInfo: {},
      examInfo: {},
      tableLoading: false,
@@ -3839,11 +3842,7 @@ export default defineComponent({
          key: "8",
          align: "center",
          customRender: ({ record }) =>
-            itm.courseScore === -1
-              ? "-"
-              : record.assessmentStatus
-              ? "已评估"
-              : "未评估",
+            record.assessmentStatus?"已评估" : "未评估",
        },
        {
          title: "评分",
@@ -3854,7 +3853,7 @@ export default defineComponent({
          customRender: ({ record }) => {
            return (
              <div class="racona">
-                {record.studentScore !== -1 ? record.studentScore : "-"}
+                {record.assessmentScore || "-"}
              </div>
            );
            // switch (String(record.status)) {
@@ -4554,6 +4553,7 @@ export default defineComponent({
      }
      state.offcourseId = item.id;
      state.newCourseName = item.name;
+      state.permissions = item.permissions;
      getTableDate3();

      state.stm_hs = true;
@@ -4660,6 +4660,8 @@ export default defineComponent({
      state.om_1 = true;
      state.ft_1 = true;
      state.manageStuLoading = true;
+      state.permissions = item.permissions;
+      state.createId = item.createId;
      console.log(787666, item);
      state.faceClassification = item.contentTxt;
      state.faceStatus = item.status;
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -17,7 +17,7 @@
          src="@/assets/images/basicinfo/add.png"
        />
        <span v-if="ft_eidt" class="headerLeftText">编辑面授课</span>
-        <span v-else class="headerLeftText">新建面授课</span>
+        <span v-else class="headerLeftText"></span>
      </div>
      <div style="margin-right: 57px; cursor: pointer">
        <img
@@ -827,11 +827,11 @@ export default defineComponent({
    //保存面授课
    const handlePush = async (param) => {
      console.log(
-        "组织、岗位、Band、资源归属选择",
-        state.orgSelect,
-        state.selectJobId,
-        state.selectBandId,
-        state.sourceBelongId
+        "组织、岗位、Band、资源归属选择" + JSON.stringify(state)
+        // state.orgSelect,
+        // state.selectJobId,
+        // state.selectBandId,
+        // state.sourceBelongId
      );
      let files = "";
      if (state.imgList.length) {
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -23,25 +23,25 @@
        <div class="line" v-if="action == 3"></div>
        <!-- 显示发布图标 -->
        <img
-          v-if="action == 2 && checkPer(permissions,createId)"
+          v-if="action == 2 && checkPer(permissions)"
          class="img2"
          src="../../assets/images/leveladd/pub.png"
        />
        <!-- 显示撤回发布图标 -->
        <img
-          v-if="action == 3 && checkPer(permissions,createId)"
+          v-if="action == 3 && checkPer(permissions)"
          class="img2"
          src="../../assets/images/project/finish.png"
        />
        <!-- 显示审核图标 -->
        <img
-          v-if="(action == 0 || action == -2) && checkPer(permissions,createId)"
+          v-if="(action == 0 || action == -2) && checkPer(permissions)"
          class="img2"
          src="../../assets/images/project/reviewsubmit.png"
        />
        <!-- 显示撤回审核图标 -->
        <img
-          v-if="action == 1 && checkPer(permissions,createId)"
+          v-if="action == 1 && checkPer(permissions)"
          class="img2"
          src="../../assets/images/project/reviewrecall.png"
        />
@@ -50,7 +50,7 @@
        <div
          class="pub"
          style="width: 56px; color: #a497ff"
-          v-if="(action == 0 || action == -2) && checkPer(permissions,createId)"
+          v-if="(action == 0 || action == -2) && checkPer(permissions)"
          @click="submitExamine"
        >
          {{ act }}
@@ -59,7 +59,7 @@
        <div
          class="pub"
          style="width: 56px; color: #a497ff"
-          v-if="action == 1 && checkPer(permissions,createId)"
+          v-if="action == 1 && checkPer(permissions)"
          @click="showRecallReviewModal"
        >
          {{ act }}
@@ -68,7 +68,7 @@
        <div
          class="pub"
          style="width: 28px"
-          v-if="action == 2 && checkPer(permissions,createId)"
+          v-if="action == 2 && checkPer(permissions)"
          @click="showProjectPub"
        >
          {{ act }}
@@ -77,7 +77,7 @@
        <div
          class="pub"
          style="width: 56px; color: #57c887"
-          v-if="action == 3 && checkPer(permissions,createId)"
+          v-if="action == 3 && checkPer(permissions)"
          @click="showBackModal"
        >
          {{ act }}
@@ -185,7 +185,7 @@
            <div class="onerow">
              <div class="taskmain">快速创建项目详情</div>
            </div>
-            <div v-if="checkPer(permissions,createId)" class="second">
+            <div v-if="checkPer(permissions)" class="second">
              <!-- @click="totask" -->
              <div
                class="taskbox"
@@ -460,7 +460,7 @@
                <button class="btn">批量面授报名</button>
              </ImpoterGroupLeader> -->
              <router-link
-                v-if="checkPer(permissions,createId)"
+                v-if="checkPer(permissions)"
                :to="{ path: `/taskadd`, query: { projectId: projectId } }"
              >
                <button class="edit">
@@ -608,7 +608,7 @@
                          >
                        </div>
                      </div>
-                      <div v-if="checkPer(permissions,createId)" class="operations">
+                      <div v-if="checkPer(permissions)" class="operations">
                        <div
                          class="operation"
                          style="cursor: pointer"
@@ -709,7 +709,7 @@
              </router-link>
              <!-- 无数据创建任务 -->
            </div>
-            <div v-else-if="checkPer(permissions,createId)">
+            <div v-else-if="checkPer(permissions)">
              <div
                class="taskbox"
                @click="
@@ -761,13 +761,13 @@
                    </a-button>
                    <a-button
                      @click="settingTopFlag(record)"
-                      v-if="checkPer(permissions,createId)"
+                      v-if="checkPer(permissions)"
                      type="link"
                      >{{ record.topFlag ? "取消优秀" : "优秀学员" }}
                    </a-button>
                    <a-button
                      type="link"
-                      v-if="checkPer(permissions,createId)"
+                      v-if="checkPer(permissions)"
                      :disabled="record.isLeader === '1'"
                      @click="showChangeGroupModal(record)"
                      >换组
@@ -795,7 +795,7 @@
                    </div>
                  </div>
                </div>
-                <div class="second2" v-if="checkPer(permissions,createId)">
+                <div class="second2" v-if="checkPer(permissions)">
                  <div class="btn1" @click="showModal2()">
                    <img src="../../assets/images/courseManage/add0.png" />
                    <span class="btn1text">创建小组</span>
@@ -826,13 +826,13 @@
                  >
                    <div style="width: 90%">
                      <div class="grouptitle">
-                        <div class="goodgruop">{{ item.groupName }}</div>
+                        <div class="goodgruop" :title="item.groupName" >{{ item.groupName }}</div>
                        <div class="more">
                          <span
                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
                            >. . .</span
                          >
-                          <div class="moreItems" v-if="checkPer(permissions,createId)">
+                          <div class="moreItems" v-if="checkPer(permissions)">
                            <div class="sammo" @click="showModal2(item, true)">
                              编辑
                            </div>
@@ -846,7 +846,7 @@
                      <div class="grocenter">
                        <div class="leader1">进度</div>
                        <a-progress
-                          :percent="(item.completeRatio || 0) * 100"
+                          :percent="Math.round((item.completeRatio || 0) * 100)"
                        />
                      </div>
                      <div
@@ -1072,7 +1072,7 @@
              <div
                class="addcertificate1"
                @click="addCertificate"
-                v-if="checkPer(permissions,createId)"
+                v-if="checkPer(permissions)"
              >
                <div class="addcertext">+添加证书</div>
              </div>
@@ -1181,7 +1181,7 @@
                    </div> -->
                  <div
                    class="edit"
-                    v-if="status != 3 && checkPer(permissions,createId)"
+                    v-if="status != 3 && checkPer(permissions)"
                    @click="toEdit"
                  >
                    <div class="img"></div>
@@ -1299,7 +1299,7 @@
                        v-if="docChecked == true"
                        v-model:file-list="fileList"
                        name="file"
-                        :action="uploadAction"
+                        :action="process.env.VUE_APP_BASE_API + '/file/uploadunlimit'"
                        @change="handleChange"
                      >
                        <span
@@ -2256,7 +2256,6 @@ export default {
    const route = useRoute();
    const state = reactive({
      permissions: "",
-      createId: "",
      screenHeight: document.body.clientHeight,
      screenWidth: document.body.clientWidth,
      editRecord: {},
@@ -2744,7 +2743,6 @@ export default {
      ImpoterGroupLeaderV: false, //导入小组长抽屉
      certificatelist: [],
      fileUrl: process.env.VUE_APP_FILE_PATH,
-      uploadAction: process.env.VUE_APP_BASE_API + '/file/uploadunlimit'
    });
    // 排行榜 - start
    // 积分排行榜 Top10
@@ -3871,7 +3869,6 @@ export default {
        let start = info.beginTime;
        let end = info.endTime;
        state.tstartTime = info.beginTime;
-        state.createId = info.createId;
        state.tendTime = info.endTime;
        state.tsourceBelong =
          (info.sourceBelongFullName || "") + info.sourceBelongName;
@@ -3933,7 +3930,6 @@ export default {
    };
    //创建小组
    const createGroup = async () => {
-      debugger;
      console.log("state.groupPageList" + state.groupPageList);
      const id = state.groupInfo.id;
      const d = state.groupPageList
@@ -6794,6 +6790,12 @@ export default {
            font-size: 16px;
            line-height: 36px;
            font-weight: 600;
+
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            cursor: pointer;
+
          }

          .more {
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -52,7 +52,7 @@
    <div class="split"></div>
    <div class="up down">
      <div class="header">
-        <div class="text">学员情况</div>
+        <div class="text">学员情况1</div>
        <div class="btn btn2" @click="exportStudentInfo">
          <div class="img2"></div>
          <div class="wz">导出信息</div>
@@ -105,7 +105,7 @@ export default {
      evalStuListDataTotal: 0,
      evalCurrentPage: 1
    });
-    
+
    const getInfoDate = async () => {
      state.tableDataTotalLoading = true;
      await queryAssessmentDetailList({
@@ -324,7 +324,7 @@ export default {
      showassess,
      changePaginationStu,
      exportStudentInfo,
-      createName, 
+      createName,
      createTime
    };
  },
@@ -507,4 +507,4 @@ export default {
  .btn2:active {
    background: #0982ff;
  }
-}</style>
+}</style>