From 0cad3809b42206bbea67a28234a585ec28b96f62 Mon Sep 17 00:00:00 2001
From: peiqingliu <1226880979@qq.com>
Date: Fri, 10 Mar 2023 13:00:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/StuScoreDetail.vue | 2 +-
 src/components/student/CommonStudent.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue
index b0ae599e..d1b8914c 100644
--- a/src/components/drawers/StuScoreDetail.vue
+++ b/src/components/drawers/StuScoreDetail.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">学员获取详情1</div>
+        <div class="headerTitle">学员获取详情</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index afd1beed..b7891e29 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -14,7 +14,7 @@
         <div style="display: flex; overflow-x: auto; overflow-y: auto">
           <div class="tabs" style="min-width: 800px">
             <a-tabs v-model:activeKey="activeKey">
-              <a-tab-pane v-if="isGroup" :key="4" tab="项目内学员1">
+              <a-tab-pane v-if="isGroup" :key="4" tab="项目内学员">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="姓名：">

From 0f08aa0419e668badd895aca5906ad6b4faeae8d Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 10 Mar 2023 13:19:10 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env               | 2 ++
 .env.prod          | 4 +++-
 .env.release       | 4 +++-
 src/store/index.js | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index df7550eb..2843407d 100644
--- a/.env
+++ b/.env
@@ -35,3 +35,5 @@ VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
 VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
 #h5的基本url
 VUE_APP_H5=//u-pre.boe.com/student-h5
+#用户头像
+VUE_APP_AVATAR_PATH=/upload/
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 21347850..95f57361 100644
--- a/.env.prod
+++ b/.env.prod
@@ -25,4 +25,6 @@ VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id=
 #h5的基本url
 VUE_APP_H5=//u.boe.com/student-h5
 #文件基础路径调试 只在生产做了变更
-VUE_APP_FILE_PATH=/upload/boe/file/
\ No newline at end of file
+VUE_APP_FILE_PATH=/upload/boe/file/
+#用户头像
+VUE_APP_AVATAR_PATH=/upload/
\ No newline at end of file
diff --git a/.env.release b/.env.release
index 185c9dc5..d6f1580a 100644
--- a/.env.release
+++ b/.env.release
@@ -21,4 +21,6 @@ VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile-release/pages/study/courseStudy?id=
 VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc-release/case/detail?id=
 VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id=
 #h5的基本url
