Merge branch 'develop' into manage-release

# Conflicts:
#	src/api/request.js

src/App.vue

@@ -2,61 +2,55 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 17:28:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-11 20:19:39
+ * @LastEditTime: 2022-12-13 22:10:22
  * @FilePath: /fe-stu/src/App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
   <div id="container">
-<!--    <div id="nav">-->
+    <!-- <div id="nav">
-<!--      <router-link-->
+      <router-link
-<!--        v-for="item in routes"-->
+        v-for="item in routes"
-<!--        :key="item.path"-->
+        :key="item.path"
-<!--        :to="item.path"-->
+        :to="item.path"
-<!--        :class="{-->
+        :class="{
-<!--          link: true,-->
+          link: true,
-<!--          active: name === item.name,-->
+          active: name === item.name,
-<!--        }"-->
+        }"
-<!--      >-->
+      >
-<!--        {{ item.name }}-->
+        {{ item.name }}
-<!--      </router-link>-->
+      </router-link>
-<!--    </div>-->
+    </div> -->
     <main>
-      <router-view />
+      <router-view/>
     </main>
   </div>
 </template>
-<script>
+<script setup>
-import { computed, defineComponent } from "vue";
-import { useRouter, useRoute } from "vue-router";
-export default defineComponent({
-  setup() {
-    const router = useRouter();
-    const route = useRoute();
-    console.log("router", router.getRoutes(), route);
-    const routes = computed(() => {
-      return router.getRoutes().filter((e) => e.meta?.isLink);
-    });
 
-    const currentRouteName = computed(() => route.name);
+  import {boeRequest} from "@/api/request";
+  import {GET_USER_INFO} from "@/api/ThirdApi";
+  import { useStore } from "vuex";
+  import {onMounted} from "vue";
+
+  const store = useStore();
+
+  onMounted(()=>{
+    getUserInfo()
+  })
+  function getUserInfo(){
+    boeRequest(GET_USER_INFO).then(res=>{
+      store.commit("SET_USER", res.result);
+    })
+  }
 
-    localStorage.setItem(
-      "token",
-      "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzA3NjExNzIsImV4cCI6MTY3MDc2ODM3MiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.9e8c4d3933c3a6d9b660e0b849940c813e1c245b3d17646ff7a793100640bc42"
-    );
-    return {
-      routes,
-      name: currentRouteName,
-    };
-  },
-});
 </script>
 <style lang="scss">
 #app {
   // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
   // sans-serif;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-    Microsoft YaHei, Arial, sans-serif;
+  Microsoft YaHei, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;
@@ -67,8 +61,8 @@ export default defineComponent({
   display: flex;
   width: 100%;
   min-height: 100%;
-  // background-color: rgba(242, 245, 247, 1);
+  background-color: rgba(242, 245, 247, 1);
-  background-color: #ccc;
+  // background-color: #ccc;
   #nav {
     width: 220px;
     height: 100%;
@@ -98,10 +92,11 @@ export default defineComponent({
       }
     }
   }
+
   main {
     flex: 1;
     width: 100%;
-    padding: 30px;
+    // padding: 30px;
     box-sizing: border-box;
   }
 }

src/api/ThirdApi.js

@@ -0,0 +1,5 @@
+export const BASE = 'https://u-pre.boe.com'
+export const GET_USER_LIST = `/userbasic/user/list post`
+export const GET_USER_INFO = `/userbasic/user/info post`
+
+

src/api/api.js

@@ -6,7 +6,8 @@
  * @FilePath: /fe-stu/src/api/api.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-export const BASE = 'http://111.231.196.214:30001/manageApi'
+export const BASE = import.meta.env.DEV ? '' : '/manageApi'
+export const BASE_URL = import.meta.env.DEV ? '' : 'https://u-pre.boe.com/fe-student'
 export const LOGIN = '/admin/CheckUser/userLogin post'
 // export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload'
 export const FILE_UPLOAD = '/file/upload'
@@ -47,7 +48,8 @@ export const COMMENT_ADD = '/comment post'
 export const COMMENT_PRAISE = '/comment/praise post'
 export const COMMENT_COLLECTION = '/comment/collection post'
 
-export const ASSESSMENT_QUERY = assessmentId => `/assessmentSubmit/queryAssessmentSubmitDetailById?assessmentSubmitId=${assessmentId} post`
+export const ASSESSMENT_SUBMIT_QUERY = assessmentId => `/assessmentSubmit/queryAssessmentSubmitDetailById?assessmentSubmitId=${assessmentId} post`
+export const ASSESSMENT_QUERY = assessmentId => `/assessment/queryAssessmentDetailById?assessmentId=${assessmentId} post`
 export const ASSESSMENT_SUBMIT = '/assessmentSubmit/submitAssessmentDetail'
 
 export const ACTIVITY = '/activity'

src/api/utils.js

@@ -1,3 +1,9 @@
+import {watch, ref} from "vue";
+import {boeRequest} from "@/api/request";
+import {BASE, GET_USER_LIST} from "@/api/ThirdApi";
+
+const BASE_AVATAR = import.meta.env.DEV ? `${BASE}/upload` : ''
+
 export function useImage(src) {
     return new URL(`../assets/image/${src}`, import.meta.url).href
 }
@@ -11,3 +17,14 @@ export function setCookie(name, value, perpetual) {
 export function getCookie(name) {
     return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || ''
 }
+
+export function useUserInfo(id) {
+    const userInfo = ref({})
+    watch(id, () => {
+        id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => {
+            userInfo.value = res.result.userInfoList[0]
+            userInfo.value.avatar = BASE_AVATAR + userInfo.value.avatar
+        })
+    })
+    return userInfo
+}

