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

2025-12-10 19:36:46 +08:00 · 2023-03-10 17:53:23 +08:00
parent 434665e7e9 942991ca3c
commit c3f9bad2a7
4 changed files with 169 additions and 81 deletions
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -181,12 +181,12 @@ const rulesRef = ref({
      message: '请输入活动结束时间',
    },
  ],
-  activityDuration: [
-    {
-      required: true,
-      message: '请输入活动时长',
-    },
-  ],
+  // activityDuration: [
+  //   {
+  //     required: true,
+  //     message: '请输入活动时长',
+  //   },
+  // ],
  activityAddress: [
    {
      required: true,
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -296,12 +296,12 @@ const rulesRef = ref({
      message: "请输入直播公告",
    },
  ],
-  liveDuration: [
-    {
-      required: true,
-      message: "请输入直播时长",
-    },
-  ],
+  // liveDuration: [
+  //   {
+  //     required: true,
+  //     message: "请输入直播时长",
+  //   },
+  // ],
  liveTeacherId: [
    {
      required: true,
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -692,7 +692,11 @@
              </div>
            </a-tab-pane>

-            <a-tab-pane key="2" tab="共享文档" v-if="checkPer(permissions,createId)">
+            <a-tab-pane
+              key="2"
+              tab="共享文档"
+              v-if="checkPer(permissions, createId)"
+            >
              <div class="sametab">
                <div class="Gcon">
                  <div class="pad"></div>
@@ -907,7 +911,7 @@
              <div class="btn">
                <button
                  class="sameb btn2"
-                  style="cursor: pointer;margin-right: 32px;"
+                  style="cursor: pointer; margin-right: 32px"
                  @click="closeChangeModal"
                >
                  取消
@@ -952,7 +956,7 @@
              <span>请确认是否批量删除学员</span>
            </div>
            <div class="del_btnbox">
-              <div class="del_btn btn2" style="margin-right:32px;">
+              <div class="del_btn btn2" style="margin-right: 32px">
                <div class="btnText" @click="delete_exit">取消</div>
              </div>
              <div class="del_btn btn2">
@@ -1088,22 +1092,28 @@
      <time-manage
        :permissions="permissions"
        :createId="createId"
-        v-model:Tvisible="visible" :title="showTimeText" />
+        v-model:Tvisible="visible"
+        :title="showTimeText"
+      />
      <!-- 考试管理抽屉 -->
      <test-manage
        :permissions="permissions"
        :createId="createId"
-        v-model:TMvisible="TMvisible" :title="showTestText" />
+        v-model:TMvisible="TMvisible"
+        :title="showTestText"
+      />
      <!-- 面授管理抽屉 -->
      <face-manage
        :permissions="permissions"
        :createId="createId"
-        v-model:Fvisible="FaceVisivle" />
+        v-model:Fvisible="FaceVisivle"
+      />
      <!-- 作业管理抽屉 -->
      <work-manage
        :permissions="permissions"
        :createId="createId"
-        v-model:Wvisible="Wvisible" />
+        v-model:Wvisible="Wvisible"
+      />
    </div>
    <!--  加载动画 -->
    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
@@ -1177,7 +1187,9 @@
          >
        </div> -->
        <div class="pubtn">
-          <a-button class="pubtn2" @click="closePub" style="margin-right:32px;">取消</a-button>
+          <a-button class="pubtn2" @click="closePub" style="margin-right: 32px"
+            >取消</a-button
+          >
          <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
        </div>
      </div>
@@ -1207,7 +1219,11 @@
            <div class="back">（路径撤回后学员进度保留，发布后可继续学习）</div>
          </div>
          <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeBackModal" style="margin-right:32px;">
+            <div
+              class="del_btn btn2"
+              @click="closeBackModal"
+              style="margin-right: 32px"
+            >
              <div class="btnText">取消</div>
            </div>
            <div class="del_btn btn2" @click="recallPath">
@@ -1237,7 +1253,11 @@
            <span>您确定要复制此路径吗</span>
          </div>
          <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeCopy" style="margin-right:32px;">
+            <div
+              class="del_btn btn2"
+              @click="closeCopy"
+              style="margin-right: 32px"
+            >
              <div class="btnText">取消</div>
            </div>
            <div class="del_btn btn2" @click="sureCopy">
@@ -1271,7 +1291,11 @@
            </div>
          </div>
          <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeStopModal" style="margin-right:32px;">
+            <div
+              class="del_btn btn2"
+              @click="closeStopModal"
+              style="margin-right: 32px"
+            >
              <div class="btnText">取消</div>
            </div>
            <div class="del_btn btn2" @click="stopLearnPath">
@@ -1662,10 +1686,11 @@ export default {
      locationHref:
        location.href.indexOf("http://") !== -1
          ? "http://43.143.139.204:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) +  process.env.VUE_APP_FILE_PATH,
+          : location.href.slice(0, location.href.indexOf("/m")) +
+            process.env.VUE_APP_FILE_PATH,
      isreload: true,
      TaskFaceImpStuvisible: false,
-      uploadAction: process.env.VUE_APP_BASE_API + '/file/uploadunlimit'
+      uploadAction: process.env.VUE_APP_BASE_API + "/file/uploadunlimit",
    });

    const levelList = reactive({
@@ -2746,8 +2771,8 @@ export default {

      // 评估 停用
      if (item.type == 11) {
-        if (item.taskStatus == 1 || item.taskStatus == 2)
-          return message.error("该任务无法学习，请联系管理员进行替换。");
+        // if (item.taskStatus == 1 || item.taskStatus == 2)
+        //   return message.error("该任务无法学习，请联系管理员进行替换。");
        console.log("item", item);
        codeUrl =
          window.location.protocol +
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -35,7 +35,9 @@
        />
        <!-- 显示审核图标 -->
        <img
-          v-if="(action == 0 || action == -2) && checkPer(permissions,createId)"
+          v-if="
+            (action == 0 || action == -2) && checkPer(permissions, createId)
+          "
          class="img2"
          src="../../assets/images/project/reviewsubmit.png"
        />
@@ -50,7 +52,9 @@
        <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, createId)
+          "
          @click="submitExamine"
        >
          {{ act }}
@@ -103,7 +107,11 @@
                <div class="back"></div>
              </div>
              <div class="del_btnbox">
-                <div class="del_btn btn2" @click="closeReviewModal" style="margin-right: 32px;">
+                <div
+                  class="del_btn btn2"
+                  @click="closeReviewModal"
+                  style="margin-right: 32px"
+                >
                  <div class="btnText">取消</div>
                </div>
                <div class="del_btn btn2" @click="submitReviewProject">
@@ -621,7 +629,7 @@
                          class="operation"
                          style="cursor: pointer"
                          @click="showAA(item.type, item.name, item)"
-                          v-if="(item.type == 6 || item.type == 9)"
+                          v-if="item.type == 6 || item.type == 9"
                        >
                          考勤
                        </div>
@@ -826,13 +834,18 @@
                  >
                    <div style="width: 90%">
                      <div class="grouptitle">
-                        <div class="goodgruop" :title="item.groupName" >{{ 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, createId)"
+                          >
                            <div class="sammo" @click="showModal2(item, true)">
                              编辑
                            </div>
@@ -1289,8 +1302,16 @@
                  <div class="Gin">
                    <div class="headone">
                      <div class="box"></div>
-                      <div class="onetitle" v-if="checkPer(permissions,createId)">上传共享文档</div>
-                      <div class="oneedi" v-if="checkPer(permissions,createId)">
+                      <div
+                        class="onetitle"
+                        v-if="checkPer(permissions, createId)"
+                      >
+                        上传共享文档
+                      </div>
+                      <div
+                        class="oneedi"
+                        v-if="checkPer(permissions, createId)"
+                      >
                        <a-switch
                          size="small"
                          v-model:checked="docChecked"
@@ -1300,7 +1321,9 @@
                    </div>
                    <div class="btnbox" style="margin: 20px">
                      <a-upload
-                        v-if="docChecked == true && checkPer(permissions,createId)"
+                        v-if="
+                          docChecked == true && checkPer(permissions, createId)
+                        "
                        v-model:file-list="fileList"
                        name="file"
                        :action="uploadAction"
@@ -1324,7 +1347,9 @@
                        />
                      </a-upload>
                      <div
-                        v-if="docChecked == true && checkPer(permissions,createId)"
+                        v-if="
+                          docChecked == true && checkPer(permissions, createId)
+                        "
                        class="btnbox"
                        style="margin: 20px"
                      >
@@ -1797,8 +1822,15 @@
            </div>
          </div>
          <div class="pubtn">
-            <a-button class="pubtn2" @click="closeModal2" style="margin-right:32px;">取消</a-button>
-            <a-button class="pubtn2" :loading="buttonLoading" @click="createG">确定</a-button>
+            <a-button
+              class="pubtn2"
+              @click="closeModal2"
+              style="margin-right: 32px"
+              >取消</a-button
+            >
+            <a-button class="pubtn2" :loading="buttonLoading" @click="createG"
+              >确定</a-button
+            >
          </div>
        </div>
      </a-modal>
@@ -1825,7 +1857,11 @@
              <span>您是否授予此学员优秀学员称号？</span>
            </div>
            <div class="del_btnbox">
-              <div class="del_btn btn2" @click="cancelyou" style="margin-right: 32px;">
+              <div
+                class="del_btn btn2"
+                @click="cancelyou"
+                style="margin-right: 32px"
+              >
                <div class="btnText">取消</div>
              </div>
              <div class="del_btn btn2" @click="closeModal1">
@@ -1857,7 +1893,11 @@
              <span>您是否取消此学员优学员称号？</span>
            </div>
            <div class="del_btnbox">
-              <div class="del_btn btn2" @click="cancelcanyou" style="margin-right: 32px;">
+              <div
+                class="del_btn btn2"
+                @click="cancelcanyou"
+                style="margin-right: 32px"
+              >
                <div class="btnText">取消</div>
              </div>
              <div class="del_btn btn2" @click="closeModal3">
@@ -1889,7 +1929,11 @@
              <span>您确定要删除此学员吗</span>
            </div>
            <div class="del_btnbox">
-              <div class="del_btn btn2" @click="closeDeleteOne" style="margin-right: 32px;">
+              <div
+                class="del_btn btn2"
+                @click="closeDeleteOne"
+                style="margin-right: 32px"
+              >
                <div class="btnText">取消</div>
              </div>
              <div class="del_btn btn2" @click="closeDeleteOneConfirm">
@@ -1923,7 +1967,7 @@
              <span>您确定要删除此课程吗</span>
            </div>
            <div class="del_btnbox">
-              <div class="del_btn btn2" style="margin-right: 32px;">
+              <div class="del_btn btn2" style="margin-right: 32px">
                <div class="btnText" @click="delete_exit">取消</div>
              </div>
              <div class="del_btn btn2">
@@ -1955,7 +1999,11 @@
              <span>您确定批量删除吗？</span>
            </div>
            <div class="del_btnbox">
-              <div class="del_btn btn2" @click="closeCancelDelete" style="margin-right: 32px;">
+              <div
+                class="del_btn btn2"
+                @click="closeCancelDelete"
+                style="margin-right: 32px"
+              >
                <div class="btnText">取消</div>
              </div>
              <div class="del_btn btn2" @click="closeAllDelete">
@@ -2072,7 +2120,11 @@
            <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
          </div>
          <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeBackModal" style="margin-right: 32px;">
+            <div
+              class="del_btn btn2"
+              @click="closeBackModal"
+              style="margin-right: 32px"
+            >
              <div class="btnText">取消</div>
            </div>
            <div class="del_btn btn2" @click="recallProject">
@@ -2103,7 +2155,11 @@
            <div class="back"></div>
          </div>
          <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeRecallReviewModal" style="margin-right: 32px;">
+            <div
+              class="del_btn btn2"
+              @click="closeRecallReviewModal"
+              style="margin-right: 32px"
+            >
              <div class="btnText">取消</div>
            </div>
            <div class="del_btn btn2" @click="recallReviewProject">
@@ -2136,7 +2192,11 @@
            </div>
          </div>
          <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeStopModal" style="margin-right: 32px;">
+            <div
+              class="del_btn btn2"
+              @click="closeStopModal"
+              style="margin-right: 32px"
+            >
              <div class="btnText">取消</div>
            </div>
            <div class="del_btn btn2" @click="finishProject">
@@ -2166,7 +2226,11 @@
            <span>您确定要存为模版吗</span>
          </div>
          <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeStartModal" style="margin-right: 32px;">
+            <div
+              class="del_btn btn2"
+              @click="closeStartModal"
+              style="margin-right: 32px"
+            >
              <div class="btnText">取消</div>
            </div>
            <div class="del_btn btn2" @click="templateProject">
@@ -2778,7 +2842,7 @@ export default {
      ImpoterGroupLeaderV: false, //导入小组长抽屉
      certificatelist: [],
      fileUrl: process.env.VUE_APP_FILE_PATH,
-      uploadAction: process.env.VUE_APP_BASE_API + '/file/uploadunlimit'
+      uploadAction: process.env.VUE_APP_BASE_API + "/file/uploadunlimit",
    });
    // 排行榜 - start
    // 积分排行榜 Top10
@@ -3132,7 +3196,7 @@ export default {
    };
    const closeModal2 = () => {
      state.stugroup = false;
-      state.buttonLoading = false
+      state.buttonLoading = false;
      state.groupInfo = {};
      state.groupMemberCountContrast = null;
      getGroup();
@@ -4660,8 +4724,8 @@ export default {

      // 评估 停用
      if (item.type == 11) {
-        if (item.taskStatus == 1 || item.taskStatus == 2)
-          return message.error("该任务无法学习，请联系管理员进行替换。");
+        // if (item.taskStatus == 1 || item.taskStatus == 2)
+        //   return message.error("该任务无法学习，请联系管理员进行替换。");

        codeUrl =
          window.location.protocol +
@@ -6835,7 +6899,6 @@ export default {
            text-overflow: ellipsis;
            white-space: nowrap;
            cursor: pointer;
-
          }

          .more {