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

fix -- bug

Browse Source
This commit is contained in:
yuping
2023-02-23 15:17:03 +08:00
parent 7eae401bdb
commit db6d5caf0b
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/store/index.js
View File

@@ -77,13 +77,13 @@ export default createStore({
}, },
actions: { actions: {
getProjectInfo(content, {projectId}) { getProjectInfo(content, {projectId}) {
content.state.projectInfo.projectId || request(PROJECT_PROCESS, {projectId}).then(res => { request(PROJECT_PROCESS, {projectId}).then(res => {
content.commit('SET_PROJECT_INFO', res.data) content.commit('SET_PROJECT_INFO', res.data)
content.commit('INIT_PROJECT_INFO') content.commit('INIT_PROJECT_INFO')
}) })
}, },
getRouterInfo(content, {routerId}) { getRouterInfo(content, {routerId}) {
content.state.routerInfo.routerId || request(ROUTER_PROCESS, {routerId}).then(res => { request(ROUTER_PROCESS, {routerId}).then(res => {
content.commit('SET_ROUTER_INFO', res.data) content.commit('SET_ROUTER_INFO', res.data)
content.commit('INIT_ROUTER_INFO') content.commit('INIT_ROUTER_INFO')
}) })

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

@@ -170,7 +170,7 @@
<div>总进度</div> <div>总进度</div>
<div class="progress"> <div class="progress">
<div style="width: 291px"> <div style="width: 291px">
<el-progress :percentage="parseInt((data.totalProgress ? data.totalProgress : 0) * 100)" <el-progress :percentage="parseInt((data.totalProgress || 0) * 100)"
:show-text="false" :stroke-width="8" :color=" :show-text="false" :stroke-width="8" :color="
{ {
0: 'rgba(238, 112, 108, 1)', 0: 'rgba(238, 112, 108, 1)',
@@ -179,11 +179,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(((data.totalProgress ? data.totalProgress : 0) * 100) / 20)] }[parseInt(((data.totalProgress || 0) * 100) / 20)]
" /> " />
</div> </div>
<div style="font-size: 14px; font-weight: 500; margin-left: 10px;color:#677d86;"> <div style="font-size: 14px; font-weight: 500; margin-left: 10px;color:#677d86;">
{{ parseInt(data.totalProgress ? data.totalProgress > 1 ? 1 : data.totalProgress : 0 * 100) }}% {{ parseInt((data.totalProgress || 0) * 100) }}%
</div> </div>
</div> </div>
</div> </div>
@@ -193,7 +193,7 @@
<div>必修进度</div> <div>必修进度</div>
<div class="progress"> <div class="progress">
<div style="width: 291px"> <div style="width: 291px">
<el-progress :percentage="parseInt((data.compulsoryProgress ? data.compulsoryProgress : 0) * 100)" <el-progress :percentage="parseInt((data.compulsoryProgress || 0) * 100)"
:show-text="false" :stroke-width="8" :color=" :show-text="false" :stroke-width="8" :color="
{ {
0: 'rgba(238, 112, 108, 1)', 0: 'rgba(238, 112, 108, 1)',
@@ -202,7 +202,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(((data.compulsoryProgress ? data.compulsoryProgress : 0) * 100) / 20)] }[parseInt(((data.compulsoryProgress || 0) * 100) / 20)]
" /> " />
</div> </div>
<div style=" <div style="
@@ -210,9 +210,7 @@
font-weight: 500; font-weight: 500;
color: #277aff; color: #277aff;
margin-left: 10px;color:#677d86;"> margin-left: 10px;color:#677d86;">
{{ {{parseInt(((data.compulsoryProgress || 0) * 100)) }}%
parseInt(((data.compulsoryProgress ? data.compulsoryProgress : 0) > 1 ? 1 : (data.compulsoryProgress ? data.compulsoryProgress : 0))
* 100) }}%
</div> </div>
</div> </div>
</div> </div>
@@ -366,6 +364,7 @@ const { commit, dispatch, state } = useStore()
const store = useStore() const store = useStore()
const userInfo = computed(() => state.userInfo) const userInfo = computed(() => state.userInfo)
const data = computed(() => state.projectInfo) const data = computed(() => state.projectInfo)
onMounted(() => { onMounted(() => {
dispatch('getProjectInfo', { projectId }) dispatch('getProjectInfo', { projectId })
}) })