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

2025-12-09 19:06:45 +08:00 · 2023-02-04 01:50:07 +08:00
parent 5eae2714a8 9d59f4c728
commit 0f21f9f13b
18 changed files with 445 additions and 559 deletions
--- 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/loading

 # 课程二维码
-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
--- 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
--- 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
--- 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
--- a/.env.test
+++ b/.env.test
@@ -1,2 +1,2 @@
 NODE_ENV=test
-VUE_APP_BOE_API_URL=https://u-pre.boe.com
+VUE_APP_BOE_API_URL=//u-pre.boe.com
--- 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
 */
@@ -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);
 //项目基础信息-----------------------------------
@@ -190,4 +191,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)
+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)
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -277,12 +277,12 @@ 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"
+const codeUrl = window.location.protocol +  "//u-pre.boe.com"
 export {
    throttle,
    toDate,
--- 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: {
--- a/src/assets/images/taskpage/nocertificate.png
+++ b/src/assets/images/taskpage/nocertificate.png
--- a/src/assets/images/taskpage/nocertificate2.png
+++ b/src/assets/images/taskpage/nocertificate2.png
--- 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">
--- 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: {
--- 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;
--- 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 = {
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4719,7 +4719,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
--- 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>
@@ -971,7 +977,7 @@
          <div class="split"></div>
          <!-- 没有证书显示的页面 -->
          <div
-            v-if="3 > 7"
+            v-if="3> 7"
            style="
              display: flex;
              justify-content: center;
@@ -980,12 +986,14 @@
              flex-direction: column;
            "
          >
-            <img
-              src="@/assets/images/nodata.png"
-              style="width: 212px; height: 212px"
-              alt=""
-            />
-            <button class="xkbtn11" @click="addCertificate">添加证书</button>
+            <div class="certificate" @click="addCertificate">
+              <img
+                style="width: 68px; height: 79px"
+                src="../../assets/images/taskpage/nocertificate2.png"
+              />
+              <div style="font-size: 20px;color: #409EFF;margin-top:16px">无证书</div>
+              <div style="font-size: 14px;color: #878B92;">请点击新建证书</div>
+            </div>
          </div>
          <!-- 有证书显示的页面 -->
          <div v-else style="padding: 36px; display: flex; min-height: 400px">
@@ -1098,7 +1106,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 +1443,10 @@
    />

    <!-- 添加证书抽屉 -->
-    <AddCertificate v-model:ACertificate="ACertificate" />
+    <AddCertificate
+      v-model:ACertificate="ACertificate"
+      v-model:projectId="projectId"
+    />

    <!-- 创建证书抽屉 -->
    <CreateCertificate v-model:CCertificate="CCertificate" />
@@ -2108,7 +2123,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 +2162,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 +4559,7 @@ export default {
      /* 证书 */
    }
    function addCertificate() {
+      console.log("点击添加证书");
      state.ACertificate = true;
    }

@@ -7520,6 +7536,16 @@ export default {
      }
    }
  }
+  .certificate {
+    width: 412px;
+    height: 212px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background-image: url(../../assets/images/taskpage/nocertificate.png);
+    background-size: 100% 100%;
+  }
 }

 .DelModal {
--- 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>
--- 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: 'http:' + process.env.VUE_APP_PROXY_URL,
                changeOrigin: true, //表示是否改变原域名
                pathRewrite: {
                    "^/manageApi": "",
                },
            }, "/userbasic": {
-                target: process.env.VUE_APP_BOE_API_URL,
+                target: 'https:' + process.env.VUE_APP_BOE_API_URL,
                changeOrigin: true, //表示是否改变原域名
            },
        },