feat:增加证书上传封面等

2025-12-10 03:16:44 +08:00 · 2023-02-03 21:55:42 +08:00
parent a3ca45b775 4ab76ad76b
commit 9d59f4c728
15 changed files with 122 additions and 119 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
@@ -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);
 //项目基础信息-----------------------------------
--- 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/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
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -977,7 +977,7 @@
          <div class="split"></div>
          <!-- 没有证书显示的页面 -->
          <div
-            v-if="3 > 7"
+            v-if="3> 7"
            style="
              display: flex;
              justify-content: center;
@@ -986,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">
@@ -7534,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/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, //表示是否改变原域名
            },
        },