src/store/index.js

@@ -1,14 +1,15 @@
-import { createStore } from 'vuex'
+import {createStore} from 'vuex'
 
 export default createStore({
-  state: {
+    state: {
-  },
+        userInfo: {}
-  getters: {
+    },
-  },
+    getters: {},
-  mutations: {
+    mutations: {
-  },
+        SET_USER(state, userInfo) {
-  actions: {
+            state.userInfo = userInfo
-  },
+        },
-  modules: {
+    },
-  }
+    actions: {},
+    modules: {}
 })

src/views/ballot/BallotPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="moreactive">
+  <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>混合制项目</div>
@@ -122,8 +122,7 @@
           <div class="right">
             <div class="righttitle">
               <img
-                width="20px"
+                style="width: 20px; height: 20px"
-                height="20px"
                 src="../../assets/image/yuan.png"
               />
               <div class="text">投票时间</div>
@@ -154,8 +153,7 @@
             </div>
             <div class="righttitle">
               <img
-                width="20px"
+                style="width: 20px; height: 20px"
-                height="20px"
                 src="../../assets/image/yuan.png"
               />
 

src/views/discuss/DiscussPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
       style="display: flex; align-items: center; justify-content: space-between"

src/views/discussdetail/DiscussDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetailpage">
+  <div class="surveydetailpage" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
       style="display: flex; align-items: center; justify-content: space-between"
@@ -39,7 +39,7 @@
         <div class="title">
           {{ disDetail.projectName }}
         </div>
-<!--        <button class="btn">回复</button>-->
+        <!--        <button class="btn">回复</button>-->
       </div>
 
       <div class="line clearfix">

src/views/examination/ExamPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
       style="display: flex; align-items: center; justify-content: space-between"

src/views/faceteach/FaceTeach.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="faceteach">
+  <div class="faceteach" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>课程列表</div>
@@ -29,7 +29,9 @@
           <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div>
       </div>
-      <div class="btn" v-if="data.planDto?.evalFlag">评估</div>
+      <div class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag">
+        评估
+      </div>
     </div>
     <!-- 基本信息 -->
 
@@ -90,11 +92,7 @@
                     <div class="tag3" style="margin-left: 11px">作业</div>
                   </div>
                 </div>
-                <div
+                <div class="submit" @click="toWork" v-if="data.workDto?.workId">
-                  class="submit"
-                  @click="toWork(data.workDto)"
-                  v-if="!data.workDto.workId"
-                >
                   提交
                 </div>
               </div>
@@ -115,9 +113,9 @@
                     <div class="tag3" style="margin-left: 11px">考试</div>
                   </div>
                 </div>
-                <div class="submit" @click="toExamItem(data.examinationDto)">
+                <!--                <div class="submit" @click="toExamItem(data.examinationDto)">-->
-                  去考试
+                <!--                  去考试-->
-                </div>
+                <!--                </div>-->
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -134,14 +132,14 @@
         </div>
         <!--        todo #面授课接口 讲师缺少img和介绍-->
         <div class="teacheritem">
-          <img class="peopleimg" :src="data.planDto?.avatar" />
+          <img class="peopleimg" :src="userAvatar" />
           <div style="margin-left: 17px; width: 190px">
             <div class="teacherName" style="margin-right: 5px">
               {{ data.planDto?.teacher }}
             </div>
             <div class="introduce">{{ data.planDto?.bandDesc }}</div>
           </div>
-          <div class="follow">+ 关注</div>
+          <!--          <div class="follow">+ 关注</div>-->
         </div>
       </div>
     </div>
@@ -150,18 +148,24 @@
 </template>
 
 <script setup>
-import { reactive, toRefs, watch } from "vue";
+import { computed, reactive, toRefs, watch } from "vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { request, useRequest } from "@/api/request";
 import { STU_OFFCOURSE_DETAIL } from "@/api/api";
 import { useRoute, useRouter } from "vue-router";
+import { useUserInfo } from "@/api/utils";
 
 const router = useRouter();
 const {
-  query: { courseId },
+  query: { courseId, type },
 } = useRoute();
 
 const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