-VUE_APP_H5=//u.boe.com/student-h5-release
\ No newline at end of file
+VUE_APP_H5=//u.boe.com/student-h5-release
+#用户头像
+VUE_APP_AVATAR_PATH=/upload/
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index bfaef81f..004edc54 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -62,7 +62,7 @@ export default createStore({
       state.memberInitInfo = data;
     },
     SET_USER(state, userInfo) {
-      userInfo.avatar = userInfo.avatar?.includes(process.env.VUE_APP_FILE_PATH) ? userInfo.avatar : (process.env.VUE_APP_FILE_PATH + userInfo.avatar);
+      userInfo.avatar = userInfo.avatar?.includes(process.env.VUE_APP_AVATAR_PATH) ? userInfo.avatar : (process.env.VUE_APP_AVATAR_PATH + userInfo.avatar);
       state.userInfo = userInfo;
     },
     SET_projectTemplateId(state, projectTemplateId) {

From 37822ffd115d99516b44ff16e4f6ff0dc72c5e48 Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Fri, 10 Mar 2023 14:24:52 +0800
Subject: [PATCH 3/7] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96=E5=BD=B1?=
 =?UTF-8?q?=E8=97=8F=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue          | 164 +++++-------------
 src/components/drawers/AddLive.vue            |  31 ++--
 .../research/components/ResearchAddPin.vue    |   2 +-
 3 files changed, 63 insertions(+), 134 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index d14fcfcf..31ae5b1c 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -2,126 +2,76 @@
   <div @click="openDrawer">
     <slot></slot>
   </div>
-  <a-drawer
-      :visible="visible"
-      class="drawerStyle addactiveDrawer"
-      width="800"
-      title="添加活动"
-      placement="right"
-  >
+  <a-drawer :visible="visible" class="drawerStyle addactiveDrawer" width="800" title="添加活动" placement="right">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}活动</div>
-        <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                  v-model:value="formData.activityName"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入活动名称"
-                  maxlength="20"
-              />
+              <a-input v-model:value="formData.activityName" style="width: 400px; height: 40px; border-radius: 8px"
+                placeholder="请输入活动名称" maxlength="20" />
             </div>
           </div>
 
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
-                  :disabled-date="disabledDate"
-                 
-                  :show-time="{ format: 'HH:mm' }"
-                  format="YYYY-MM-DD HH:mm"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="dateTime"
-                  @change="timeChange"
-                  :placeholder="['      开始时间', '        结束时间']"
-              />
+              <a-range-picker :disabled-date="disabledDate" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
+                style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" @change="timeChange"
+                :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
-          <div class="main_item">
+          <!-- <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动时长：</span>
             </div>
             <div class="btnbox">
-              <a-input-number
-                  :min="0"
-                  :max="999999"
-                  :precision="0"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="formData.activityDuration"
-              />
+              <a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
+                v-model:value="formData.activityDuration" />
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
-          </div>
+          </div> -->
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动地点：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                  v-model:value="formData.activityAddress"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入活动地点"
-                  maxlength="100"
-              />
+              <a-input v-model:value="formData.activityAddress" style="width: 400px; height: 40px; border-radius: 8px"
+                placeholder="请输入活动地点" maxlength="100" />
             </div>
           </div>
           <div class="main_item2">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动公告：</span>
             </div>
             <div class="textarea">
-              <a-textarea
-                  v-model:value="formData.activityNotice"
-                  placeholder="请输入活动公告"
-                  allow-clear
-                  :rows="6"
-                  show-count
-                  :maxlength="200"
-              />
+              <a-textarea v-model:value="formData.activityNotice" placeholder="请输入活动公告" allow-clear :rows="6" show-count
+                :maxlength="200" />
             </div>
           </div>
           <div class="main_item2">
@@ -129,14 +79,8 @@
               <span style="margin-right: 3px">活动说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
-                  v-model:value="formData.activityExplain"
-                  placeholder="请输入活动说明"
-                  allow-clear
-                  :rows="6"
-                  show-count
-                  :maxlength="200"
-              />
+              <a-textarea v-model:value="formData.activityExplain" placeholder="请输入活动说明" allow-clear :rows="6" show-count
+                :maxlength="200" />
             </div>
           </div>
           <div class="main_item2">
@@ -152,39 +96,23 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>活动开始前：</span>
-                  <a-input-number
-                      :min="0"
-                      :max="999999"
-                      :precision="0"
-                      style="
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
-                      v-model:value="formData.beforeSignIn"
-                  />
-                  <span style="color: #999999; margin-left: 8px"
-                  >分钟允许签到</span
-                  >
+                  <a-input-number :min="0" :max="999999" :precision="0" style="
+                        width: 88px;
+                        height: 32px;
+                        border-radius: 8px;
+                        overflow: hidden;
+                      " v-model:value="formData.beforeSignIn" />
+                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
                 </div>
                 <div class="timerbox">
                   <span>活动开始后：</span>
-                  <a-input-number
-                      :min="0"
-                      :max="999999"
-                      :precision="0"
-                      style="
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
-                      v-model:value="formData.afterSignIn"
-                  />
-                  <span style="color: #999999; margin-left: 8px"
-                  >分钟允许签到</span
-                  >
+                  <a-input-number :min="0" :max="999999" :precision="0" style="
+                        width: 88px;
+                        height: 32px;
+                        border-radius: 8px;
+                        overflow: hidden;
+                      " v-model:value="formData.afterSignIn" />
+                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
                 </div>
               </div>
             </div>
@@ -205,8 +133,8 @@
   </a-drawer>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref} from "vue";
