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

fix:修改直播评估跳转参数传递

Browse Source
This commit is contained in:
wyx
2023-03-10 16:55:41 +08:00
parent 2f03fff7e9
commit 8518d34749
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@
</botton> </botton>
<botton class="btn" :style="{ <botton class="btn" :style="{
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(59, 191, 252)'}`,
}" @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">
@@ -71,7 +71,7 @@
</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(59, 191, 252)'}`,
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{ }" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{
data.isSurvery ? "已评估" : data.isSurvery ? "已评估" :
"评估" "评估"
@@ -80,7 +80,7 @@
</div> </div>
<div v-else class="threeBtn"> <div v-else class="threeBtn">
<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(59, 191, 252)'}`,
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1&&data.isSurvery">{{ }" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1&&data.isSurvery">{{
data.isSurvery ? "已评估" : data.isSurvery ? "已评估" :
"评估" "评估"
@@ -109,7 +109,7 @@
</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(59, 191, 252)'}`,
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{ }" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{
data.isSurvery ? "已评估" : data.isSurvery ? "已评估" :
"评估" "评估"
@@ -202,7 +202,7 @@ import {ElMessage} from "element-plus";
import {useTaskPage} from "@/api/useCommon"; import {useTaskPage} from "@/api/useCommon";
const { const {
query: {courseId: liveId, id: taskId, type, pName, sName, projectStatus, projectEndTime}, query: {courseId: liveId, id: taskId, type, pName, sName, projectStatus, projectEndTime, infoId},
} = useRoute(); } = useRoute();
const router = useRouter(); const router = useRouter();
const returnclick = () => { const returnclick = () => {
@@ -326,18 +326,18 @@ const commitClick = () => {
console.log({ console.log({
courseId: data.value.assessmentId, courseId: data.value.assessmentId,
taskIds: taskId, infoId: liveId,
chapterOrStageId: 0, chapterOrStageId: 0,
pName: "直播", pName: "直播",
sName: data.value.liveName, sName: data.value.liveName,
type: 4 type: 4
}) })
console.log(data.value)
router.push({ router.push({
path: "/surveydetail", path: "/surveydetail",
query: { query: {
courseId: data.value.assessmentId, courseId: data.value.assessmentId,
infoId: data.value.liveId, infoId: liveId,
chapterOrStageId: 0, chapterOrStageId: 0,
pName: "直播", pName: "直播",
sName: data.value.liveName, sName: data.value.liveName,

2
src/views/survey/SurveyDetail.vue
View File

@@ -348,7 +348,7 @@ const returnclick = () => {
clearInterval(timers) clearInterval(timers)
router.back(); router.back();
}; };
const {nextPage,prevPage,hasPrev, hasNext} = type==3 ? '' : useTaskPage() const {nextPage,prevPage,hasPrev, hasNext} = type==3 || type==4 ? '' : useTaskPage()
const fielPath = ref(import.meta.env.VITE_FILE_PATH); const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }); const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
console.log(data) console.log(data)