+
+const { avatar: userAvatar } = useUserInfo(
+  computed(() => data.value?.planDto?.teacherId)
+);
+
 const state = reactive({
   activeName: "first",
   enclosure: "",
@@ -174,8 +178,22 @@ const download = (url) => {
   window.open(url);
 };
 
-function toWork(obj) {
+function toSurvery() {
-  router.push({ path: "/homeworkpage", query: { id: obj.courseId } });
+  router.push({
+    path: "/surveydetail",
+    query: { courseId: data.value.planDto.evaluateId },
+  });
+}
+
+function toWork() {
+  router.push({
+    path: "/homeworkpage",
+    query: {
+      courseId: data.value.workDto.workId,
+      id: data.value.offcourseDto.categoryId,
+      type,
+    },
+  });
 }
 
 function toExamItem(obj) {

src/views/homework/HomeworkPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="homework">
+  <div class="homework" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>混合制项目</div>
@@ -269,10 +269,10 @@ const { textarea1 } = toRefs(state);
 const router = useRouter();
 
 const {
-  query: { courseId: workId, type,id: taskId },
+  query: { courseId: workId, type, id: taskId },
 } = useRoute();
 
-const { data } = useRequest(TASK_WORK_DETAIL, { workId,taskId });
+const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, { workId });
 
 const handleClick = () => {

src/views/liveBroadcast/LiveBroadcast.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="moreactive">
+  <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>混合制项目</div>
@@ -42,18 +42,18 @@
           class="btn"
           style="background: rgb(59, 191, 252)"
           @click="showClick"
-          >观看</botton
+          >观看
-        >
+        </botton>
         <botton
           class="btn"
           style="background: rgb(57, 146, 249)"
           @click="signClick"
           v-if="!data.signFlag"
-          >签到</botton
+          >签到
-        >
+        </botton>
         <botton class="btn" @click="commitClick" v-if="!data.evalFlag"
-          >评估</botton
+          >评估
-        >
+        </botton>
       </div>
     </div>
     <!-- 基本信息 -->
@@ -128,24 +128,17 @@
             <div class="box"></div>
           </div>
           <div
-            v-for="(el, index) in teacher"
-            :key="el.id"
             class="teacheritem"
-            :style="{
+            :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
-              'border-bottom':
-                index === teacher.length - 1
-                  ? null
-                  : '1px solid rgba(56, 125, 247, 0.2)',
-            }"
           >
-            <img class="peopleimg" :src="el.peopleimg" />
+            <img class="peopleimg" :src="userAvatar" />
             <div style="margin-left: 17px; width: 190px">
               <div class="teacherName" style="margin-right: 5px">
                 {{ data.userInfoBo?.userName }}
               </div>
               <div class="introduce">{{ data.userInfoBo?.bandDesc }}</div>
             </div>
-            <div class="follow">+ 关注</div>
+            <!--            <div class="follow">+ 关注</div>-->
           </div>
         </div>
       </div>
@@ -155,22 +148,25 @@
 </template>
 
 <script setup>
-import { reactive, toRefs } from "vue";
+import { computed, reactive, toRefs } from "vue";
 import img from "@/assets/image/uploadimg.png";
 import { request, useRequest } from "@/api/request";
-import {
+import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
-  TASK_BROADCAST_DETAIL,
-  TASK_BROADCAST_SIGN,
-} from "@/api/api";
 import { useRoute } from "vue-router/dist/vue-router";
-import {useRouter} from "vue-router";
+import { useRouter } from "vue-router";
+import { useUserInfo } from "@/api/utils";
 
 const {
   query: { courseId: liveId },
 } = useRoute();
-const router = useRouter()
+const router = useRouter();
 
 const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });
+
+const { avatar: userAvatar } = useUserInfo(
+  computed(() => data.value.userInfoBo?.userId)
+);
+
 const state = reactive({
   activeName: "first",
   teacher: [
@@ -183,19 +179,21 @@ const state = reactive({
     },
   ],
 });
-const {activeName, teacher} = toRefs(state)
+const { activeName, teacher } = toRefs(state);
 const signClick = () => {
-  data.value.signFlag = 1
+  data.value.signFlag = 1;
-  request(TASK_BROADCAST_SIGN, { courseId: liveId })
+  request(TASK_BROADCAST_SIGN, { courseId: liveId });
 };
 const commitClick = () => {
-  router.push({path: '/surveydetail', query: {courseId: data.value.assessmentId}})
+  router.push({
+    path: "/surveydetail",
+    query: { courseId: data.value.assessmentId },
+  });
 };
 
 function showClick() {
-  window.open(data.value.liveLink)
+  window.open(data.value.liveLink);
 }
-
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/moreActive/MoreActive.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="moreactive">
+  <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>混合制项目</div>
@@ -128,8 +128,10 @@
 <script setup>
 import { TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
 import { request, useRequest } from "@/api/request";
-import {useRoute} from "vue-router/dist/vue-router";
+import { useRoute } from "vue-router/dist/vue-router";
-const {query: {courseId: activityId}} = useRoute()
+const {
+  query: { courseId: activityId },
+} = useRoute();
 
 const { data } = useRequest(ACTIVITY, { activityId });
 console.log("data", data);

src/views/project/ProjectDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pathdetails">
+  <div class="pathdetails" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>产品经理学习路径图</div>
@@ -14,35 +14,33 @@
         <div v-for="(i, k) in data.stageProcessList" :key="k">
           <div class="title">
             <div class="titleL">{{ i.stageName }}</div>
-            <div
+            <div class="titleR" :style="{ display: 'flex' }">
-                class="titleR"
+              <img src="../../assets/image/pathdetails/circle.png" />
-                :style="{ display: 'flex' }"
-            >
-              <img src="../../assets/image/pathdetails/circle.png"/>
               <div class="titleRT">进行中</div>
             </div>
             <div
-                class="titleR"
+              class="titleR"
-                :style="{ display: i.status === 2 ? 'flex' : 'none' }"
+              :style="{ display: i.status === 2 ? 'flex' : 'none' }"
             >
-              <img src="../../assets/image/pathdetails/circle2.png"/>
+              <img src="../../assets/image/pathdetails/circle2.png" />
               <div class="titleRT" style="color: rgba(102, 102, 102, 1)">
                 未开始
               </div>
             </div>
           </div>
           <div
-              class="course"
+            class="course"
-              v-for="(value, index) in i.taskProcessList"
+            v-for="(value, index) in i.taskProcessList"
-              :key="index"
+            :key="index"
           >
             <div>
               <div class="coursename">{{ value.name }}</div>
               <div class="coursetag">
-                <div class="tag1" style="margin-right: 11px; margin-top: 16px">必修</div>
+                <div class="tag1" style="margin-right: 11px; margin-top: 16px">
-                <div class="tag3" style="margin-right: 11px; margin-top: 16px">{{
+                  必修
-                    types.typeName[value.type] || ''
+                </div>
-                  }}
+                <div class="tag3" style="margin-right: 11px; margin-top: 16px">
+                  {{ types.typeName[value.type] || "" }}
                 </div>
 
                 <!--                                <div-->
@@ -55,45 +53,44 @@
                 <!--                                </div>-->
               </div>
               <div
-                  class="progressBox"
+                class="progressBox"
-                  :style="{ display: value.status === 1 ? 'block' : 'none' }"
+                :style="{ display: value.status === 1 ? 'block' : 'none' }"
               >
                 <div>当前进度</div>
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                        :percentage="value.currentRatio"
+                      :percentage="value.currentRatio"
-                        :show-text="false"
+                      :show-text="false"
-                        :stroke-width="8"
+                      :stroke-width="8"
-                        :color="
+                      :color="
                         {
-                          0:'rgba(238, 112, 108, 1)',
+                          0: 'rgba(238, 112, 108, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                          1: 'rgba(255, 151, 38, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                          2: 'rgba(39, 122, 255, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                          3: 'rgba(59, 94, 251, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                          4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(value.currentRatio/20)]
+                        }[parseInt(value.currentRatio / 20)]
                       "
                     />
                   </div>
                   <div
-                      style="
+                    style="
                       font-size: 14px;
                       font-weight: 500;
                       color: #277aff;
                       margin-left: 10px;
                     "
-                      :style="{
+                    :style="{
-                      color:
+                      color: {
-                        {
+                        0: 'rgba(238, 112, 108, 1)',
-                          0:'rgba(238, 112, 108, 1)',
+                        1: 'rgba(255, 151, 38, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                        2: 'rgba(39, 122, 255, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                        3: 'rgba(59, 94, 251, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                        4: 'rgba(57, 219, 183, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                        5: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                      }[parseInt(value.currentRatio / 20)],
-                        }[parseInt(value.currentRatio/20)]
                     }"
                   >
                     {{ value.currentRatio }}%
@@ -102,9 +99,7 @@
               </div>
             </div>
             <div class="goclass" @click="toFinish(value)">
-              {{
+              {{ types.toName[value.type] || "" }}
-                types.toName[value.type] || ''
-              }}
             </div>
             <!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
             <!--              <div-->
@@ -133,29 +128,29 @@
               <div class="notice">
                 请各位选课的同学提前阅读本课程的
                 “教学大纲与计划”“课程考核要求”与“学习要求”
-                ，并按给定的中学化学教学主题分好小组 <br/>
+                ，并按给定的中学化学教学主题分好小组 <br />
-                每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据；<br/>
+                每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据；<br />
                 请大家务必在规定的时间内提交作业，否则会被系统自动记录为“迟交”或“未交”则会影响线上参与的平时成
-                绩；<br/>
+                绩；<br />
               </div>
             </el-tab-pane>
             <el-tab-pane label="共享文档" name="second">
               <div style="padding: 19px 30px 17px 28px">
                 <div
-                    v-for="(value, index) in sharedoc"
+                  v-for="(value, index) in sharedoc"
-                    :key="index"
+                  :key="index"
-                    style="
+                  style="
                     display: flex;
                     align-items: center;
                     margin-bottom: 15px;
                   "
                 >
-                  <img :src="value.img" style="width: 22px; height: 26px"/>
+                  <img :src="value.img" style="width: 22px; height: 26px" />
                   <div class="sharedocname">{{ value.name }}</div>
                   <div class="download">
                     <img
-                        src="../../assets/image/download.png"
+                      src="../../assets/image/download.png"
-                        style="width: 16px; height: 15px"
+                      style="width: 16px; height: 15px"
                     />
                     <div style="margin-left: 7px">下载</div>
                   </div>
@@ -170,23 +165,25 @@
           <div class="info">
             <div class="title">
               <img
-                  style="width: 21px; height: 20px"
+                style="width: 21px; height: 20px"
-                  src="../../assets/image/pathdetails/info.png"
+                src="../../assets/image/pathdetails/info.png"
               />
               <div class="text" style="margin-left: 7px">个人信息</div>
               <div class="box"></div>
             </div>
             <!--            todo #路径详情 个人信息缺少img和介绍-->
             <div
-                class="teacheritem"
+              class="teacheritem"
-                :style="{'border-bottom': '1px solid rgba(56, 125, 247, 0.2)'}"
+              :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
             >
-              <img class="peopleimg" :src="data.userInfoBo?.peopleimg"/>
+              <img class="peopleimg" :src="data.userInfoBo?.peopleimg" />
               <div style="margin-left: 17px">
                 <div class="teacherName">
-                  <div style="margin-right: 5px">{{ data.userInfoBo?.userName }}</div>
+                  <div style="margin-right: 5px">
+                    {{ data.userInfoBo?.userName }}
+                  </div>
                   <div v-for="(item, key) in data.userInfoBo?.medal" :key="key">
-                    <img class="teacherMedal" :src="item"/>
+                    <img class="teacherMedal" :src="item" />
                   </div>
                 </div>
                 <div class="introduce">{{ data.userInfoBo?.introduce }}</div>
@@ -196,8 +193,8 @@
           <div class="info" style="padding-top: 20px">
             <div class="title">
               <img
-                  style="width: 18px; height: 17px"
+                style="width: 18px; height: 17px"
-                  src="../../assets/image/pathdetails/study.png"
+                src="../../assets/image/pathdetails/study.png"
               />
               <div class="text" style="margin-left: 9px">学习进度</div>
               <div class="box"></div>
@@ -212,36 +209,32 @@
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                        :percentage="data.totalChapterCnt"
+                      :percentage="data.totalChapterCnt"
-                        :show-text="false"
+                      :show-text="false"
-                        :stroke-width="8"
+                      :stroke-width="8"
-                        :color="
+                      :color="
-                         {
+                        {
-                          0:'rgba(238, 112, 108, 1)',
+                          0: 'rgba(238, 112, 108, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                          1: 'rgba(255, 151, 38, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                          2: 'rgba(39, 122, 255, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                          3: 'rgba(59, 94, 251, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                          4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.totalChapterCnt/20)]
+                        }[parseInt(data.totalChapterCnt / 20)]
                       "
                     />
                   </div>
                   <div
-                      style="
+                    style="font-size: 14px; font-weight: 500; margin-left: 10px"
-                      font-size: 14px;
+                    :style="{
-                      font-weight: 500;
-                      margin-left: 10px;
-                    "
-                      :style="{
                       color: {
-                          0:'rgba(238, 112, 108, 1)',
+                        0: 'rgba(238, 112, 108, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                        1: 'rgba(255, 151, 38, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                        2: 'rgba(39, 122, 255, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                        3: 'rgba(59, 94, 251, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                        4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                        5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.totalChapterCnt/20)]
+                      }[parseInt(data.totalChapterCnt / 20)],
                     }"
                   >
                     {{ data.totalChapterCnt }}%
@@ -255,38 +248,37 @@
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                        :percentage="data.currentChapterCnt"
+                      :percentage="data.currentChapterCnt"
-                        :show-text="false"
+                      :show-text="false"
-                        :stroke-width="8"
+                      :stroke-width="8"
-                        :color="
+                      :color="
                         {
-                          0:'rgba(238, 112, 108, 1)',
+                          0: 'rgba(238, 112, 108, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                          1: 'rgba(255, 151, 38, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                          2: 'rgba(39, 122, 255, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                          3: 'rgba(59, 94, 251, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                          4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.currentChapterCnt/20)]
+                        }[parseInt(data.currentChapterCnt / 20)]
                       "
                     />
                   </div>
                   <div
-                      style="
+                    style="
                       font-size: 14px;
                       font-weight: 500;
                       color: #277aff;
                       margin-left: 10px;
                     "
-                      :style="{
+                    :style="{
-                      color:
+                      color: {
-                        {
+                        0: 'rgba(238, 112, 108, 1)',
-                          0:'rgba(238, 112, 108, 1)',
+                        1: 'rgba(255, 151, 38, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                        2: 'rgba(39, 122, 255, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                        3: 'rgba(59, 94, 251, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                        4: 'rgba(57, 219, 183, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                        5: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                      }[parseInt(data.currentChapterCnt / 20)],
-                        }[parseInt(data.currentChapterCnt/20)]
                     }"
                   >
                     {{ data.currentChapterCnt }}%
@@ -304,24 +296,25 @@
 </template>
 
 <script setup>
-import {reactive, ref} from "vue";
+import { reactive, ref } from "vue";
-import word from '@/assets/image/file/word.png'
+import word from "@/assets/image/file/word.png";
-import ppt from '@/assets/image/file/ppt.png'
+import ppt from "@/assets/image/file/ppt.png";
-import pdf from '@/assets/image/file/pdf.png'
+import pdf from "@/assets/image/file/pdf.png";
-import zip from '@/assets/image/file/zip.png'
+import zip from "@/assets/image/file/zip.png";
-import md from '@/assets/image/file/md.png'
+import md from "@/assets/image/file/md.png";
-import medal1 from '@/assets/image/medal/medal1.png'
+import medal1 from "@/assets/image/medal/medal1.png";
-import medal2 from '@/assets/image/medal/medal2.png'
+import medal2 from "@/assets/image/medal/medal2.png";
-import medal3 from '@/assets/image/medal/medal3.png'
+import medal3 from "@/assets/image/medal/medal3.png";
-import img from '@/assets/image/uploadimg.png'
+import img from "@/assets/image/uploadimg.png";
-import {useRequest} from "@/api/request";
+import { useRequest } from "@/api/request";
-import {PROJECT_PROCESS, ROUTER_PROCESS} from "@/api/api";
+import { PROJECT_PROCESS, ROUTER_PROCESS } from "@/api/api";
-import {useRoute, useRouter} from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 
-
+const {
-const {query: {projectId}} = useRoute()
+  query: { projectId },
-const router = useRouter()
+} = useRoute();
-const {data} = useRequest(PROJECT_PROCESS, {projectId})
+const router = useRouter();
+const { data } = useRequest(PROJECT_PROCESS, { projectId });
 const state = reactive({
   course: [
     {
@@ -497,75 +490,73 @@ const state = reactive({
       name: "王星天（显示事业）",
       introduce: "教师是学生的镜子,学生是老师的影子。",
       peopleimg: img,
-      medal: [
+      medal: [medal1, medal2, medal3],
-        medal1,
-        medal2,
-        medal3,
-      ],
     },
   ],
 });
-const activeName = ref('first')
+const activeName = ref("first");
-const totalprogress = ref(30)
+const totalprogress = ref(30);
-const compulsoryprogress = ref(10)
+const compulsoryprogress = ref(10);
 
 const handleClick = (tab, event) => {
   console.log(tab, event);
 };
-const path = {1: 'path'}
+const path = { 1: "path" };
 
 const types = ref({
   typeName: {
-    1: '在线',
+    1: "在线",
-    2: '面授',
+    2: "面授",
-    3: '案例',
+    3: "案例",
-    4: '作业',
+    4: "作业",
-    5: '考试',
+    5: "考试",
-    6: '直播',
+    6: "直播",
-    7: '外链',
+    7: "外链",
-    8: '讨论',
+    8: "讨论",
-    9: '活动',
+    9: "活动",
-    10: '测评',
+    10: "测评",
-    11: '评估',
+    11: "评估",
-    12: '投票',
+    12: "投票",
-    13: '项目',
+    13: "项目",
   },
   toName: {
-    1: '去上课',
+    1: "去上课",
-    2: '去上课',
+    2: "去上课",
-    3: '案例',
+    3: "案例",
-    4: '去完成',
+    4: "去完成",
-    5: '去完成',
+    5: "去完成",
-    6: '去签到',
+    6: "去签到",
-    7: '外链',
+    7: "外链",
-    8: '去讨论',
+    8: "去讨论",
-    9: '去完成',
+    9: "去完成",
-    10: '去完成',
+    10: "去完成",
-    11: '去完成',
+    11: "去完成",
-    12: '去投票',
+    12: "去投票",
-    13: '去完成',
+    13: "去完成",
   },
   path: {
-    1: '去上课',
+    1: "去上课",
-    2: '/faceteach',
+    2: "/faceteach",
-    3: '案例',
+    3: "案例",
-    4: '/homeworkpage',
+    4: "/homeworkpage",
-    5: '去完成',
+    5: "去完成",
-    6: '/livebroadcast',
+    6: "/livebroadcast",
-    7: '外链',
+    7: "外链",
-    8: '/discusspage',
+    8: "/discusspage",
-    9: '/moreactive',
+    9: "/moreactive",
-    10: '/starttest',
+    10: "/starttest",
-    11: '/surveydetail',
+    11: "/surveydetail",
-    12: '/ballotpage',
+    12: "/ballotpage",
-    13: '去完成'
+    13: "去完成",
-  }
+  },
-})
+});
 
 function toFinish(d) {
-  router.push({path: types.value.path[d.type], query: {id: d.projectTaskId, type: 2, courseId: d.courseId}})
+  router.push({
+    path: types.value.path[d.type],
+    query: { id: d.projectTaskId, type: 2, courseId: d.courseId },
+  });
 }
-
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/roadmap/LearnPath.vue

@@ -4,54 +4,58 @@
       <div class="title">
         <div class="titleL">
           <div @click="returnfun" class="text">学习路径图</div>
-          <div class="info" style="margin-right: 14px">
+          <div class="info" style="margin-right: 14px" v-if="useInfo.jobName">
-            <img style="width: 20px; height: 18px; margin-right: 10px"
+            <img
-                 src="../../assets/image/pm.png"
+                style="width: 20px; height: 18px; margin-right: 10px"
+                src="../../assets/image/pm.png"
             />
-            <div style="margin-top: 1px">产品经理</div>
+            <div style="margin-top: 1px">{{ useInfo.jobName }}</div>
           </div>
-          <div class="info">
+          <div class="info" v-if="useInfo.bandDesc">
-            <img style="width: 18px; height: 17px; margin-right: 11px"
+            <img
-                 src="../../assets/image/band.png"
+                style="width: 18px; height: 17px; margin-right: 11px"
+                src="../../assets/image/band.png"
             />
-            <div style="margin-top: 2px">Band8</div>
+            <div style="margin-top: 2px">{{ useInfo.bandDesc }}</div>
           </div>
         </div>
         <div :style="{ display: !showmapdetail ? 'flex' : 'none' }">
-          <el-popover width="475px" trigger="hover" popper-class="lppopover">
+<!--          <el-popover width="475px" trigger="hover" popper-class="lppopover">-->
-            <div>
+<!--            <div>-->
-              <div class="finish">
+<!--              <div class="finish">-->
-                <img src="../../assets/image/circle.png"
+<!--                <img-->
-                     style="width: 20px; height: 20px"
+<!--                    src="../../assets/image/circle.png"-->
-                />
+<!--                    style="width: 20px; height: 20px"-->
-                <div class="text">未完成</div>
+<!--                />-->
-                <div class="box"></div>
+<!--                <div class="text">未完成</div>-->
-              </div>
+<!--                <div class="box"></div>-->
-              <div v-for="(value, index) in unCompleteTaskList"
+<!--              </div>-->
-                   :key="index"
+<!--              <div-->
-                   class="tasks"
+<!--                  v-for="(value, index) in unCompleteTaskList"-->
-                   :style="{
+<!--                  :key="index"-->
-                  'border-bottom':
+<!--                  class="tasks"-->
-                    index === unCompleteTaskList.length - 1
+<!--                  :style="{-->
-                      ? null
+<!--                  'border-bottom':-->
-                      : '1px solid rgba(229, 228, 228, 1)',
+<!--                    index === unCompleteTaskList.length - 1-->
-                }"
+<!--                      ? null-->
-              >
+<!--                      : '1px solid rgba(229, 228, 228, 1)',-->
-                <div style="font-size: 14px; font-weight: 500; color: #677d86">
+<!--                }"-->
-                  {{ value.name }}
+<!--              >-->
-                </div>
+<!--                <div style="font-size: 14px; font-weight: 500; color: #677d86">-->
-                <img
+<!--                  {{ value.name }}-->
-                    style="width: 20px; height: 20px"
+<!--                </div>-->
-                    src="../../assets/image/go.png"
+<!--                <img-->
-                    @click="toUnTask(chapterId)"
+<!--                    style="width: 20px; height: 20px"-->
-                />
+<!--                    src="../../assets/image/go.png"-->
-              </div>
+<!--                    @click="toUnTask(chapterId)"-->
-            </div>
+<!--                />-->
-            <template #reference>
+<!--              </div>-->
+<!--            </div>-->
+<!--            <template #reference>-->
               <!--              todo #学习路径 只会有一个未完成任务么?是否是直接跳到任务详情-->
-              <div class="titleR">进入未完成任务</div>
+<!--              <div class="titleR">进入未完成任务</div>-->
-            </template>
+<!--            </template>-->
-          </el-popover>
+<!--          </el-popover>-->
         </div>
         <div
             :style="{ display: showmapdetail ? 'flex' : 'none' }"
@@ -72,7 +76,10 @@
                 align="center"
                 width="255"
             >
-              <img :src="scope.row.picUrl" style="width: 230px; height: 155px"/>
+              <img
+                  :src="scope.row.picUrl"
+                  style="width: 230px; height: 155px"
+              />
             </el-table-column>
             <el-table-column align="center" prop="name" label="路径名称"/>
             <el-table-column
@@ -84,7 +91,6 @@
               <el-popover
                   placement="top-start"
                   title="路径介绍"
-                  :width="350"
                   trigger="hover"
                   :content="scope.row.remark"
               >
@@ -94,16 +100,23 @@
               </el-popover>
             </el-table-column>
 
-            <el-table-column align="center" prop="organizationName" label="归属组织"/>
+            <el-table-column
+                align="center"
+                prop="organizationName"
+                label="归属组织"
+            />
             <el-table-column
                 #default="scope"
                 align="center"
-                width="110"
+                :width="150"
                 prop="state"
                 label="状态"
             >
-              <img :src="{0:nostarted,1:completed,2:ongoing}[scope.row.status]"
+              <img
-                   style="width: 99px; height: 99px"
+                  :src="
+                  { 0: nostarted, 1: completed, 2: ongoing }[scope.row.status]
+                "
+                  style="width: 99px; height: 99px"
               />
             </el-table-column>
           </el-table>
@@ -115,8 +128,8 @@
           :style="{ display: showmapdetail ? 'flex' : 'none' }"
           class="mapdetail"
       >
-        <div v-for="(item,i) in detail?.rows">
+        <div v-for="(item, i) in detail?.rows" :key="i">
-          <img :src="useImage(`222_0${i+2}.png`)">
+          <img :src="useImage(`222_0${i + 2}.png`)"/>
         </div>
         <!--        <div class="modal"-->
         <!--             style="width: calc(100% - 168px); height: 525px;background-image: url('../../src/assets/image/mapdetail.png');background-size: 100%;background-repeat: no-repeat;">-->
@@ -127,25 +140,39 @@
   </div>
 </template>
 <script setup>
-import {reactive, toRefs, ref} from "vue";
+import {reactive, toRefs, ref, onMounted} from "vue";
-import nostarted from '../../assets/image/nostarted.png'
+import nostarted from "../../assets/image/nostarted.png";
-import completed from '../../assets/image/completed.png'
+import completed from "../../assets/image/completed.png";
-import ongoing from '../../assets/image/ongoing.png'
+import ongoing from "../../assets/image/ongoing.png";
-import {request, usePage, useRequest} from "@/api/request";
+import {boeRequest, request, usePage, useRequest} from "@/api/request";
-import {ROUTER_CHAPTER_LIST, ROUTER_LIST, ROUTER_UNCOMPLETE_LIST} from "@/api/api";
+import {
+  BASE_URL,
+  ROUTER_CHAPTER_LIST,
+  ROUTER_LIST,
+  ROUTER_UNCOMPLETE_LIST,
+} from "@/api/api";
 import {useImage} from "@/api/utils";
 import {useRouter} from "vue-router";
+import {GET_USER_INFO} from "@/api/ThirdApi";
 
-const detail = ref()
+const detail = ref();
-const {data} = usePage(ROUTER_LIST, {})
+const useInfo = ref({});
+const {data} = usePage(ROUTER_LIST, {});
 
-const router = useRouter()
+const router = useRouter();
+
+// const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {});
+
+onMounted(()=>{
+  boeRequest(GET_USER_INFO).then(res=>{
+    useInfo.value=res.result
+  })
+})
 
-const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {})
 const state = reactive({
   showmapdetail: false,
 });
-const {showmapdetail} = toRefs(state)
+const {showmapdetail} = toRefs(state);
 
 const returnfun = () => {
   state.showmapdetail = false;
@@ -156,17 +183,19 @@ async function gofun({routerId}) {
   // const data = await request(ROUTER_CHAPTER_LIST, {stuChapterListVo: {routerId}})
   // detail.value = data.data
   // state.showmapdetail = true;
-  router.push({path: '/pathdetails', query: {routerId}})
+  // router.push({path: "/pathdetails", query: {routerId}});
+  import.meta.env.DEV ? router.push({
+    path: "/pathdetails",
+    query: {routerId}
+  }) : window.parent.location.href = `http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails&params=${encodeURIComponent(`routerId=${routerId}`)}`
 }
 
 function toUnTask() {
-
 }
-
 </script>
 <style lang="scss">
-.modal {
 
+.modal {
 }
 
 .modal:after {
@@ -175,8 +204,8 @@ function toUnTask() {
 
 .learnpath {
   width: 100%;
-  min-height: 734px;
+  min-height: 800px;
-  border-radius: 8px;
+  //border-radius: 8px;
   background-color: rgba(255, 255, 255, 1);
   display: flex;
 

src/views/roadmap/PathDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pathdetails">
+  <div class="pathdetails" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
       <div>产品经理学习路径图</div>
@@ -39,7 +39,8 @@
             <div>
               <div class="coursename">{{ value.name }}</div>
               <div class="coursetag">
-                <div class="tag1" style="margin-right: 11px; margin-top: 16px">必修</div>
+                <div class="tag1" style="margin-right: 11px; margin-top: 16px" v-if="value.flag">必修</div>
+                <div class="tag2" style="margin-right: 11px; margin-top: 16px" v-if="!value.flag">选修</div>
                 <div class="tag3" style="margin-right: 11px; margin-top: 16px">{{
                     types.typeName[value.type] || ''
                   }}
@@ -182,7 +183,7 @@
                 class="teacheritem"
                 :style="{'border-bottom': '1px solid rgba(56, 125, 247, 0.2)'}"
             >
-              <img class="peopleimg" :src="data.userInfoBo?.peopleimg"/>
+              <img class="peopleimg" :src="userAvatar"/>
               <div style="margin-left: 17px">
                 <div class="teacherName">
                   <div style="margin-right: 5px">{{ data.userInfoBo?.userName }}</div>
@@ -213,7 +214,7 @@
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                        :percentage="data.totalChapterCnt"
+                        :percentage="parseInt(data.currentChapterCnt/data.totalChapterCnt * 100)"
                         :show-text="false"
                         :stroke-width="8"
                         :color="
@@ -224,7 +225,7 @@
                           3:'rgba(59, 94, 251, 1)',
                           4:'rgba(57, 219, 183, 1)',
                           5:'rgba(57, 219, 183, 1)'
-                        }[parseInt(data.totalChapterCnt/20)]
+                        }[parseInt(data.currentChapterCnt/data.totalChapterCnt)]
                       "
                     />
                   </div>
@@ -242,10 +243,10 @@
                           3:'rgba(59, 94, 251, 1)',
                           4:'rgba(57, 219, 183, 1)',
                           5:'rgba(57, 219, 183, 1)'
-                        }[parseInt(data.totalChapterCnt/20)]
+                        }[parseInt(data.currentChapterCnt/data.totalChapterCnt)]
                     }"
                   >
-                    {{ data.totalChapterCnt }}%
+                    {{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}%
                   </div>
                 </div>
               </div>
@@ -256,7 +257,7 @@
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                        :percentage="data.currentChapterCnt"
+                        :percentage="parseInt(data.currentReqCnt/data.totalReqCnt * 100)"
                         :show-text="false"
                         :stroke-width="8"
                         :color="
@@ -267,7 +268,7 @@
                           3:'rgba(59, 94, 251, 1)',
                           4:'rgba(57, 219, 183, 1)',
                           5:'rgba(57, 219, 183, 1)'
-                        }[parseInt(data.currentChapterCnt/20)]
+                        }[parseInt(data.currentReqCnt/data.totalReqCnt)]
                       "
                     />
                   </div>
@@ -287,10 +288,10 @@
                           3:'rgba(59, 94, 251, 1)',
                           4:'rgba(57, 219, 183, 1)',
                           5:'rgba(57, 219, 183, 1)'
-                        }[parseInt(data.currentChapterCnt/20)]
+                        }[parseInt(data.currentReqCnt/data.totalReqCnt)]
                     }"
                   >