-import {Form, message} from "ant-design-vue";
+import { defineEmits, defineProps, ref } from "vue";
+import { Form, message } from "ant-design-vue";
 import dayjs from "dayjs";
 
 const props = defineProps({
@@ -267,7 +195,7 @@ const rulesRef = ref({
   ],
 });
 
-const {resetFields, validate} = Form.useForm(formData, rulesRef);
+const { resetFields, validate } = Form.useForm(formData, rulesRef);
 
 const closeDrawer = () => {
   visible.value = false
@@ -302,31 +230,31 @@ const disabledRangeTime = () => ({
 */
 async function confirm() {
   // debugger
-  await validate().catch(({errorFields}) => {
+  await validate().catch(({ errorFields }) => {
     message.warning(errorFields[0].errors.join());
     throw Error("数据校验不通过")
   });
   if (taskIndex.value === -1) {
     const list = props.taskList
-    list.push({name: formData.value.activityName, type: props.type,duration:dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes'), info: {...formData.value}})
+    list.push({ name: formData.value.activityName, type: props.type, duration: dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime, 'minutes'), info: { ...formData.value } })
   } else {
     const data = props.taskList[taskIndex.value]
     data.name = formData.value.activityName
-    data.info = {...formData.value}
-    data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes')
+    data.info = { ...formData.value }
+    data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime, 'minutes')
   }
   emit('update:taskList', [...props.taskList])
   closeDrawer()
 }
 
 function openDrawer(i, row) {
-  row && (formData.value = {...row.info});
+  row && (formData.value = { ...row.info });
   row && (dateTime.value = [dayjs(row.info.activityStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.activityEndTime, "YYYY-MM-DD HH:mm")]);
   (i >= 0) && (taskIndex.value = i);
   visible.value = true
 }
 
-defineExpose({openDrawer})
+defineExpose({ openDrawer })
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index a75b3c4c..1e1c3691 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -52,7 +52,7 @@
                 valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
-          <div class="main_item">
+          <!-- <div class="main_item">
             <div class="signbox">
               <div class="sign">
                 <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
@@ -64,7 +64,7 @@
                 v-model:value="formData.liveDuration"></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
-          </div>
+          </div> -->
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -159,21 +159,21 @@
                 <div class="timerbox">
                   <span>直播开始前：</span>
                   <a-input-number :min="0" :max="999999" :precision="0" style="
-                                                width: 88px;
-                                                height: 32px;
-                                                border-radius: 8px;
-                                                overflow: hidden;
-                                              " v-model:value="formData.beforeSignIn"></a-input-number>
+                                                  width: 88px;
+                                                  height: 32px;
+                                                  border-radius: 8px;
+                                                  overflow: hidden;
+                                                " v-model:value="formData.beforeSignIn"></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
                 </div>
                 <div class="timerbox">
                   <span>直播开始后：</span>
                   <a-input-number :min="0" :max="999999" :precision="0" style="
-                                                width: 88px;
-                                                height: 32px;
-                                                border-radius: 8px;
-                                                overflow: hidden;
-                                              " v-model:value="formData.afterSignIn"></a-input-number>
+                                                  width: 88px;
+                                                  height: 32px;
+                                                  border-radius: 8px;
+                                                  overflow: hidden;
+                                                " v-model:value="formData.afterSignIn"></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
                 </div>
               </div>
@@ -376,7 +376,7 @@ async function confirm() {
   } else {
     const data = props.taskList[taskIndex.value];
     data.name = formData.value.liveName;
-    data.info = {...formData.value};
+    data.info = { ...formData.value };
     data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
     console.log(data)
   }
@@ -408,7 +408,7 @@ const beforeUpload = (file) => {
     message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
     return false;
   }
-  
+
   let isLt1M = file.size < 2000000;
   console.log(file.size, isLt1M)
   if (!isLt1M) {
@@ -432,9 +432,10 @@ const beforeUpload = (file) => {
 };
 </script>
 <style lang="scss">
-.ant-upload { 
+.ant-upload {
   background-color: #fff !important;
 }
+
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue
index fbe879b9..ebfcdbd6 100644
--- a/src/views/research/components/ResearchAddPin.vue
+++ b/src/views/research/components/ResearchAddPin.vue
@@ -83,7 +83,7 @@
           <div class="assesswhole" style="background: #ffffff">
             <a-input-number
               v-model:value="curItem.pinQuan"
-              :min="1"
+              :min="0"
               :max="100"
             />
           </div>

From fa33f4f9dec6b2db4e4158c0bb14e1e1624b480b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 10 Mar 2023 15:56:29 +0800
Subject: [PATCH 4/7] =?UTF-8?q?--=20fix=20=E9=A1=B9=E7=9B=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/utils.js                        |  8 ++++----
 src/views/projectcenter/ProjectManage.vue | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 77f98431..446fa13b 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -38,13 +38,13 @@ export function checkPer(per,createId) {
   if (store?.state?.userInfo?.roleList.some(t => t.code === "system-admin")) {
     return true;
   }
+  if(per){
+    return (per + "").split(",").some(t => admin.some(s => s == t));
+  }
   if (store?.state?.userInfo?.isHrbp) {
     return true;
   }
-  if (!per) {
-    return false;
-  }
-  return (per + "").split(",").some(t => admin.some(s => s == t));
+  return false
 }
 
 const adminOwner = [6, 9, 12];
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 2b475cbb..853f1ebb 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1425,6 +1425,17 @@ export default {
     };
     // 获取项目列表信息
     let tableData = ref([]);
+
+    watch(tableData,()=> tableData.value?.forEach(t=> dealPermission(t)))
+
+    function dealPermission(data){
+      if(!data){
+        return
+      }
+      data.permissions  || (data.children?.some(s=>s.permissions || s.children?.some(j=>j.permissions)) && (data.permissions = '4'))
+      data.children?.forEach(t=>dealPermission(t))
+    }
+
     const columns = ref([
       {
         title: "项目名称",

From a814c0d2fe65fd3d1a4058d9cc8fca9330be5189 Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Fri, 10 Mar 2023 16:13:12 +0800
Subject: [PATCH 5/7] update

---
 src/components/drawers/AddActive.vue | 12 ++++++------
 src/components/drawers/AddLive.vue   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 31ae5b1c..c945a727 100644
--- 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,
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 1e1c3691..de223367 100644
--- 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,

From 197540a7a4f0e6638f72a9a522556e599b1aee55 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 10 Mar 2023 17:04:14 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 393238b7..0b88f261 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本1.4.5------------");
+console.log("版本1.4.6------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

From 9ee7f16f887cc25a581afcbe02a6bfc17f455c5d Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 10 Mar 2023 17:13:11 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue  |  75 ++++++++-----
 src/views/projectcenter/TaskPage.vue | 151 +++++++++++++++++++--------
 2 files changed, 157 insertions(+), 69 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 05a030ea..b0b88e4e 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -19,7 +19,7 @@
         <div v-if="action == 1" class="line"></div>
         <div
           class="pubIcon"
-          v-if="(action == 1 || action == 0) && checkPer(permissions,createId)"
+          v-if="(action == 1 || action == 0) && checkPer(permissions, createId)"
           @click="pubIcon(action)"
         >
           <img class="img2" src="../../assets/images/leveladd/pub.png" />
@@ -53,7 +53,7 @@
             <div class="onerow">
               <div class="taskmain">快速创建路径图详情</div>
             </div>
-            <div class="second" v-if="checkPer(permissions,createId)">
+            <div class="second" v-if="checkPer(permissions, createId)">
               <div @click="totask">
                 <div
                   class="taskbox"
@@ -331,7 +331,7 @@
               <router-link
                 :to="{ path: '/leveladddetail', query: { routerId: routerId } }"
                 class="editright"
-                v-if="checkPer(permissions,createId)"
+                v-if="checkPer(permissions, createId)"
               >
                 <img
                   class="editimg"
@@ -578,7 +578,7 @@
               <a-button
                 type="link"
                 @click="setLevels(record)"
-                v-if="checkPer(permissions,createId)"
+                v-if="checkPer(permissions, createId)"
                 >调整</a-button
               >
             </template>
@@ -601,7 +601,7 @@
                         class="oneedi"
                         @click="showbtn"
                         v-show="twobtn"
-                        v-if="checkPer(permissions,createId)"
+                        v-if="checkPer(permissions, createId)"
                       >
                         编辑
                       </div>
@@ -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">
@@ -1456,7 +1480,7 @@ export default {
     const stuRef = ref();
     // const store = useStore();
     const state = reactive({
-      createId:null,
+      createId: null,
       permissions: "",
       hasTask: false,
       stage: [],
@@ -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 +
@@ -2823,10 +2848,10 @@ export default {
     const downloadFile = (url) => {
       console.log(url);
       window.open(
-              window.location.protocol +
-              process.env.VUE_APP_BOE_API_URL +
-              process.env.VUE_APP_FILE_PATH +
-              url
+        window.location.protocol +
+          process.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_FILE_PATH +
+          url
       );
       // if(url){
       //   const filename = '操作指南'
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 148612ac..0ca48e93 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -23,25 +23,27 @@
         <div class="line" v-if="action == 3"></div>
         <!-- 显示发布图标 -->
         <img
-          v-if="action == 2 && checkPer(permissions,createId)"
+          v-if="action == 2 && checkPer(permissions, createId)"
           class="img2"
           src="../../assets/images/leveladd/pub.png"
         />
         <!-- 显示撤回发布图标 -->
         <img
-          v-if="action == 3 && checkPer(permissions,createId)"
+          v-if="action == 3 && checkPer(permissions, createId)"
           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, createId)
+          "
           class="img2"
           src="../../assets/images/project/reviewsubmit.png"
         />
         <!-- 显示撤回审核图标 -->
         <img
-          v-if="action == 1 && checkPer(permissions,createId)"
+          v-if="action == 1 && checkPer(permissions, createId)"
           class="img2"
           src="../../assets/images/project/reviewrecall.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 }}
@@ -59,7 +63,7 @@
         <div
           class="pub"
           style="width: 56px; color: #a497ff"
-          v-if="action == 1 && checkPer(permissions,createId)"
+          v-if="action == 1 && checkPer(permissions, createId)"
           @click="showRecallReviewModal"
         >
           {{ act }}
@@ -68,7 +72,7 @@
         <div
           class="pub"
           style="width: 28px"
-          v-if="action == 2 && checkPer(permissions,createId)"
+          v-if="action == 2 && checkPer(permissions, createId)"
           @click="showProjectPub"
         >
           {{ act }}
@@ -77,7 +81,7 @@
         <div
           class="pub"
           style="width: 56px; color: #57c887"
-          v-if="action == 3 && checkPer(permissions,createId)"
+          v-if="action == 3 && checkPer(permissions, createId)"
           @click="showBackModal"
         >
           {{ 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">
@@ -185,7 +193,7 @@
             <div class="onerow">
               <div class="taskmain">快速创建项目详情</div>
             </div>
-            <div v-if="checkPer(permissions,createId)" class="second">
+            <div v-if="checkPer(permissions, createId)" class="second">
               <!-- @click="totask" -->
               <div
                 class="taskbox"
@@ -460,7 +468,7 @@
                 <button class="btn">批量面授报名</button>
               </ImpoterGroupLeader> -->
               <router-link
-                v-if="checkPer(permissions,createId)"
+                v-if="checkPer(permissions, createId)"
                 :to="{ path: `/taskadd`, query: { projectId: projectId } }"
               >
                 <button class="edit">
@@ -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>
@@ -709,7 +717,7 @@
               </router-link>
               <!-- 无数据创建任务 -->
             </div>
-            <div v-else-if="checkPer(permissions,createId)">
+            <div v-else-if="checkPer(permissions, createId)">
               <div
                 class="taskbox"
                 @click="
@@ -761,13 +769,13 @@
                     </a-button>
                     <a-button
                       @click="settingTopFlag(record)"
-                      v-if="checkPer(permissions,createId)"
+                      v-if="checkPer(permissions, createId)"
                       type="link"
                       >{{ record.topFlag ? "取消优秀" : "优秀学员" }}
                     </a-button>
                     <a-button
                       type="link"
-                      v-if="checkPer(permissions,createId)"
+                      v-if="checkPer(permissions, createId)"
                       :disabled="record.isLeader === '1'"
                       @click="showChangeGroupModal(record)"
                       >换组
@@ -795,7 +803,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="second2" v-if="checkPer(permissions,createId)">
+                <div class="second2" v-if="checkPer(permissions, createId)">
                   <div class="btn1" @click="showModal2()">
                     <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">创建小组</span>
@@ -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>
@@ -1072,7 +1085,7 @@
               <div
                 class="addcertificate1"
                 @click="addCertificate"
-                v-if="checkPer(permissions,createId)"
+                v-if="checkPer(permissions, createId)"
               >
                 <div class="addcertext">+添加证书</div>
               </div>
@@ -1124,7 +1137,7 @@
                             查看
                           </div>
                           <div
-                            v-if="checkPer(permissions,createId)"
+                            v-if="checkPer(permissions, createId)"
                             class="certificateMore2"
                             style="line-height: 22px; cursor: pointer"
                             @click="editCertificate(item)"
@@ -1132,7 +1145,7 @@
                             编辑
                           </div>
                           <div
-                            v-if="checkPer(permissions,createId)"
+                            v-if="checkPer(permissions, createId)"
                             class="certificateMore3"
                             style="line-height: 22px; cursor: pointer"
                             @click="deleteCertificate(item)"
@@ -1185,7 +1198,7 @@
                     </div> -->
                   <div
                     class="edit"
-                    v-if="status != 3 && checkPer(permissions,createId)"
+                    v-if="status != 3 && checkPer(permissions, createId)"
                     @click="toEdit"
                   >
                     <div class="img"></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"
                       >
@@ -1441,7 +1466,7 @@
                         >
                         <a
                           href="javascript:void(0);"
-                          v-if="checkPer(permissions,createId)"
+                          v-if="checkPer(permissions, createId)"
                           @click="
                             downloadFile(
                               item.response ? item.response.data : ''
@@ -1451,7 +1476,7 @@
                           >下载</a
                         >
                         <span
-                          v-if="checkPer(permissions,createId)"
+                          v-if="checkPer(permissions, createId)"
                           style="color: #4ea6ff; float: right; cursor: pointer"
                           @click="deFile(item.uid)"
                           >删除</span
@@ -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 {