fix:路径图/项目跳转评估传递参数

This commit is contained in:
wuyx
2022-12-23 21:19:32 +08:00
parent 6ded0b99ac
commit 2871128f4a
2 changed files with 47 additions and 53 deletions

View File

@@ -8,7 +8,8 @@
<div class="return"> <div class="return">
<div style="display: flex" @click="returnclick"> <div style="display: flex" @click="returnclick">
<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button> <el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
src="../../assets/image/return.png" />返回</el-button>
</div> </div>
</div> </div>
</div> </div>
@@ -468,6 +469,8 @@ function toFinish(d, sName, chapterOrStageId) {
query: { query: {
id: d.projectTaskId, id: d.projectTaskId,
type: 2, type: 2,
taskId: projectId,
taskIds: projectId,
courseId: d.courseId, courseId: d.courseId,
pName: data.value.name, pName: data.value.name,
sName, sName,

View File

@@ -8,62 +8,51 @@
<div class="return"> <div class="return">
<div style="display: flex" @click="returnclick"> <div style="display: flex" @click="returnclick">
<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button> <el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
src="../../assets/image/return.png" />返回</el-button>
</div> </div>
</div> </div>
</div>
<!-- 面包屑导航 -->
<div class="pdname"> </div>
{{ userInfo.bandDesc }} <!-- 面包屑导航 -->
<el-popover ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template> <div class="pdname">
</el-popover> {{ userInfo.bandDesc }}
</div> <el-popover ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300"
:content="data.remark">
<!-- 详细信息 --> <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
<div class="detailinfo"> </el-popover>
<div class="detailL"> </div>
<div>
<div class="title"> <!-- 详细信息 -->
<div class="titleL">{{ data.currentStageName }}</div> <div class="detailinfo">
<div class="titleR" :style="{ display: 'flex' }"> <div class="detailL">
<img <div>
:src="data.currentChapterCnt?circle:circle2"/> <div class="title">
<div class="titleRT" :style="{color:data.currentChapterCnt?'':'rgba(102, 102, 102, 1)'}"> <div class="titleL">{{ data.currentStageName }}</div>
{{ data.currentChapterCnt ? '进行中' : '未开始' }} <div class="titleR" :style="{ display: 'flex' }">
</div> <img :src="data.currentChapterCnt ? circle : circle2" />
</div> <div class="titleRT" :style="{ color: data.currentChapterCnt ? '' : 'rgba(102, 102, 102, 1)' }">
</div> {{ data.currentChapterCnt ? '进行中' : '未开始' }}
<div </div>
class="course" </div>
v-for="(value, index) in data.taskBoList?.filter( </div>
(e) => !whiteTypes(e.type) <div class="course" v-for="(value, index) in data.taskBoList?.filter(
)" (e) => !whiteTypes(e.type)
:key="index" )" :key="index">
> <div style="width: 70%">
<div style="width: 70%"> <div class="coursename" :title="value.name">{{ value.name }}</div>
<div class="coursename" :title="value.name">{{ value.name }}</div> <div class="coursetag">
<div class="coursetag"> <div class="tag1" style="margin-right: 11px; margin-top: 16px" v-if="value.flag">
<div 必修
class="tag1" </div>
style="margin-right: 11px; margin-top: 16px" <div class="tag2" style="margin-right: 11px; margin-top: 16px" v-if="!value.flag">
v-if="value.flag" 选修
> </div>
必修 <div class="tag3" style="margin-right: 11px; margin-top: 16px">
</div> {{ types.typeName[value.type] || "" }}
<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] || "" }}
</div>
<!-- <div--> <!-- <div-->
<!-- v-for="(item, key) in value.flag"--> <!-- v-for="(item, key) in value.flag"-->
@@ -408,6 +397,8 @@ function toFinish(d) {
// id: d.routerTaskId, // id: d.routerTaskId,
id: routerId, id: routerId,
type: 1, type: 1,
taskId: routerId,
taskIds: routerId,
courseId: d.courseId, courseId: d.courseId,
pName: data.value.name, pName: data.value.name,
sName: data.value.currentStageName, sName: data.value.currentStageName,