-                    {{ data.currentChapterCnt }}%
+                    {{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
                   </div>
                 </div>
               </div>
@@ -305,7 +306,7 @@
 </template>
 
 <script setup>
-import {reactive, ref} from "vue";
+import {computed, reactive, ref, watch} from "vue";
 import word from '@/assets/image/file/word.png'
 import ppt from '@/assets/image/file/ppt.png'
 import pdf from '@/assets/image/file/pdf.png'
@@ -315,14 +316,17 @@ import medal1 from '@/assets/image/medal/medal1.png'
 import medal2 from '@/assets/image/medal/medal2.png'
 import medal3 from '@/assets/image/medal/medal3.png'
 import img from '@/assets/image/uploadimg.png'
-import {useRequest} from "@/api/request";
+import {boeRequest, useRequest} from "@/api/request";
-import {ROUTER_PROCESS} from "@/api/api";
+import {BASE_URL, ROUTER_PROCESS} from "@/api/api";
 import {useRoute, useRouter} from "vue-router";
-import { ElMessage } from 'element-plus'
+import {ElMessage} from 'element-plus'
+import {useUserInfo} from "@/api/utils";
 
 const {query: {routerId}} = useRoute()
 const router = useRouter()
 const {data} = useRequest(ROUTER_PROCESS, {routerId})
+const {avatar: userAvatar} = useUserInfo(computed(() => data.value?.userInfoBo?.userId))
+
 const state = reactive({
   course: [
     {

src/views/starttest/StartTest.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 标题 -->
     <div class="title">考试模式</div>
     <!-- 标题 -->

src/views/survey/SurveyDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
       style="display: flex; align-items: center; justify-content: space-between"

src/views/testscore/TestScore.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="surveydetail">
+  <div class="surveydetail" style="padding: 30px">
     <!-- 标题 -->
     <div class="title">考试模式</div>
     <!-- 标题 -->

vite.config.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 17:28:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-12 16:49:27
+ * @LastEditTime: 2022-12-13 20:49:00
  * @FilePath: /fe-stu/vite.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -13,7 +13,8 @@ import { viteMockServe } from 'vite-plugin-mock'
 import topLevelAwait from "vite-plugin-top-level-await";
 
 const path = require('path')
-const url = 'http://111.231.196.214:30001'
+// const url = 'http://localhost:30001'
+const url = 'http://111.231.196.214:12013/manageApi'
 export default defineConfig(({ command }) =>
 ({
     base: '/fe-student-release/',
@@ -34,7 +35,8 @@ export default defineConfig(({ command }) =>
         alias: [
             { find: '@', replacement: path.resolve(__dirname, 'src') }
         ]
-    }, server: {
+    },
+    server: {
         proxy: {
             '/file/upload': {
                 target: 'http://111.231.196.214:30001',
@@ -83,6 +85,12 @@ export default defineConfig(({ command }) =>
             }, '/assessment': {
                 target: url,
                 changeOrigin: true,
+            }, '/workSubmit': {
+                target: url,
+                changeOrigin: true,
+            }, '/userbasic': {
+                target: 'https://u-pre.boe.com',
+                changeOrigin: true,
             },
         }
     }