From 7ce64d1a8388b0e0731c6111bb8a6c6d95705cec Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Feb 2023 09:42:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?style:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A2=98=E7=9B=AE=E6=94=AF=E6=8C=81=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/components/ResearchAddItem.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue
index 2e1c5b90..075b42f7 100644
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -17,7 +17,7 @@
       </div>
       <div class="delete" @click="handleDel">删除</div>
     </div>
-    <!--
+    
     <div class="name uploadContent">
       <a-upload
         v-show="!curItem.imgVal"
@@ -44,7 +44,7 @@
         />
       </div>
     </div>
-    -->
+   
   </div>
 </template>
 <script>

From 02784341411f7e3e8d9f90e7fa604a7604af0550 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Feb 2023 15:17:40 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86-=E6=A6=9C=E5=8D=95-=EF=BC=88=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E7=A7=AF=E5=88=86=E6=A6=9C=E3=80=81=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A6=9C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                       |   3 +-
 src/components/drawers/ProjectScore.vue | 154 +++++++++++-------------
 2 files changed, 74 insertions(+), 83 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index 1a2376f0..b4049d65 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -87,7 +87,8 @@ export const editLearnInfo = (obj) => http.post('/admin/router/editInfo', obj)
 
 //项目基础信息-----------------------------------
 //项目积分榜单
-export const scoreRank = (obj) => http.post("/admin/project/scoreRank", obj);
+// export const scoreRank = (obj) => http.post("/admin/project/scoreRank", obj);
+export const scoreRank = (params) => http.get('/points/top/list', { params })
 //排行榜
 export const billboard = (obj) => http.post("/admin/project/billboard", obj);
 //项目基础信息-----------------------------------
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 0d322145..7fbbda9f 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -53,21 +53,21 @@
       <a-tab-pane key="2" tab="榜单" force-render>
         <div class="scorelist">
           <div class="grouprightscore">
-            <div class="sbutton" @click="typeChange(1)">
+            <div class="sbutton" @click="typeChange(0)">
               <img
-                v-if="stuValue === 2"
+                v-if="stuValue === 1"
                 src="../../assets/images/taskpage/stu0.png"
               />
               <img v-else src="../../assets/images/taskpage/stu.png" />
-              <div :class="stuValue === 2 ? '' : 'btn1'">学员积分榜</div>
+              <div :class="stuValue === 1? '' : 'btn1'">学员积分榜</div>
             </div>
-            <div class="sbutton" @click="typeChange(2)">
+            <div class="sbutton" @click="typeChange(1)">
               <img
-                v-if="stuValue === 2"
+                v-if="stuValue === 1"
                 src="../../assets/images/taskpage/group.png"
               />
               <img v-else src="../../assets/images/taskpage/group0.png" />
-              <div :class="stuValue === 2 ? 'btn1' : ''">小组积分榜</div>
+              <div :class="stuValue === 1 ? 'btn1' : ''">小组积分榜</div>
             </div>
           </div>
           <div class="group" style="justify-content: center">
@@ -104,33 +104,33 @@
           </div>
           <div class="listdiv">
             <div class="slist">
-              <a-list :data-source="stuValue === 1 ? datascoreg : datascore">
+              <a-list :data-source="stuValue === 1 ? datascoreg : datascore" :loading="scoreRankLoading">
                 <template #renderItem="{ item }">
                   <div class="item">
-                    <div v-if="item.id == 1" class="itemleft">
+                    <div v-if="item.index == 1" class="itemleft">
                       <div class="itemimage">
                         <img src="../../assets/images/taskpage/gold.png" />
                       </div>
-                      <div class="itemid">{{ item.id }}</div>
+                      <div class="itemid">{{ item.index }}</div>
                     </div>
-                    <div v-else-if="item.id == 2" class="itemleft">
+                    <div v-else-if="item.index == 2" class="itemleft">
                       <div class="itemimage">
                         <img src="../../assets/images/taskpage/siler.png" />
                       </div>
-                      <div class="itemid">{{ item.id }}</div>
+                      <div class="itemid">{{ item.index }}</div>
                     </div>
-                    <div v-else-if="item.id == 3" class="itemleft">
+                    <div v-else-if="item.index == 3" class="itemleft">
                       <div class="itemimage">
                         <img src="../../assets/images/taskpage/copper.png" />
                       </div>
-                      <div class="itemid">{{ item.id }}</div>
+                      <div class="itemid">{{ item.index }}</div>
                     </div>
                     <div v-else class="itemleft">
-                      <div class="elseid">{{ item.id }}</div>
+                      <div class="elseid">{{ item.index }}</div>
                     </div>
 
                     <div class="itemcenter">{{ item.name }}</div>
-                    <div class="itemright">{{ item.score }}</div>
+                    <div class="itemright">{{ item.pointsCountStr }}</div>
                   </div>
                 </template>
               </a-list>
@@ -296,6 +296,7 @@ import { scoreRule } from "../../api/indexTaskadd"; //获取项目积分规则
 import { setScoreRule } from "../../api/indexTaskadd"; //设置项目积分规则
 import { getProjStu } from "../../api/indexProjStu";
 import { message } from "ant-design-vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ProjectScore",
   components: {
@@ -390,67 +391,20 @@ export default {
         },
       ],
       datascore: [
-        {
-          id: 1,
-          name: "张三的名字很长很长很长",
-          score: "10分",
-        },
-        {
-          id: 2,
-          name: "李四",
-          score: "10分",
-        },
-        {
-          id: 3,
-          name: "王五的名字一定要比张三的还长",
-          score: "10分",
-        },
-        {
-          id: 4,
-          name: "赵六",
-          score: "10分",
-        },
-        {
-          id: 5,
-          name: "冯七",
-          score: "10分",
-        },
+       
       ],
       datascoreg: [
-        {
-          id: 1,
-          name: "第一组的同学们",
-          score: "10分",
-        },
-        {
-          id: 2,
-          name: "第2组的同学们",
-          score: "9分",
-        },
-        {
-          id: 3,
-          name: "第3组的同学们",
-          score: "8分",
-        },
-        {
-          id: 4,
-          name: "第4组的同学们",
-          score: "7分",
-        },
-        {
-          id: 5,
-          name: "第五组的同学们",
-          score: "6分",
-        },
+        
       ],
+      scoreRankLoading:true,
       valueName: "", //排行榜输入姓名
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "请输入要发布的公告",
-      activeKeyScore: "2",
+      activeKeyScore: "1",
       stuName: "请输入姓名",
       todayvalue: "1",
