mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git
synced 2025-12-11 03:46:48 +08:00
fix:修改参数传递
This commit is contained in:
@@ -349,8 +349,7 @@ function toWork() {
|
|||||||
query: {
|
query: {
|
||||||
courseId: data.value.workDto.workId,
|
courseId: data.value.workDto.workId,
|
||||||
id: taskId,
|
id: taskId,
|
||||||
taskId: taskId,
|
infoId: taskId,
|
||||||
taskIds: taskId,
|
|
||||||
chapterOrStageId: 0,
|
chapterOrStageId: 0,
|
||||||
type,
|
type,
|
||||||
pName: "面授课",
|
pName: "面授课",
|
||||||
|
|||||||
@@ -61,7 +61,9 @@
|
|||||||
|
|
||||||
<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)'}`,
|
||||||
}" 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 ? "已评估" :
|
||||||
|
"评估"
|
||||||
|
}}
|
||||||
</botton>
|
</botton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -264,8 +266,7 @@ const commitClick = () => {
|
|||||||
path: "/surveydetail",
|
path: "/surveydetail",
|
||||||
query: {
|
query: {
|
||||||
courseId: data.value.assessmentId,
|
courseId: data.value.assessmentId,
|
||||||
taskId: data.value.liveId,
|
infoId: data.value.liveId,
|
||||||
taskIds: data.value.liveId,
|
|
||||||
chapterOrStageId: 0,
|
chapterOrStageId: 0,
|
||||||
pName: "直播",
|
pName: "直播",
|
||||||
sName: data.value.liveName,
|
sName: data.value.liveName,
|
||||||
|
|||||||
@@ -4,7 +4,8 @@
|
|||||||
|
|
||||||
<div class="pdname">
|
<div class="pdname">
|
||||||
{{ data.name }}
|
{{ data.name }}
|
||||||
<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
|
<el-popover v-if="data.remark" 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>
|
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
</div>
|
</div>
|
||||||
@@ -456,8 +457,7 @@ function toFinish(d, sName, chapterOrStageId) {
|
|||||||
query: {
|
query: {
|
||||||
id: d.projectTaskId,
|
id: d.projectTaskId,
|
||||||
type: 2,
|
type: 2,
|
||||||
taskId: data.value.projectId,
|
infoId: data.value.projectId,
|
||||||
taskIds: data.value.projectId,
|
|
||||||
courseId: d.courseId,
|
courseId: d.courseId,
|
||||||
pName: data.value.name,
|
pName: data.value.name,
|
||||||
sName,
|
sName,
|
||||||
@@ -477,6 +477,7 @@ function whiteTypes(type) {
|
|||||||
.example-showcase .el-loading-mask {
|
.example-showcase .el-loading-mask {
|
||||||
z-index: 9;
|
z-index: 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pathdetails {
|
.pathdetails {
|
||||||
.el-dialog__header {
|
.el-dialog__header {
|
||||||
display: none;
|
display: none;
|
||||||
|
|||||||
@@ -6,7 +6,8 @@
|
|||||||
|
|
||||||
<div class="pdname">
|
<div class="pdname">
|
||||||
{{ data.name }}
|
{{ data.name }}
|
||||||
<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
|
<el-popover v-if="data.remark" 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>
|
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
</div>
|
</div>
|
||||||
@@ -18,20 +19,15 @@
|
|||||||
<div class="title">
|
<div class="title">
|
||||||
<div class="titleL">{{ data.currentStageName }}</div>
|
<div class="titleL">{{ data.currentStageName }}</div>
|
||||||
<div class="titleR" :style="{ display: 'flex' }">
|
<div class="titleR" :style="{ display: 'flex' }">
|
||||||
<img
|
<img :src="data.currentChapterCnt ? circle : circle2" />
|
||||||
:src="data.currentChapterCnt?circle:circle2"/>
|
|
||||||
<div class="titleRT" :style="{ color: data.currentChapterCnt ? '' : 'rgba(102, 102, 102, 1)' }">
|
<div class="titleRT" :style="{ color: data.currentChapterCnt ? '' : 'rgba(102, 102, 102, 1)' }">
|
||||||
{{ data.currentChapterCnt ? '进行中' : '未开始' }}
|
{{ data.currentChapterCnt ? '进行中' : '未开始' }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div class="course" v-for="(value, index) in data.taskBoList?.filter(
|
||||||
class="course"
|
|
||||||
v-for="(value, index) in data.taskBoList?.filter(
|
|
||||||
(e) => !whiteTypes(e.type)
|
(e) => !whiteTypes(e.type)
|
||||||
)"
|
)" :key="index">
|
||||||
:key="index"
|
|
||||||
>
|
|
||||||
<div style="width: 70%">
|
<div style="width: 70%">
|
||||||
<div v-if="value.name.length > 50" class="coursename" :title="value.name">
|
<div v-if="value.name.length > 50" class="coursename" :title="value.name">
|
||||||
<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
|
<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
|
||||||
@@ -43,18 +39,10 @@
|
|||||||
{{ value.name }}
|
{{ value.name }}
|
||||||
</div>
|
</div>
|
||||||
<div class="coursetag">
|
<div class="coursetag">
|
||||||
<div
|
<div class="tag1" style="margin-right: 11px; margin-top: 16px" v-if="value.flag">
|
||||||
class="tag1"
|
|
||||||
style="margin-right: 11px; margin-top: 16px"
|
|
||||||
v-if="value.flag"
|
|
||||||
>
|
|
||||||
必修
|
必修
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div class="tag2" style="margin-right: 11px; margin-top: 16px" v-if="!value.flag">
|
||||||
class="tag2"
|
|
||||||
style="margin-right: 11px; margin-top: 16px"
|
|
||||||
v-if="!value.flag"
|
|
||||||
>
|
|
||||||
选修
|
选修
|
||||||
</div>
|
</div>
|
||||||
<div class="tag3" style="margin-right: 11px; margin-top: 16px">
|
<div class="tag3" style="margin-right: 11px; margin-top: 16px">
|
||||||
@@ -85,8 +73,7 @@
|
|||||||
}[parseInt(value.currentRatio / 20)]
|
}[parseInt(value.currentRatio / 20)]
|
||||||
" />
|
" />
|
||||||
</div>
|
</div>
|
||||||
<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;"
|
<div 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)',
|
||||||
@@ -463,11 +450,9 @@ function toFinish(d) {
|
|||||||
router.push({
|
router.push({
|
||||||
path: types.value.path[d.type],
|
path: types.value.path[d.type],
|
||||||
query: {
|
query: {
|
||||||
id: d.routerTaskId,
|
id: routerId,
|
||||||
// id: routerId,
|
|
||||||
type: 1,
|
type: 1,
|
||||||
taskId: routerId,
|
infoId: 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,
|
||||||
@@ -508,6 +493,7 @@ function whiteTypes(type) {
|
|||||||
margin-top: 24px;
|
margin-top: 24px;
|
||||||
display: flex;
|
display: flex;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
|
|
||||||
.detailL {
|
.detailL {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
|
|||||||
@@ -334,7 +334,7 @@ import { ElMessage } from "element-plus";
|
|||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
|
|
||||||
const {
|
const {
|
||||||
query: { courseId, id: taskId, taskIds, type, pName, sName, chapterOrStageId },
|
query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId },
|
||||||
} = useRoute();
|
} = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const returnclick = () => {
|
const returnclick = () => {
|
||||||
@@ -353,8 +353,8 @@ function formateArr(arr1) {
|
|||||||
return newarr
|
return newarr
|
||||||
}
|
}
|
||||||
|
|
||||||
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 });
|
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
|
||||||
console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 })
|
console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 })
|
||||||
console.log('我是需要排序得题目', data)
|
console.log('我是需要排序得题目', data)
|
||||||
|
|
||||||
function goHome() {
|
function goHome() {
|
||||||
@@ -369,10 +369,10 @@ function submit() {
|
|||||||
if (1 > 0) {
|
if (1 > 0) {
|
||||||
console.log(data)
|
console.log(data)
|
||||||
console.log('我是提交的数据', {
|
console.log('我是提交的数据', {
|
||||||
targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id
|
targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
|
||||||
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
|
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
|
||||||
assessmentId: courseId,
|
assessmentId: courseId,
|
||||||
taskId: taskId ? taskId : taskIds ? taskIds : 0,
|
taskId: taskId ? taskId : 0,
|
||||||
type,
|
type,
|
||||||
result: JSON.stringify(data.value),
|
result: JSON.stringify(data.value),
|
||||||
})
|
})
|
||||||
@@ -424,10 +424,10 @@ function submit() {
|
|||||||
|
|
||||||
data.value.isSubmit = !data.value.isSubmit;
|
data.value.isSubmit = !data.value.isSubmit;
|
||||||
request(ASSESSMENT_SUBMIT, {
|
request(ASSESSMENT_SUBMIT, {
|
||||||
targetId: taskIds ? taskIds : 0, // 项目、路径图或开课的Id
|
targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
|
||||||
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
|
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
|
||||||
assessmentId: courseId,
|
assessmentId: courseId,
|
||||||
taskId: taskIds ? taskIds : 0,
|
taskId: taskId ? taskId : 0,
|
||||||
type,
|
type,
|
||||||
result: JSON.stringify(data.value),
|
result: JSON.stringify(data.value),
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user