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

fix:修改参数传递

Browse Source
This commit is contained in:
wuyx
2022-12-26 12:01:36 +08:00
parent e64eee5b18
commit a78ea775f2
5 changed files with 214 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,8 +349,7 @@ function toWork() {
query: {
courseId: data.value.workDto.workId,
id: taskId,
taskId: taskId,
taskIds: taskId,
infoId: taskId,
chapterOrStageId: 0,
type,
pName: "面授课",

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

@@ -61,7 +61,9 @@
<botton :style="{
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>
</div>
</div>
@@ -264,8 +266,7 @@ const commitClick = () => {
path: "/surveydetail",
query: {
courseId: data.value.assessmentId,
taskId: data.value.liveId,
taskIds: data.value.liveId,
infoId: data.value.liveId,
chapterOrStageId: 0,
pName: "直播",
sName: data.value.liveName,

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

@@ -4,7 +4,8 @@
<div class="pdname">
{{ 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>
</el-popover>
</div>
@@ -456,8 +457,7 @@ function toFinish(d, sName, chapterOrStageId) {
query: {
id: d.projectTaskId,
type: 2,
taskId: data.value.projectId,
taskIds: data.value.projectId,
infoId: data.value.projectId,
courseId: d.courseId,
pName: data.value.name,
sName,
@@ -477,6 +477,7 @@ function whiteTypes(type) {
.example-showcase .el-loading-mask {
z-index: 9;
}
.pathdetails {
.el-dialog__header {
display: none;

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

@@ -6,7 +6,8 @@
<div class="pdname">
{{ 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>
</el-popover>
</div>
@@ -18,20 +19,15 @@
<div class="title">
<div class="titleL">{{ data.currentStageName }}</div>
<div class="titleR" :style="{ display: 'flex' }">
<img
:src="data.currentChapterCnt?circle:circle2"/>
<img :src="data.currentChapterCnt ? circle : circle2" />
<div class="titleRT" :style="{ color: data.currentChapterCnt ? '' : 'rgba(102, 102, 102, 1)' }">
{{ data.currentChapterCnt ? '进行中' : '未开始' }}
</div>
</div>
</div>
<div
class="course"
v-for="(value, index) in data.taskBoList?.filter(
<div class="course" v-for="(value, index) in data.taskBoList?.filter(
(e) => !whiteTypes(e.type)
)"
:key="index"
>
)" :key="index">
<div style="width: 70%">
<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">
@@ -43,18 +39,10 @@
{{ value.name }}
</div>
<div class="coursetag">
<div
class="tag1"
style="margin-right: 11px; margin-top: 16px"
v-if="value.flag"
>
<div class="tag1" style="margin-right: 11px; margin-top: 16px" v-if="value.flag">
必修
</div>
<div
class="tag2"
style="margin-right: 11px; margin-top: 16px"
v-if="!value.flag"
>
<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">
@@ -85,8 +73,7 @@
}[parseInt(value.currentRatio / 20)]
" />
</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="{
color: {
0: 'rgba(238, 112, 108, 1)',
1: 'rgba(255, 151, 38, 1)',
@@ -463,11 +450,9 @@ function toFinish(d) {
router.push({
path: types.value.path[d.type],
query: {
id: d.routerTaskId,
// id: routerId,
id: routerId,
type: 1,
taskId: routerId,
taskIds: routerId,
infoId: routerId,
courseId: d.courseId,
pName: data.value.name,
sName: data.value.currentStageName,
@@ -508,6 +493,7 @@ function whiteTypes(type) {
margin-top: 24px;
display: flex;
z-index: 2;
.detailL {
flex: 1;
margin-right: 20px;

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

@@ -334,7 +334,7 @@ import { ElMessage } from "element-plus";
import { ref } from "vue";
const {
query: { courseId, id: taskId, taskIds, type, pName, sName, chapterOrStageId },
query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId },
} = useRoute();
const router = useRouter();
const returnclick = () => {
@@ -353,8 +353,8 @@ function formateArr(arr1) {
return newarr
}
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 });
console.log('我是查询评估的参数', { 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: infoId ? infoId : 0 })
console.log('我是需要排序得题目', data)
function goHome() {
@@ -369,10 +369,10 @@ function submit() {
if (1 > 0) {
console.log(data)
console.log('我是提交的数据', {
targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id
targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
assessmentId: courseId,
taskId: taskId ? taskId : taskIds ? taskIds : 0,
taskId: taskId ? taskId : 0,
type,
result: JSON.stringify(data.value),
})
@@ -424,10 +424,10 @@ function submit() {
data.value.isSubmit = !data.value.isSubmit;
request(ASSESSMENT_SUBMIT, {
targetId: taskIds ? taskIds : 0, // 项目、路径图或开课的Id
targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
assessmentId: courseId,
taskId: taskIds ? taskIds : 0,
taskId: taskId ? taskId : 0,
type,
result: JSON.stringify(data.value),
}).then(() => {