hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-13 04:46:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into manage-release

Browse Source
This commit is contained in:
yuping
2022-12-28 19:00:20 +08:00
parent fdd5cb64cd b96b99c4f2
commit a96a411d72
8 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@@ -14,4 +14,3 @@ VITE_BOE_PATH_DETAIL_URL=https://u-pre.boe.com/pc/forward?to=/fe-student
VITE_BOE_API_URL=https://u-pre.boe.com VITE_BOE_API_URL=https://u-pre.boe.com
VITE_TASK_WHITE_TYPE=-8-,-12-,-13- VITE_TASK_WHITE_TYPE=-8-,-12-,-13-
# VITE_TASK_WHITE_TYPE=-8-,-12-

2
.env.prod
View File

@@ -6,5 +6,3 @@ VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid= VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc/exam/test?id= VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc/exam/test?id=
VITE_BOE_API_URL=https://u.boe.com

2
src/App.vue
View File

@@ -44,7 +44,7 @@ onMounted(() => {
function getUserInfo() { function getUserInfo() {
boeRequest(GET_USER_INFO).then((res) => { boeRequest(GET_USER_INFO).then((res) => {
res.result.avatar = import.meta.env.VITE_BOE_API_URL + '/upload' + (res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png') res.result.avatar = res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'
store.commit("SET_USER", res.result); store.commit("SET_USER", res.result);
}); });
} }

2
src/api/utils.js
View File

@@ -21,7 +21,7 @@ export function useUserInfo(id) {
watch(id, () => { watch(id, () => {
id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => { id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => {
userInfo.value = res.result.userInfoList[0] userInfo.value = res.result.userInfoList[0]
userInfo.value.avatar = `${import.meta.env.VITE_BOE_API_URL}/upload${userInfo.value.avatar?userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'}` userInfo.value.avatar = userInfo.value.avatar?userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'
}) })
}) })
return userInfo return userInfo

10
src/views/faceteach/FaceTeach.vue
View File

@@ -40,12 +40,12 @@
background: isAllowSign? data.signFlag ? '#999' : 'rgb(57, 146, 249)':'#999', background: isAllowSign? data.signFlag ? '#999' : 'rgb(57, 146, 249)':'#999',
}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }} }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
</botton> </botton>
<botton style="background: #999" class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag == 0"> <!-- <botton style="background: #999" class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag == 0">
评估 评估
</botton> </botton> -->
<botton :style="{ <botton v-if="data.planDto?.evalFlag !== 0" :style="{
background: `${new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`, background: `${new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
}" class="btn" @click="toSurvery" v-else>{{ data.isSurvery ? "已评估" : "评估" }} }" class="btn" @click="toSurvery">{{ data.isSurvery ? "已评估" : "评估" }}
</botton> </botton>
</div> </div>
</div> </div>
@@ -124,7 +124,7 @@
<div class="work" v-if="data.examinationDto?.examinationTestName"> <div class="work" v-if="data.examinationDto?.examinationTestName">
<div> <div>
<div class="question"> <div class="question">
{{ data.examinationDto?.examinationTestName }} {{ data.examinationDto?.examinationName }}
</div> </div>
<div style="margin-top: 16px; display: flex"> <div style="margin-top: 16px; display: flex">
<div class="tag1" v-if="data.examinationDto?.examinationFlag"> <div class="tag1" v-if="data.examinationDto?.examinationFlag">

6
src/views/liveBroadcast/LiveBroadcast.vue
View File

@@ -55,9 +55,9 @@
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }} }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
</botton> </botton>
<botton style="background: #999" class="btn" @click="commitClick" v-if="data.isEvaluate == 0"> <!-- <botton style="background: #999" class="btn" @click="commitClick" v-if="data.isEvaluate == 0">
评估 评估
</botton> </botton> -->
<botton :style="{ <botton :style="{
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`, background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
@@ -360,7 +360,7 @@ onUnmounted(() => {
.threeBtn { .threeBtn {
display: flex; display: flex;
width: 490px; // width: 490px;
margin-right: 87px; margin-right: 87px;
.btn { .btn {

6
src/views/project/ProjectDetails.vue
View File

@@ -64,7 +64,7 @@
<div>当前进度</div> <div>当前进度</div>
<div class="progress"> <div class="progress">
<div style="width: 291px"> <div style="width: 291px">
<el-progress :percentage="value.currentRatio" :show-text="false" :stroke-width="8" :color=" <el-progress :percentage="parseInt(value.currentRatio)" :show-text="false" :stroke-width="8" :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)',
@@ -72,11 +72,11 @@
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(parseInt(value.currentRatio) / 20)]
" /> " />
</div> </div>
<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;color:#677d86;"> <div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;color:#677d86;">
{{ value.currentRatio }}% {{ parseInt(value.currentRatio) }}%
</div> </div>
</div> </div>
</div> </div>

8
src/views/roadmap/PathDetails.vue
View File

@@ -62,7 +62,7 @@
<div>当前进度</div> <div>当前进度</div>
<div class="progress"> <div class="progress">
<div style="width: 291px"> <div style="width: 291px">
<el-progress :percentage="value.currentRatio" :show-text="false" :stroke-width="8" :color=" <el-progress :percentage="parseInt(value.currentRatio)" :show-text="false" :stroke-width="8" :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)',
@@ -70,7 +70,7 @@
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(parseInt(value.currentRatio) / 20)]
" /> " />
</div> </div>
<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" :style="{ <div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" :style="{
@@ -81,9 +81,9 @@
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(parseInt(value.currentRatio) / 20)],
}"> }">
{{ value.currentRatio }}% {{ parseInt(value.currentRatio) }}%
</div> </div>
</div> </div>
</div> </div>