-      stuValue: false,
+      stuValue: 0,
       Svisible: false,
       score1: null,
       done2: null,
@@ -466,13 +420,14 @@ export default {
       seven1: null,
       seven2: null,
       edit: true,
-      searchRankName: null, //榜单搜索名称
+      searchRankName: "", //榜单搜索名称
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: null,
       searchNameValue: null, //学员获取的姓名
       checkStuId: null,
       proId: null,
+      startTime: (new Date(new Date(new Date().toLocaleDateString()).getTime())).getTime().toString()
     });
     const getTableData = () => {
       let datas = state.tabledataStu;
@@ -517,52 +472,86 @@ export default {
     const tabsChange = (e) => {
       if (e == 2) {
         // console.log('获取项目积分-榜单')
-        scoreRank(1, 1);
+        scoreRank();
       } else if (e == 3) {
         getScoreRule();
       }
       rankReset();
       state.todayvalue = "1";
-      state.stuValue = 1;
+      state.stuValue = 0;
     };
 
     //重置
     const rankReset = () => {
-      state.searchRankName = null;
+      state.searchRankName = "";
+      scoreRank();
     };
     // start -------榜单---------------榜单------------榜单------------------榜单---------
     //学员积分还是小组积分
     const typeChange = (num) => {
-      state.stuValue = num;
-      scoreRank(state.stuValue, state.todayvalue);
+      console.log(num)
+      state.stuValue = Number(num);
+      scoreRank();
     };
     //选择时间
     const changeday = (e) => {
       state.todayvalue = e.target.value;
-      scoreRank(state.stuValue, state.todayvalue);
+      console.log('切换时间显示-今天-七天-近一个月', e.target.value)
+      if(e.target.value==1){
+        state.startTime = (new Date(new Date(new Date().toLocaleDateString()).getTime())).getTime().toString()
+      }else if(e.target.value==2){
+        state.startTime = ((new Date(new Date(new Date().toLocaleDateString()).getTime())).getTime() - 7*24*60*60*1000).toString()
+      }else{
+        state.startTime = ((new Date(new Date(new Date().toLocaleDateString()).getTime())).getTime() - 31*24*60*60*1000).toString()
+      }
+      scoreRank();
     };
     //搜索
     const searchRank = () => {
-      scoreRank(state.stuValue, state.todayvalue);
+      scoreRank();
     };
     //项目积分榜单
     const scoreRank = (period, type) => {
-      console.log("projectId", props.projectId);
+      state.scoreRankLoading = true;
+      state.datascore = [];
+      state.datascoreg = [];
+      console.log("projectId----->", props.projectId,period, type);
+      console.log('我是查询榜单传递的数据',{
+        projectId: props.projectId, // 项目id
+        name: state.searchRankName, // 名字，没有则传空字符串
+        startTime:state.startTime, // 数据查询的起始时间 10位时间戳
+        size: 5, // 前多少名
+        type: Number(state.stuValue), // 查询类型 0 学员积分榜 1 小组积分榜
+      })
       let obj = {
-        name: state.searchRankName,
-        pageNo: 1,
-        pageSize: 5,
-        period: Number(period),
-        projectId: props.projectId,
-        type: Number(type),
+        projectId: props.projectId, // 项目id
+        name: state.searchRankName, // 名字，没有则传空字符串
+        startTime: state.startTime, // 数据查询的起始时间 10位时间戳
+        size: 5, // 前多少名
+        type: Number(state.stuValue), // 查询类型 0 学员积分榜 1 小组积分榜
       };
+      
       api
         .scoreRank(obj)
         .then((res) => {
           console.log("获取项目积分-榜单", res);
+          if(res.data.code==200){
+            state.datascore = res.data.data;
+            state.datascoreg = res.data.data;
+            state.scoreRankLoading = false;
+          }else{
+            state.datascore = [];
+            state.datascoreg = [];
+            state.scoreRankLoading = false;
+          }
         })
         .catch((err) => {
           console.log("获取项目积分-榜单失败", err);
+          message.destroy();
+          message.error('榜单获取失败');
+          state.datascore = [];
+          state.datascoreg = [];
+          state.scoreRankLoading = false;
         });
     };
     // end -----榜单----------------榜单----------------------榜单-----------榜单----------
@@ -739,6 +728,7 @@ export default {
       searchStu,
       resetStud,
       getScoreRule,
+      checkPer
     };
   },
   // computed: {

From 531a9d37cb7755515797eb4689fabc6eb60521b1 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Feb 2023 16:30:39 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=EF=BC=88http/https=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                         | 12 ++++++------
 .env.boe                                     |  4 ++--
 .env.prod                                    | 12 ++++++------
 .env.release                                 | 12 ++++++------
 .env.test                                    |  2 +-
 src/api/method.js                            |  4 ++--
 src/api/request.js                           |  2 +-
 src/components/NavTop.vue                    |  2 +-
 src/views/courselibrary/CoursewareManage.vue |  2 +-
 vue.config.js                                |  4 ++--
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.env b/.env
index 5afca6ef..d398e4b1 100644
--- a/.env
+++ b/.env
@@ -5,21 +5,21 @@ VUE_APP_BASE_API=/manageApi
 #文件路径
 VUE_APP_FILE_PATH=/upload/
 # 代理url 本地调试，不可以用在其他地方
-VUE_APP_PROXY_URL=http://43.143.139.204/manageApi
+VUE_APP_PROXY_URL=//43.143.139.204/manageApi
 # 登录url
-VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
+VUE_APP_LOGIN_URL=//u-pre.boe.com/web
 # boe域名
-VUE_APP_BOE_API_URL=https://u-pre.boe.com
+VUE_APP_BOE_API_URL=//u-pre.boe.com
 #打包路径
 VUE_APP_OUTPUT_DIR=./dist
 
 # iframe嵌套url
-VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe
+VUE_APP_IFRAME_URL=//u-pre.boe.com/pc/iframe
 # 学员端路由
-VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVUE_APP_BOE_API_URL
+VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVUE_APP_BOE_API_URL
 
 # 课程二维码
-VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id=
+VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id=
 
 # 导入学员模板
 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
diff --git a/.env.boe b/.env.boe
index fdaf95b3..65a0c556 100644
--- a/.env.boe
+++ b/.env.boe
@@ -2,9 +2,9 @@ NODE_ENV=boe
 VUE_APP_BASE=/manage
 VUE_APP_BASE_API=/manageApi
 
-VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
+VUE_APP_LOGIN_URL=//u-pre.boe.com/web
 
-VUE_APP_BOE_API_URL=https://u-pre.boe.com
+VUE_APP_BOE_API_URL=//u-pre.boe.com
 
 # 导入学员模板
 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 3fc171f3..f7f9f813 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,15 +2,15 @@ NODE_ENV=prod
 VUE_APP_BASE=/manage
 VUE_APP_BASE_API=/manageApi
 
-VUE_APP_PROXY_URL=https://u.boe.com/
+VUE_APP_PROXY_URL=//u.boe.com/
 
-VUE_APP_LOGIN_URL=https://u.boe.com/web
+VUE_APP_LOGIN_URL=//u.boe.com/web
 
-VUE_APP_BOE_API_URL=https://u.boe.com
+VUE_APP_BOE_API_URL=//u.boe.com
 
-VUE_APP_IFRAME_URL=https://u.boe.com/pc/iframe
-VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading
+VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe
+VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading
 
-VUE_APP_COURSE_STUDY=https://u.boe.com/pc/course/studyindex?id=
+VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id=
 
 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
diff --git a/.env.release b/.env.release
index 4870808f..55d0b0e4 100644
--- a/.env.release
+++ b/.env.release
@@ -2,15 +2,15 @@ NODE_ENV=release
 VUE_APP_BASE=/manage-release
 VUE_APP_BASE_API=/manageApi-release
 
-VUE_APP_PROXY_URL=https://u-pre.boe.com/
-VUE_APP_LOGIN_URL=https://u.boe.com/web-release
+VUE_APP_PROXY_URL=//u-pre.boe.com/
+VUE_APP_LOGIN_URL=//u.boe.com/web-release
 
-VUE_APP_BOE_API_URL=https://u.boe.com
+VUE_APP_BOE_API_URL=//u.boe.com
 
 
-VUE_APP_IFRAME_URL=https://u.boe.com/pc-release/iframe
-VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading
+VUE_APP_IFRAME_URL=//u.boe.com/pc-release/iframe
+VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc-release/loading
 
-VUE_APP_COURSE_STUDY=https://u.boe.com/pc-release/course/studyindex?id=
+VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id=
 
 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 310c858d..8772bab7 100644
--- a/.env.test
+++ b/.env.test
@@ -1,2 +1,2 @@
 NODE_ENV=test
-VUE_APP_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
+VUE_APP_BOE_API_URL=//u-pre.boe.com
\ No newline at end of file
diff --git a/src/api/method.js b/src/api/method.js
index d4cd4a3a..7e1add2b 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -277,9 +277,9 @@ const commonData = {
 const organizationalTree = []
 
 //嵌套页面
-const iframeUrl = process.env.VUE_APP_IFRAME_URL
+const iframeUrl = window.location.protocol + process.env.VUE_APP_IFRAME_URL
 //学员端路由
-const studentUrl = process.env.VUE_APP_IFRAME_STUDENT_URL
+const studentUrl = window.location.protocol + process.env.VUE_APP_IFRAME_STUDENT_URL
 
 //二维码
 const codeUrl = "https://u-pre.boe.com"
diff --git a/src/api/request.js b/src/api/request.js
index 54e2361d..ccd6697c 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -197,7 +197,7 @@ export async function boeRequest(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    url = process.env.NODE_ENV === 'development' ? url : process.env.VUE_APP_BOE_API_URL + url
+    url = process.env.NODE_ENV === 'development' ? url : window.location.protocol + process.env.VUE_APP_BOE_API_URL + url
     return fetch(url, {
         method,
         headers: {
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index d1d06503..6c05f4c3 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -81,7 +81,7 @@ const changeRole = (value) => {
 const logOut = () => {
   store.replaceState(createStore({state: {openpages: []}}).state);
   localStorage.clear();
-  (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+  (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL)
 };
 </script>
 <style scoped lang="scss">
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 5b14734c..1184bd69 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4713,7 +4713,7 @@ export default defineComponent({
         name: record.name ? record.name : "",
         url:
           type == 1
-            ? process.env.VUE_APP_COURSE_STUDY + record.offcourseId
+            ? window.location.protocol + process.env.VUE_APP_COURSE_STUDY + record.offcourseId
             : process.env.VUE_APP_BASE_API +
               `/admin/student/studentSign?taskId=${
                 record.offcoursePlanId
diff --git a/vue.config.js b/vue.config.js
index 079769f5..d02e28c6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,13 +15,13 @@ module.exports = defineConfig({
         port: 8080,
         proxy: {
             "/manageApi": {
-                target: process.env.VUE_APP_PROXY_URL,
+                target: window.location.protocol + process.env.VUE_APP_PROXY_URL,
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",
                 },
             }, "/userbasic": {
-                target: process.env.VUE_APP_BOE_API_URL,
+                target: window.location.protocol + process.env.VUE_APP_BOE_API_URL,
                 changeOrigin: true, //表示是否改变原域名
             },
         },

From 09418de1ef7784a412a4fb5dc3de8c5f26f809e6 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Feb 2023 16:40:42 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0pro?=
 =?UTF-8?q?xy=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0windows.location=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index d02e28c6..2e2b53e1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,13 +15,13 @@ module.exports = defineConfig({
         port: 8080,
         proxy: {
             "/manageApi": {
-                target: window.location.protocol + process.env.VUE_APP_PROXY_URL,
+                target: 'http:' + process.env.VUE_APP_PROXY_URL,
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",
                 },
             }, "/userbasic": {
-                target: window.location.protocol + process.env.VUE_APP_BOE_API_URL,
+                target: 'http:' + process.env.VUE_APP_BOE_API_URL,
                 changeOrigin: true, //表示是否改变原域名
             },
         },

From 0935d4c252cffcd39a03552ae9b7bc1394c687a9 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Feb 2023 16:42:57 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0pro?=
 =?UTF-8?q?xy=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0windows.location=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue.config.js b/vue.config.js
index 2e2b53e1..4b714363 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,7 +21,7 @@ module.exports = defineConfig({
                     "^/manageApi": "",
                 },
             }, "/userbasic": {
-                target: 'http:' + process.env.VUE_APP_BOE_API_URL,
+                target: 'https:' + process.env.VUE_APP_BOE_API_URL,
                 changeOrigin: true, //表示是否改变原域名
             },
         },

From 4ab76ad76bb86916fa311abe0ede4d33283eb913 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Feb 2023 17:00:41 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9env=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=8A=E9=9D=A2=E6=8E=88=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env              | 2 +-
 src/api/method.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index d398e4b1..c7f198b9 100644
--- a/.env
+++ b/.env
@@ -16,7 +16,7 @@ VUE_APP_OUTPUT_DIR=./dist
 # iframe嵌套url
 VUE_APP_IFRAME_URL=//u-pre.boe.com/pc/iframe
 # 学员端路由
-VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVUE_APP_BOE_API_URL
+VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loading
 
 # 课程二维码
 VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id=
diff --git a/src/api/method.js b/src/api/method.js
index 7e1add2b..f5826d2f 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -282,7 +282,7 @@ const iframeUrl = window.location.protocol + process.env.VUE_APP_IFRAME_URL
 const studentUrl = window.location.protocol + process.env.VUE_APP_IFRAME_STUDENT_URL
 
 //二维码
-const codeUrl = "https://u-pre.boe.com"
+const codeUrl = window.location.protocol +  "//u-pre.boe.com"
 export {
     throttle,
     toDate,

From a3ca45b775907ca98dd0163d854d5f25967519c8 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 3 Feb 2023 18:40:20 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                             |  14 +-
 .../drawers/project/AddCertificate.vue        | 641 +++++++-----------
 .../drawers/project/CreateCertificate.vue     |  76 ++-
 src/views/projectcenter/TaskPage.vue          |  28 +-
 4 files changed, 321 insertions(+), 438 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index 1a2376f0..537ad5e5 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-01 11:07:17
+ * @LastEditTime: 2023-02-03 18:39:27
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -190,4 +190,14 @@ export const getImportStatus = (uuid) => http.get('/admin/student/getImportStatu
 // 面授课导入学员
 export const FaceTeachImportStudent = (obj) => http.post('/admin/student/importStudent', obj, { headers: { "Content-Type": "multipart/form-data" } })
 //成绩录入
-export const updateStudent = (obj) => http.post('/admin/student/homeWorkScoreEntry', obj)
\ No newline at end of file
+export const updateStudent = (obj) => http.post('/admin/student/homeWorkScoreEntry', obj)
+
+
+//获取证书列表
+export const certificate = (obj) => http.get('/admin/certificate/page', { params: obj })
+//添加证书
+export const saveupdatecertificate = (obj) => http.post('/admin/certificate/saveOrUpdate', obj)
+//删除证书
+export const certificatedel = (obj) => http.get('/admin/certificate/del', { params: obj })
+//证书详情
+export const certificatedetail = (obj) => http.post('/admin/certificate/get', obj)
\ No newline at end of file
diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index c50083c3..7b217634 100644
--- a/src/components/drawers/project/AddCertificate.vue
+++ b/src/components/drawers/project/AddCertificate.vue
@@ -18,7 +18,6 @@
       </div>
       <div class="contentMain">
         <div class="main_left">
-
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -31,15 +30,15 @@
             </div>
             <div class="btnbox">
               <a-input
-                v-model:value="inputV1"
+                v-model:value="certificateName"
                 style="width: 400px; height: 40px; border-radius: 8px"
-                placeholder="请输入活动名称"
+                placeholder="请输入证书名称"
                 maxlength="20"
               />
             </div>
           </div>
 
-          <div class="main_item">
+          <!-- <div class="main_item">
             <div class="signbox">
               <div class="sign">
                 <img
@@ -50,107 +49,215 @@
               <span style="margin-right: 3px">证书：</span>
             </div>
             <div class="btnbox">
-                <button class="xkbtn11" @click="CreateCertificate" style="margin-top: 0px;">
-                    创建证书
-                </button>
+              <button
+                class="xkbtn11"
+                @click="CreateCertificate"
+                style="margin-top: 0px"
+              >
+                创建证书
+              </button>
+            </div>
+          </div> -->
+          <div class="main_item" style="align-items: flex-start">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">证书封面：</span>
+            </div>
+            <div
+              class="btnbox"
+              style="flex-direction: column; align-items: flex-start"
+            >
+              <a-upload
+                v-model:file-list="fileList"
+                name="file"
+                style="width: 200px"
+                list-type="picture-card"
+                class="avatar-uploader"
+                :show-upload-list="false"
+                action="/manageApi/file/uploadFile"
+                @change="handleChange"
+              >
+                <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
+                <div v-else>
+                  <loading-outlined v-if="loading"></loading-outlined>
+                  <plus-outlined v-else></plus-outlined>
+                  <div class="ant-upload-text">+</div>
+                </div>
+              </a-upload>
+              <div style="font-size: 14px; color: #666">
+                建议尺寸：750*348 格式支持jpg、gif、png、jpeg、svg、bmp
+              </div>
+            </div>
+          </div>
+          <div class="main_item2">
+            <div class="signbox">
+              <span style="margin-right: 3px">证书说明：</span>
+            </div>
+            <div class="textarea" style="width: 400px">
+              <a-textarea
+                v-model:value="certificateRemark"
+                placeholder="请输入证书说明"
+                allow-clear
+                :rows="8"
+                show-count
+                :maxlength="200"
+              />
             </div>
           </div>
 
-
-          
-          
           <div class="main_item">
             <div class="signbox">
-              <span style="margin-right: 3px;font-size: 16px;color: #333;">设置获得条件</span>
-            </div>
-            <div class="btnbox">
-                
+              <span
+                style="
+                  margin-right: 3px;
+                  font-size: 16px;
+                  color: #333;
+                  font-size: 14px;
+                "
+                >设置获得条件</span
+              >
             </div>
+            <div class="btnbox"></div>
           </div>
 
           <div class="main_item">
-            <div class="signbox" style="width:30px;">
-              <span style="margin-right: 3px;font-size: 16px;color: #333;"></span>
+            <div class="signbox" style="width: 30px">
+              <span
+                style="margin-right: 3px; font-size: 16px; color: #333"
+              ></span>
             </div>
             <div class="btnbox">
-                <a-radio-group v-model:value="radioV1">
-                <a-radio v-model:checked="checked" :value="1" @click="cloradio1">
-                    完成项目
+              <a-radio-group
+                v-model:value="condition"
+                @change="selectCondition"
+              >
+                <a-radio v-model:checked="checked" :value="1">
+                  完成项目
                 </a-radio>
-                <br/>
-                <div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
-                    <a-radio-group v-model:value="large" size="small">
-                        <a-radio-button value="1">全部任务</a-radio-button>
-                        <a-radio-button value="2">完成必修任务</a-radio-button>
-                    </a-radio-group>
+                <br />
+                <div
+                  style="
+                    height: 60px;
+                    margin-left: 24px;
+                    display: flex;
+                    align-items: center;
+                  "
+                >
+                  <a-radio-group v-model:value="large" size="small">
+                    <a-radio-button value="1">全部任务</a-radio-button>
+                    <a-radio-button value="2">完成必修任务</a-radio-button>
+                  </a-radio-group>
                 </div>
-                <a-radio v-model:checked="checked" :value="2" @click="cloradio1">
-                    完成阶段
-                </a-radio> 
-                <br/>
-                <div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
-                    <a-select
-                        ref="select"
-                        size="small"
-                        placeholder="请选择阶段"
-                        v-model:value="value1"
-                        style="width: 120px"
-                        @focus="focus"
-                        @change="handleChange"
-                        >
-                        <a-select-option value="jack">第一阶段</a-select-option>
-                        <a-select-option value="lucy">第二阶段</a-select-option>
-                        <a-select-option value="Yiminghe">第三阶段</a-select-option>
-                    </a-select>
+                <a-radio v-model:checked="checked" :value="2">
+                  完成阶段
+                </a-radio>
+                <br />
+                <div
+                  style="
+                    height: 60px;
+                    margin-left: 24px;
+                    display: flex;
+                    align-items: center;
+                  "
+                >
+                  <a-select
+                    ref="select"
+                    size="small"
+                    placeholder="请选择阶段"
+                    v-model:value="value1"
+                    style="width: 120px"
+                    @focus="focus"
+                    @change="selectStage"
+                  >
+                    <a-select-option value="jack">第一阶段</a-select-option>
+                    <a-select-option value="lucy">第二阶段</a-select-option>
+                    <a-select-option value="Yiminghe">第三阶段</a-select-option>
+                  </a-select>
                 </div>
-                <a-radio v-model:checked="checked" :value="3" @click="cloradio1">
-                    完成任务
-                </a-radio> 
-                <br/>
-                <div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
-                    <a-select
-                        ref="select"
-                        size="small"
-                        placeholder="请选择任务"
-                        v-model:value="value1"
-                        style="width: 120px"
-                        @focus="focus"
-                        @change="handleChange"
-                        >
-                        <a-select-option value="jack">任务一</a-select-option>
-                        <a-select-option value="lucy">任务二</a-select-option>
-                        <a-select-option value="Yiminghe">任务三</a-select-option>
-                    </a-select>
+                <a-radio v-model:checked="checked" :value="3">
+                  完成任务
+                </a-radio>
+                <br />
+                <div
+                  style="
+                    height: 60px;
+                    margin-left: 24px;
+                    display: flex;
+                    align-items: center;
+                  "
+                >
+                  <a-select
+                    ref="select"
+                    size="small"
+                    placeholder="请选择任务"
+                    v-model:value="value1"
+                    style="width: 120px"
+                    @focus="focus"
+                    @change="selectTask"
+                  >
+                    <a-select-option value="jack">任务一</a-select-option>
+                    <a-select-option value="lucy">任务二</a-select-option>
+                    <a-select-option value="Yiminghe">任务三</a-select-option>
+                  </a-select>
                 </div>
-                <a-radio v-model:checked="checked" :value="4" @click="cloradio1">
-                    考试合格
-                </a-radio> 
-                <br/>
-                <div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
-                    <a-select
-                        ref="select"
-                        size="small"
-                        placeholder="请选择考试"
-                        v-model:value="value1"
-                        style="width: 120px"
-                        @focus="focus"
-                        @change="handleChange"
-                        >
-                        <a-select-option value="jack">考试一</a-select-option>
-                        <a-select-option value="lucy">考试二</a-select-option>
-                        <a-select-option value="Yiminghe">考试三</a-select-option>
-                    </a-select>
+                <a-radio v-model:checked="checked" :value="4">
+                  考试合格
+                </a-radio>
+                <br />
+                <div
+                  style="
+                    height: 60px;
+                    margin-left: 24px;
+                    display: flex;
+                    align-items: center;
+                  "
+                >
+                  <a-select
+                    ref="select"
+                    size="small"
+                    placeholder="请选择考试"
+                    v-model:value="value1"
+                    style="width: 120px"
+                    @focus="focus"
+                    @change="selectExam"
+                  >
+                    <a-select-option value="jack">考试一</a-select-option>
+                    <a-select-option value="lucy">考试二</a-select-option>
+                    <a-select-option value="Yiminghe">考试三</a-select-option>
+                  </a-select>
                 </div>
-                <a-radio v-model:checked="checked" :value="5" @click="cloradio1">
-                    获得积分
-                </a-radio> 
-                <br/>
-                <div style="height:60px;margin-left: 24px;display: flex;align-items: center;">
-                    <a-button style="border:0px solid red;box-shadow: none;">高于</a-button>  
-                    <a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" /> 
-                    <a-button style="border:0px solid red;box-shadow: none;">分可获得，当前项目积分为 10 分</a-button>  
+                <a-radio v-model:checked="checked" :value="5">
+                  获得积分
+                </a-radio>
+                <br />
+                <div
+                  style="
+                    height: 60px;
+                    margin-left: 24px;
+                    display: flex;
+                    align-items: center;
+                  "
+                >
+                  <a-button style="border: 0px solid red; box-shadow: none"
+                    >高于</a-button
+                  >
+                  <a-input-number
+                    id="inputNumber"
+                    v-model:value="value"
+                    :min="1"
+                    :max="100"
+                    style="width: 70px"
+                  />
+                  <a-button style="border: 0px solid red; box-shadow: none"
+                    >分可获得，当前项目积分为 10 分</a-button
+                  >
                 </div>
-                <a-radio v-model:checked="checked" :value="6" @click="cloradio1">
+                <!-- <a-radio v-model:checked="checked" :value="6" >
                     完成作业
                 </a-radio> 
                 <br/>
@@ -159,7 +266,7 @@
                     <a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" /> 
                     <a-button style="border:0px solid red;box-shadow: none;">分可获得证书</a-button>  
                 </div>
-                <a-radio v-model:checked="checked" :value="7" @click="cloradio1">
+                <a-radio v-model:checked="checked" :value="7" >
                     优秀小组长
                 </a-radio>
                 <br/>
@@ -168,54 +275,43 @@
                     <a-input-number id="inputNumber" v-model:value="value" :min="1" :max="100" style="width:70px;" /> 
                     <a-button style="border:0px solid red;box-shadow: none;">分小组长可获得证书</a-button>  
                 </div>
-                <a-radio v-model:checked="checked" :value="8" @click="cloradio1">
+                <a-radio v-model:checked="checked" :value="8" >
                     考勤按时签到可获得证书
-                </a-radio>  
-                <br/>
-                <div style="height:40px;"></div>
+                </a-radio>   -->
+                <br />
+                <div style="height: 40px"></div>
               </a-radio-group>
             </div>
           </div>
 
-          <div class="main_item" style="height: 40px">
+          <!-- <div class="main_item" style="height: 40px">
             <div class="signbox">
               <span style="margin-right: 3px"></span>
             </div>
             <div class="btnbox"></div>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer1">取消</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="updateActivityInfo">确定</button>
       </div>
     </div>
   </a-drawer>
   <!-- 创建证书抽屉 -->
-  <CreateCertificate 
-      v-model:CCertificate="CCertificate"
-    />
+  <CreateCertificate v-model:CCertificate="CCertificate" />
 </template>
 <script>
 import { reactive, toRefs } from "vue";
-import * as api from "../../../api/indexActivity";
-import * as apiTask from "../../../api/indexTaskadd";
-import { RouterEditTask } from "@/api/indexTask";
+import CreateCertificate from "../../../components/drawers/project/CreateCertificate";
 import { message } from "ant-design-vue";
-import dayjs from "dayjs";
-import CreateCertificate from "../../../components/drawers/project/CreateCertificate"; 
-
 export default {
-  name: "AddActive",
+  name: "AddCertificate",
   components: {
-    CreateCertificate
+    CreateCertificate,
   },
   props: {
-    ACertificate: {
-      type: Boolean,
-      default: false,
-    },
-    EditActiveId: {
+    projectId: {
       type: Number,
       default: null,
     },
@@ -224,311 +320,68 @@ export default {
       type: Boolean,
       default: null,
     },
-    projectId: {
-      type: Number,
-      default: null,
-    },
-    chooseStageId: {
-      type: Number,
-      default: null,
-    },
-    routerTaskId: {
-      type: Number,
-      default: 0,
-    },
-    isLevel: {
-      // 是否是关卡页面触发
-      type: Number,
-      default: null,
-    },
-    EditWorkId: {
-      // 要编辑的workId
-      type: Number,
-      default: null,
-    },
-    projectTaskId: {
-      // 要编辑的projectId
-      type: Number,
-      default: null,
-    },
-    routerId: {
-      type: Number,
-      default: null,
-    },
-    isactive: {
-      type: Number,
-      default: null,
-    },
-    projectTemplateId: {
-      type: Number,
-      default: null,
+    ACertificate: {
+      type: Boolean,
+      default: false,
     },
   },
   setup(props, ctx) {
     const state = reactive({
-      inputV1: "",
-      inputV2: "",
-      inputV3: "",
-      inputV4: "",
-      inputV5: "",
-      inputV6: "",
-      textV1: "",
-      textV2: "",
-      radioV1: "",
-      time: "",
-      isClick: false,
+      certificateName: "", //证书名称
+      imageUrl: null, //证书封面
+      imageName: null,
+      certificateRemark: "", //证书说明
+      condition: "", //选择条件
+
       CCertificate: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:ACertificate", false);
       ctx.emit("update:edit", false);
-      state.radioV1 = "";
-      state.inputV1 = "";
-      state.inputV2 = "";
-      state.inputV3 = "";
-      state.inputV4 = "";
-      state.inputV5 = "";
-      state.inputV6 = "";
-      state.textV1 = "";
-      state.textV2 = "";
-      state.time = "";
-
-      localStorage.setItem("stageId", props.chooseStageId);
-      localStorage.setItem("chapterId", props.isactive);
-    };
-    const closeDrawer1 = () => {
-      ctx.emit("update:ACertificate", false);
-      ctx.emit("update:edit", false);
-      state.radioV1 = "";
-      state.inputV1 = "";
-      state.inputV2 = "";
-      state.inputV3 = "";
-      state.inputV4 = "";
-      state.inputV5 = "";
-      state.inputV6 = "";
-      state.textV1 = "";
-      state.textV2 = "";
-      state.time = "";
-      localStorage.setItem("stageId", props.chooseStageId);
-      localStorage.setItem("chapterId", props.isactive);
-    };
-    const queryActive = () => {
-      api
-        .getActivity(props.EditActiveId)
-        .then((res) => {
-          console.log("获取活动信息", res);
-          //获取活动信息
-          state.inputV1 = res.data.data.activityName;
-          state.textV1 = res.data.data.activityNotice;
-          state.textV2 = res.data.data.activityExplain;
-          state.inputV2 = res.data.data.activityDuration;
-          state.inputV3 = res.data.data.activityAddress;
-          state.inputV5 = res.data.data.afterSignIn;
-          state.inputV6 = res.data.data.signOutTime;
-          state.inputV4 = res.data.data.beforeSignIn;
-          state.radioV1 = Number(res.data.data.standardSettings);
-
-          state.time = [
-            dayjs(res.data.data.activityStartTime, "YYYY-MM-DD HH:mm"),
-            dayjs(res.data.data.activityEndTime, "YYYY-MM-DD HH:mm"),
-          ];
-        })
-        .catch(() => {});
+      state.certificateName = "";
+      state.certificateRemark = "";
+      state.imageUrl = "";
+      state.imageName = null;
+      state.condition = "";
+      state.CCertificate = false;
     };
     const afterVisibleChange = (bool) => {
       if (bool && props.edit) {
-        queryActive();
+        console.log("是编辑");
       }
     };
-    const cloradio1 = (value) => {
-      if (value != "") {
-        state.radioV1 = "";
-      }
-    };
-    const updateTask = async (res) => {
-      if (props.isLevel == 1) {
-        if (!props.isactive) {
-          message.destroy();
-          return message.warning("请先选中关卡");
-        }
-        await RouterEditTask({
-          chapterId: props.isactive,
-          courseId: res.data.data.activityId,
-          duration: res.data.data.activityDuration,
-          name: res.data.data.activityName,
-          routerId: props.routerId,
-          routerTaskId: props.routerTaskId || 0,
-          type: 9,
-        })
-          .then(() => {
-            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-          })
-          .catch(() => {
-            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-          });
-      } else if (props.isLevel == 2) {
-        await apiTask
-          .addTask({
-            courseId: res.data.data.activityId,
-            duration: res.data.data.activityDuration,
-            name: res.data.data.activityName,
-            projectId: props.projectId,
-            projectTaskId: props.projectTaskId || 0,
-            stageId: props.chooseStageId || 0,
-            type: 9,
-          })
-          .then(() => {
-            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-          })
-          .catch(() => {
-            //////message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-          });
-      } else if (props.isLevel == 3) {
-        await apiTask
-          .addTempTask({
-            courseId: res.data.data.activityId,
-            duration: res.data.data.activityDuration,
-            name: res.data.data.activityName,
-            projectTemplateId: props.projectTemplateId,
-            projectTaskId: props.projectTaskId || 0,
-            stageId: props.chooseStageId || 0,
-            type: 9,
-          })
-          .then(() => {
-            ctx.emit("changeData", false);
-            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-          })
-          .catch(() => {
-            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-          });
-      }
-    };
-    //创建活动
-    const updateActivityInfo = () => {
-      let c = 1111;
-      if(c>0){
-        closeDrawer();
-        return
-      }
-      if (!state.inputV1) {
-        message.destroy();
-        return message.warning("请输入活动名称");
-      }
-      if (!state.textV1) {
-        message.destroy();
-        return message.warning("请输入活动公告");
-      }
-      if (!state.time) {
-        message.destroy();
-        return message.warning("请输入活动时间");
-      }
-      if (!state.inputV2) {
-        message.destroy();
-        return message.warning("请输入活动时长");
-      }
-      if (!state.inputV3) {
-        message.destroy();
-        return message.warning("请输入活动地址");
-      }
-
-      if (state.isClick) {
-        message.destroy();
-        message.error("请勿频繁点击");
-        return;
-      }
-      state.isClick = true;
-
-      let obj = {
-        activityAddress: state.inputV3, //活动地址
-        activityDuration: state.inputV2, //活动时长
-        activityExplain: state.textV2, //活动说明
-        activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm"), //活动结束时间
-        activityId: props.edit ? props.EditActiveId : 0, //活动ID
-        activityName: state.inputV1, //活动名称
-        activityNotice: state.textV1, //活动公告
-        activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm"), //活动开始时间
-        activityTag: "", //活动逻辑删除标识
-        afterSignIn: state.inputV5 ? state.inputV5 : 0, //活动开始后多少分钟签到
-        beforeSignIn: state.inputV4 ? state.inputV4 : 0, //活动开始前多少分钟签到
-        signOutTime: state.inputV6, //签退开始时间
-        standardSettings: state.radioV1, //标准设置
-      };
-      console.log("obj", obj);
-      if (props.edit) {
-        //更新编辑活动信息
-        api
-          .updateActivity(obj)
-          .then(async (res) => {
-            closeDrawer();
-            await updateTask(res);
-            ctx.emit("changeData", false);
-            message.destroy();
-            message.success("更新成功");
-            state.isClick = false;
-          })
-          .catch(() => {
-            message.destroy();
-            message.error("更新失败");
-            state.isClick = false;
-          });
-      } else {
-        //新建活动信息
-        api
-          .createActivity(obj)
-          .then(async (res) => {
-            message.destroy();
-            message.success("创建成功");
-            closeDrawer();
-            await updateTask(res);
-            ctx.emit("changeData", false);
-            state.isClick = false;
-          })
-          .catch(() => {
-            message.destroy();
-            message.error("创建失败");
-            state.isClick = false;
-          });
-      }
-    };
-
-    const range = (start, end) => {
-      const result = [];
-
-      for (let i = start; i < end; i++) {
-        result.push(i);
-      }
-
-      return result;
-    };
-    const disabledDate = (current) => {
-      // Can not select days before today and today
-      console.log("1111", dayjs().endOf("day"));
-      return current && current < dayjs().startOf("day");
-    };
-
-    const disabledDateTime = () => {
-      return {
-        disabledHours: () => range(0, 24).splice(4, 20),
-        disabledMinutes: () => range(30, 60),
-        disabledSeconds: () => [55, 56],
-      };
+    //选择的获得条件
+    const selectCondition = (e) => {
+      console.log("e.target.value;", e.target.value);
     };
 
     // 创建证书
     function CreateCertificate() {
-        state.CCertificate = true;
+      state.CCertificate = true;
     }
+    //上传封面
+    const handleChange = (info) => {
+      console.log("info", info);
+      if (info.file.status === "uploading") {
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log("上传图片返回的信息 %o", info.file.name);
+        state.imageUrl = process.env.VUE_APP_FILE_PATH + info.file.name;
+        state.imageName = info.file.name;
+      }
+      if (info.file.status === "error") {
+        message.error("upload error");
+      }
+    };
 
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      closeDrawer1,
-      cloradio1,
-      updateActivityInfo,
-      disabledDateTime,
-      disabledDate,
-      CreateCertificate
+      selectCondition,
+      handleChange,
+      CreateCertificate,
     };
   },
 };
@@ -584,7 +437,7 @@ export default {
       }
 
       .main_left {
-        margin-top: 32px;
+        // margin-top: 32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/project/CreateCertificate.vue b/src/components/drawers/project/CreateCertificate.vue
index beda905d..7ff031c4 100644
--- a/src/components/drawers/project/CreateCertificate.vue
+++ b/src/components/drawers/project/CreateCertificate.vue
@@ -2,7 +2,7 @@
   <a-drawer
     :visible="CCertificate"
     class="drawerStyle CreateCertificate"
-    width="35%"
+    width="800px"
     placement="right"
     @after-visible-change="afterVisibleChange"
   >
@@ -40,14 +40,15 @@
               <div class="btnbox">
                 <a-input
                   v-model:value="inputV1"
-                  style="width: 400px; height: 40px; border-radius: 8px;"
+                  style="width: 400px; height: 40px; border-radius: 8px"
                   placeholder="请输入证书名称"
-                  show-count :maxlength="20"
+                  show-count
+                  :maxlength="20"
                 />
               </div>
             </div>
-            
-            <div class="main_item" style="align-items:flex-start;">
+
+            <div class="main_item" style="align-items: flex-start">
               <div class="signbox">
                 <div class="sign">
                   <img
@@ -57,26 +58,31 @@
                 </div>
                 <span style="margin-right: 3px">证书封面：</span>
               </div>
-              <div class="btnbox" style="flex-direction:column;align-items:flex-start;">
+              <div
+                class="btnbox"
+                style="flex-direction: column; align-items: flex-start"
+              >
                 <a-upload
-                    v-model:file-list="fileList"
-                    name="avatar"
-                    style="width:200px;"
-                    list-type="picture-card"
-                    class="avatar-uploader"
-                    :show-upload-list="false"
-                    action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-                    :before-upload="beforeUpload"
-                    @change="handleChange"
+                  v-model:file-list="fileList"
+                  name="avatar"
+                  style="width: 200px"
+                  list-type="picture-card"
+                  class="avatar-uploader"
+                  :show-upload-list="false"
+                  action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+                  :before-upload="beforeUpload"
+                  @change="handleChange"
                 >
-                    <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
-                    <div v-else>
+                  <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
+                  <div v-else>
                     <loading-outlined v-if="loading"></loading-outlined>
                     <plus-outlined v-else></plus-outlined>
                     <div class="ant-upload-text">+</div>
-                    </div>
+                  </div>
                 </a-upload>
-                <div style="font-size:14px;color:#666;">建议尺寸：750*348 格式支持jpg、gif、png、jpeg、svg、bmp</div>
+                <div style="font-size: 14px; color: #666">
+                  建议尺寸：750*348 格式支持jpg、gif、png、jpeg、svg、bmp
+                </div>
               </div>
             </div>
 
@@ -84,13 +90,14 @@
               <div class="signbox">
                 <span style="margin-right: 3px">证书说明：</span>
               </div>
-              <div class="textarea" style="width:400px;">
+              <div class="textarea" style="width: 400px">
                 <a-textarea
                   v-model:value="textV1"
                   placeholder="请输入证书说明"
                   allow-clear
                   :rows="6"
-                  show-count :maxlength="200"
+                  show-count
+                  :maxlength="200"
                 />
               </div>
             </div>
@@ -158,7 +165,7 @@ export default {
       type: Number,
       default: null,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     },
@@ -169,7 +176,7 @@ export default {
       inputV2: "",
       textV1: "",
       title: null,
-      isClick: false
+      isClick: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:CCertificate", false);
@@ -197,7 +204,7 @@ export default {
     };
     const updateTask = async (res) => {
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
@@ -216,7 +223,7 @@ export default {
             state.addLoading = false;
           })
           .catch(() => {
-          //  message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            //  message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         apiTask
@@ -229,7 +236,7 @@ export default {
             type: 7,
           })
           .then(() => {
-          //  message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
+            //  message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
           })
@@ -237,11 +244,10 @@ export default {
             //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
-      
         addTempTask({
           courseId: res.data.data.linkId,
           name: res.data.data.linkName,
-          projectTemplateId:props.projectTemplateId,
+          projectTemplateId: props.projectTemplateId,
           projectTaskId: props.projectTaskId || 0,
           stageId: props.chooseStageId || 0,
           type: 7,
@@ -259,9 +265,9 @@ export default {
     //创建外链
     const updateRef = () => {
       let c = 1111;
-      if(c>0){
+      if (c > 0) {
         closeDrawer();
-        return
+        return;
       }
       if (!state.inputV1) return message.warning("请输入外链名称");
       if (!state.inputV2) {
@@ -274,11 +280,11 @@ export default {
         }
       }
 
-      if(state.isClick){
-          message.destroy();
-          message.error('请勿频繁点击')
-          return
-        }
+      if (state.isClick) {
+        message.destroy();
+        message.error("请勿频繁点击");
+        return;
+      }
       state.isClick = true;
 
       let obj = {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 625a8390..e9dc1538 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -423,7 +423,7 @@
                 批量面授报名
               </button> -->
               <router-link
-                  v-if="checkPer(permissions)"
+                v-if="checkPer(permissions)"
                 :to="{ path: `/taskadd`, query: { projectId: projectId } }"
               >
                 <button class="edit">
@@ -840,7 +840,10 @@
           <div class="split"></div>
           <a-tabs v-model:activeKey="activeKeyNotice">
             <a-tab-pane key="11" tab="公告">
-              <NoticePub :permissions="permissions" v-model:projectId="projectId"></NoticePub>
+              <NoticePub
+                :permissions="permissions"
+                v-model:projectId="projectId"
+              ></NoticePub>
             </a-tab-pane>
             <a-tab-pane key="12" tab="历史公告" force-render>
               <NoticeHis
@@ -851,7 +854,10 @@
           </a-tabs>
         </a-tab-pane>
         <a-tab-pane key="5" tab="项目积分">
-          <ProjectScore :permissions="permissions" :projectId="projectId"></ProjectScore>
+          <ProjectScore
+            :permissions="permissions"
+            :projectId="projectId"
+          ></ProjectScore>
         </a-tab-pane>
         <a-tab-pane key="6" tab="排行榜">
           <div class="split"></div>
@@ -1098,7 +1104,11 @@
                 <div class="img"></div>
                 <div class="ed">编辑</div>
               </div> -->
-                  <div class="edit" v-if="status != 3 && checkPer(permissions)" @click="toEdit">
+                  <div
+                    class="edit"
+                    v-if="status != 3 && checkPer(permissions)"
+                    @click="toEdit"
+                  >
                     <div class="img"></div>
                     <div class="ed">编辑</div>
                   </div>
@@ -1431,7 +1441,10 @@
     />
 
     <!-- 添加证书抽屉 -->
-    <AddCertificate v-model:ACertificate="ACertificate" />
+    <AddCertificate
+      v-model:ACertificate="ACertificate"
+      v-model:projectId="projectId"
+    />
 
     <!-- 创建证书抽屉 -->
     <CreateCertificate v-model:CCertificate="CCertificate" />
@@ -2108,7 +2121,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 import TableStudent from "@/components/student/TableStudent";
 import { getStuPage } from "@/api/index1";
 import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
-import {checkPer} from "@/utils/utils";
+import { checkPer } from "@/utils/utils";
 
 export default {
   name: "taskPage",
@@ -2147,7 +2160,7 @@ export default {
     const store = useStore();
     const route = useRoute();
     const state = reactive({
-      permissions:'',
+      permissions: "",
       screenHeight: document.body.clientHeight,
       screenWidth: document.body.clientWidth,
       editRecord: {},
@@ -4544,6 +4557,7 @@ export default {
       /* 证书 */
     }
     function addCertificate() {
+      console.log("点击添加证书");
       state.ACertificate = true;
     }