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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop

Browse Source
This commit is contained in:
zhangyc
2022-12-17 00:22:05 +08:00
parent 0b81f8a389 b7eab48c96
commit 138ac98f15
6 changed files with 239 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,24 +14,37 @@
<div class="title">【面授课】{{ data.planDto?.name }}</div> <div class="title">【面授课】{{ data.planDto?.name }}</div>
<div class="time" style="margin-top: 26px"> <div class="time" style="margin-top: 26px">
<img <img
style="width: 15px; height: 17px" style="width: 15px; height: 17px"
src="../../assets/image/time.png" src="../../assets/image/time.png"
/> />
<div style="margin-left: 8px"> <div style="margin-left: 8px">
{{ data.offcourseDto?.publishTime }} {{ data.planDto?.beginTime + "至" + data.planDto?.endTime }}
</div> </div>
</div> </div>
<div class="time" style="margin-top: 23px"> <div class="time" style="margin-top: 23px">
<img <img
style="width: 16px; height: 18px" style="width: 16px; height: 18px"
src="../../assets/image/position.png" src="../../assets/image/position.png"
/> />
<div style="margin-left: 8px">{{ data.planDto?.address }}</div> <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
</div> </div>
</div> </div>
<botton :style="{background:`${data.isSurvery?'#999':'rgb(57, 146, 249)'}`}" class="btn" @click="toSurvery" <botton
v-if="data.evalFlag && data.evalFlag==='1'" style="background: #999"
>{{ data.isSurvery ? '已评估' : '评估' }} class="btn"
@click="toSurvery"
v-if="data.planDto?.evalFlag == 0"
>
评估
</botton>
<botton
:style="{
background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
}"
class="btn"
@click="toSurvery"
v-if="data.planDto?.evalFlag && data.planDto?.evalFlag == 1"
>{{ data.isSurvery ? "已评估" : "评估" }}
</botton> </botton>
</div> </div>
<!-- 基本信息 --> <!-- 基本信息 -->
@@ -43,8 +56,8 @@
<div class="" style="margin-left: 48px; margin-right: 48px"> <div class="" style="margin-left: 48px; margin-right: 48px">
<div class="title"> <div class="title">
<img <img
style="width: 20px; height: 20px" style="width: 20px; height: 20px"
src="../../assets/image/course.png" src="../../assets/image/course.png"
/> />
<div class="text">课程详情</div> <div class="text">课程详情</div>
<div class="box"></div> <div class="box"></div>
@@ -58,16 +71,29 @@
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="课程附件" name="first"> <el-tab-pane label="课程附件" name="first">
<div <div
v-for="(el, index) in JSON.parse(data.planDto?.attach)" v-if="data.planDto?.attach === '[]'"
:key="index" style="
v-if="data.planDto" font-size: 14px;
class="enclosure" font-weight: 400;
:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }" line-height: 24px;
cursor: pointer;
margin-left: 40px;
margin-top: 20px;
"
>
此课程无附件
</div>
<div
v-for="(el, index) in JSON.parse(data.planDto?.attach)"
:key="index"
v-if="data.planDto"
class="enclosure"
:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"
> >
<div class="enclosureL"> <div class="enclosureL">
<FileTypeImg <FileTypeImg
v-model="el.name" v-model="el.name"
:style="{ :style="{
width: '22px', width: '22px',
height: '26px', height: '26px',
marginLeft: '10px', marginLeft: '10px',
@@ -77,15 +103,33 @@
</div> </div>
<div class="download"> <div class="download">
<img <img
style="width: 16px; height: 15px" style="width: 16px; height: 15px"
src="../../assets/image/download.png" src="../../assets/image/download.png"
/> />
<div style="margin-left: 5px" @click="download(el.response.data)">下载</div> <div
style="margin-left: 5px"
@click="download(el.response.data)"
>
下载
</div>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="课程作业" name="second"> <el-tab-pane label="课程作业" name="second">
<div class="work" v-if="data.workDto?.workName "> <div
v-if="data.planDto?.attach === '[]'"
style="
font-size: 14px;
font-weight: 400;
line-height: 24px;
cursor: pointer;
margin-left: 40px;
margin-top: 20px;
"
>
此课程无作业
</div>
<div class="work" v-if="data.workDto?.workName">
<div> <div>
<div class="question">{{ data.workDto?.workName }}</div> <div class="question">{{ data.workDto?.workName }}</div>
<div style="margin-top: 16px; display: flex"> <div style="margin-top: 16px; display: flex">
@@ -94,11 +138,24 @@
</div> </div>
</div> </div>
<div class="submit" @click="toWork" v-if="data.workDto?.workId"> <div class="submit" @click="toWork" v-if="data.workDto?.workId">
提交 去作业
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="课程考试" name="third"> <el-tab-pane label="课程考试" name="third">
<div
v-if="data.planDto?.attach === '[]'"
style="
font-size: 14px;
font-weight: 400;
line-height: 24px;
cursor: pointer;
margin-left: 40px;
margin-top: 20px;
"
>
此课程无考试
</div>
<div class="work" v-if="data.examinationDto?.examinationTestName"> <div class="work" v-if="data.examinationDto?.examinationTestName">
<div> <div>
<div class="question"> <div class="question">
@@ -106,17 +163,17 @@
</div> </div>
<div style="margin-top: 16px; display: flex"> <div style="margin-top: 16px; display: flex">
<div <div
class="tag1" class="tag1"
v-if="data.examinationDto?.examinationFlag" v-if="data.examinationDto?.examinationFlag"
> >
必修 必修
</div> </div>
<div class="tag3" style="margin-left: 11px">考试</div> <div class="tag3" style="margin-left: 11px">考试</div>
</div> </div>
</div> </div>
<!-- <div class="submit" @click="toExamItem(data.examinationDto)">--> <div class="submit" @click="toExamItem(data.examinationDto)">
<!-- 去考试--> 去考试
<!-- </div>--> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@@ -125,15 +182,15 @@
<div class="teacher"> <div class="teacher">
<div class="title"> <div class="title">
<img <img
style="width: 21px; height: 23px" style="width: 21px; height: 23px"
src="../../assets/image/livelecturer.png" src="../../assets/image/livelecturer.png"
/> />
<div class="text">直播讲师</div> <div class="text">直播讲师</div>
<div class="box"></div> <div class="box"></div>
</div> </div>
<!-- todo #面授课接口 讲师缺少img和介绍--> <!-- todo #面授课接口 讲师缺少img和介绍-->
<div class="teacheritem"> <div class="teacheritem">
<img class="peopleimg" :src="userAvatar"/> <img class="peopleimg" :src="userAvatar" />
<div style="margin-left: 17px; width: 190px"> <div style="margin-left: 17px; width: 190px">
<div class="teacherName" style="margin-right: 5px"> <div class="teacherName" style="margin-right: 5px">
{{ data.planDto?.teacher }} {{ data.planDto?.teacher }}
@@ -149,32 +206,32 @@
</template> </template>
<script setup> <script setup>
import {computed, reactive, toRefs, watch} from "vue"; import { computed, reactive, toRefs, watch } from "vue";
import FileTypeImg from "@/components/FileTypeImg.vue"; import FileTypeImg from "@/components/FileTypeImg.vue";
import {request, useRequest} from "@/api/request"; import { request, useRequest } from "@/api/request";
import {STU_OFFCOURSE_DETAIL} from "@/api/api"; import { STU_OFFCOURSE_DETAIL } from "@/api/api";
import {useRoute, useRouter} from "vue-router"; import { useRoute, useRouter } from "vue-router";
import {useUserInfo} from "@/api/utils"; import { useUserInfo } from "@/api/utils";
const router = useRouter(); const router = useRouter();
const returnclick = () => { const returnclick = () => {
router.back(); router.back();
}; };
const { const {
query: {courseId, type}, query: { courseId, type },
} = useRoute(); } = useRoute();
const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
console.log("datadatadatadatadatadatadata", data);
const {avatar: userAvatar} = useUserInfo( const { avatar: userAvatar } = useUserInfo(
computed(() => data.value?.planDto?.teacherId) computed(() => data.value?.planDto?.teacherId)
); );
const state = reactive({ const state = reactive({
activeName: "first", activeName: "first",
enclosure: "", enclosure: "",
}); });
const {activeName, enclosure} = toRefs(state); const { activeName, enclosure } = toRefs(state);
const handleClick = (tab, event) => { const handleClick = (tab, event) => {
console.log(tab, event); console.log(tab, event);
}; };
@@ -184,11 +241,15 @@ const download = (url) => {
function toSurvery() { function toSurvery() {
if (data.value.isSurvery) { if (data.value.isSurvery) {
return return;
}
if (data.value.planDto.evalFlag == 0) {
alert("此课程无评估");
return;
} }
router.push({ router.push({
path: "/surveydetail", path: "/surveydetail",
query: {courseId: data.value.planDto.evaluateId}, query: { courseId: data.value.planDto.evaluateId },
}); });
} }
@@ -204,7 +265,9 @@ function toWork() {
} }
function toExamItem(obj) { function toExamItem(obj) {
router.push({path: "/starttest", query: {id: obj.courseId}}); console.log("obj", obj.examinationTestId);
window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId); //测评
// router.push({ path: import.meta.env.VITE_BOE_EXAM_DETAIL_URL+ obj.examinationTestId });
} }
</script> </script>

1
src/views/homework/HomeworkPage.vue
View File

@@ -26,7 +26,6 @@
</div> </div>
</div> </div>
</div> </div>
<div @click="returnclick">返回</div>
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div class="debateTitle" style="color: #fff"> <div class="debateTitle" style="color: #fff">
【作业】管理者进阶腾飞班 - 中级管理者作业 【作业】管理者进阶腾飞班 - 中级管理者作业

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

@@ -7,23 +7,24 @@
<div>{{ sName }}</div> <div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div> <div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">直播详情</div> <div style="font-weight: 700; font-size: 16px">直播详情</div>
<!-- <!--
<div class="preNext"> <div class="preNext">
2022-12-15注释 李晓鸽 后面打开 --> 2022-12-15注释 李晓鸽 后面打开 -->
<!-- <button class="btn btn01"></button> <!-- <button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span> <span class="content" style="margin-left: 6px">上一个</span>
<span class="content" style="margin-left: 31px">下一个</span> <span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button> <button class="btn btn02" style="margin-left: 6px"></button>
</div>--> </div>-->
<div class="return"> <div class="return">
<div style="display: flex" @click="returnclick"> <div style="display: flex" @click="returnclick">
<img <img
class="img2" style="margin-right:22px;" class="img2"
src="../../assets/image/return.png" style="margin-right: 22px"
/> src="../../assets/image/return.png"
<div class="text">返回</div> />
<div class="text">返回</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
@@ -33,11 +34,11 @@
<div class="title">【直播】{{ data?.liveName }}</div> <div class="title">【直播】{{ data?.liveName }}</div>
<div class="time" style="margin-top: 26px"> <div class="time" style="margin-top: 26px">
<img <img
style="width: 15px; height: 17px" style="width: 15px; height: 17px"
src="../../assets/image/time.png" src="../../assets/image/time.png"
/> />
<div style="margin-left: 8px"> <div style="margin-left: 8px">
{{ data?.liveStartTime + "-" + data?.liveEndTime }} {{ data?.liveStartTime + "至" + data?.liveEndTime }}
</div> </div>
</div> </div>
<!-- todo #直播详情 没有位置字段--> <!-- todo #直播详情 没有位置字段-->
@@ -52,27 +53,36 @@
</div> </div>
<div class="threeBtn"> <div class="threeBtn">
<botton <botton
class="btn" class="btn"
style="background: rgb(59, 191, 252)" style="background: rgb(59, 191, 252)"
@click="showClick" @click="showClick"
>观看 >观看
</botton> </botton>
<botton <botton
class="btn" class="btn"
:style="{ :style="{
background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
}" }"
@click="signClick" @click="signClick"
>{{ data.signFlag ? "已签到" : "签到" }} >{{ data.signFlag ? "已签到" : "签到" }}
</botton> </botton>
<botton <botton
:style="{ style="background: #999"
class="btn"
@click="commitClick"
v-if="data.isEvaluate == 0"
>
评估
</botton>
<botton
:style="{
background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`, background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
}" }"
class="btn" class="btn"
@click="commitClick" @click="commitClick"
v-if="data.isEvaluate && data.isEvaluate==='1'" v-if="data.isEvaluate && data.isEvaluate == 1"
>{{ data.isSurvery ? "已评估" : "评估" }} >{{ data.isSurvery ? "已评估" : "评估" }}
</botton> </botton>
</div> </div>
</div> </div>
@@ -85,8 +95,8 @@
<div class="" style="margin-left: 48px; margin-right: 48px"> <div class="" style="margin-left: 48px; margin-right: 48px">
<div class="title"> <div class="title">
<img <img
style="width: 20px; height: 20px" style="width: 20px; height: 20px"
src="../../assets/image/course.png" src="../../assets/image/course.png"
/> />
<div class="text">直播说明</div> <div class="text">直播说明</div>
<div class="box"></div> <div class="box"></div>
@@ -122,8 +132,8 @@
<div class="tell"> <div class="tell">
<div class="title"> <div class="title">
<img <img
style="width: 21px; height: 23px" style="width: 21px; height: 23px"
src="../../assets/image/tv.png" src="../../assets/image/tv.png"
/> />
<div class="text">直播公告</div> <div class="text">直播公告</div>
<div class="box"></div> <div class="box"></div>
@@ -133,18 +143,18 @@
<div class="teacher"> <div class="teacher">
<div class="title"> <div class="title">
<img <img
style="width: 21px; height: 23px" style="width: 21px; height: 23px"
src="../../assets/image/livelecturer.png" src="../../assets/image/livelecturer.png"
/> />
<!-- todo #直播详情 没有直播讲师--> <!-- todo #直播详情 没有直播讲师-->
<div class="text">直播讲师</div> <div class="text">直播讲师</div>
<div class="box"></div> <div class="box"></div>
</div> </div>
<div <div
class="teacheritem" class="teacheritem"
:style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }" :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
> >
<img class="peopleimg" :src="userAvatar"/> <img class="peopleimg" :src="userAvatar" />
<div style="margin-left: 17px; width: 190px"> <div style="margin-left: 17px; width: 190px">
<div class="teacherName" style="margin-right: 5px"> <div class="teacherName" style="margin-right: 5px">
{{ data.userInfoBo?.userName }} {{ data.userInfoBo?.userName }}
@@ -161,27 +171,27 @@
</template> </template>
<script setup> <script setup>
import {computed, reactive, toRefs} from "vue"; import { computed, reactive, toRefs } from "vue";
import img from "@/assets/image/uploadimg.png"; import img from "@/assets/image/uploadimg.png";
import {request, useRequest} from "@/api/request"; import { request, useRequest } from "@/api/request";
import {TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api"; import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
import {useRoute} from "vue-router/dist/vue-router"; import { useRoute } from "vue-router/dist/vue-router";
import {useRouter} from "vue-router"; import { useRouter } from "vue-router";
import {useUserInfo} from "@/api/utils"; import { useUserInfo } from "@/api/utils";
import {ElMessage} from "element-plus"; import { ElMessage } from "element-plus";
const { const {
query: {courseId: liveId, id: taskId, type, pName, sName}, query: { courseId: liveId, id: taskId, type, pName, sName },
} = useRoute(); } = useRoute();
const router = useRouter(); const router = useRouter();
const returnclick = () => { const returnclick = () => {
router.back(); router.back();
}; };
const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId}); const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });
const {avatar: userAvatar} = useUserInfo( const { avatar: userAvatar } = useUserInfo(
computed(() => data.value.userInfoBo?.userId) computed(() => data.value.userInfoBo?.userId)
); );
const state = reactive({ const state = reactive({
@@ -191,27 +201,32 @@ const state = reactive({
id: 1, id: 1,
name: "王星天（显示事业）", name: "王星天（显示事业）",
introduce: introduce:
"教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。", "教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。",
peopleimg: img, peopleimg: img,
}, },
], ],
}); });
const {activeName, teacher} = toRefs(state); const { activeName, teacher } = toRefs(state);
const signClick = () => { const signClick = () => {
if (data.value.signFlag) { if (data.value.signFlag) {
return; return;
} }
data.value.signFlag = 1; data.value.signFlag = 1;
ElMessage.info("签到成功"); ElMessage.info("签到成功");
request(TASK_BROADCAST_SIGN, {courseId: liveId, taskId, type}); request(TASK_BROADCAST_SIGN, { courseId: liveId, taskId, type });
}; };
const commitClick = () => { const commitClick = () => {
if (data.value.isSurvery) { if (data.value.isSurvery) {
return; return;
} }
if (data.value.isEvaluate == 0) {
alert("此直播无评估");
return;
}
router.push({ router.push({
path: "/surveydetail", path: "/surveydetail",
query: {courseId: data.value.assessmentId}, query: { courseId: data.value.assessmentId },
}); });
}; };
@@ -230,14 +245,14 @@ function showClick() {
line-height: 24px; line-height: 24px;
position: relative; position: relative;
} }
.return{ .return {
position: absolute; position: absolute;
right: 10%; right: 10%;
.text{ .text {
text-align: center; text-align: center;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
} }
.preNext { .preNext {
@@ -285,7 +300,6 @@ function showClick() {
.threeBtn { .threeBtn {
display: flex; display: flex;
width: 490px; width: 490px;
justify-content: space-between;
margin-right: 87px; margin-right: 87px;
.btn { .btn {
@@ -302,7 +316,7 @@ function showClick() {
font-weight: 800; font-weight: 800;
line-height: 24px; line-height: 24px;
cursor: pointer; cursor: pointer;
// margin-right: 96px; margin-left: 20px;
} }
} }
@@ -513,9 +527,9 @@ function showClick() {
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
border-radius: 8px; border-radius: 8px;
background: linear-gradient( background: linear-gradient(
180deg, 180deg,
rgba(36, 120, 255, 0.15) 0%, rgba(36, 120, 255, 0.15) 0%,
rgba(255, 255, 255) 50% rgba(255, 255, 255) 50%
); );
.title { .title {

93
src/views/moreActive/MoreActive.vue
View File

@@ -7,7 +7,7 @@
<div>{{ sName }}</div> <div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div> <div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">活动详情</div> <div style="font-weight: 700; font-size: 16px">活动详情</div>
<!-- <!--
<div class="preNext"> <div class="preNext">
<button class="btn btn01"></button> <button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span> <span class="content" style="margin-left: 6px">上一个</span>
@@ -15,14 +15,15 @@
<button class="btn btn02" style="margin-left: 6px"></button> <button class="btn btn02" style="margin-left: 6px"></button>
</div>--> </div>-->
<div class="return"> <div class="return">
<div style="display: flex" @click="returnclick"> <div style="display: flex" @click="returnclick">
<img <img
class="img2" style="margin-right:22px;" class="img2"
src="../../assets/image/return.png" style="margin-right: 22px"
/> src="../../assets/image/return.png"
<div class="text">返回</div> />
<div class="text">返回</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
@@ -33,26 +34,28 @@
<div class="title">{{ data?.activityName }}</div> <div class="title">{{ data?.activityName }}</div>
<div class="time" style="margin-top: 26px"> <div class="time" style="margin-top: 26px">
<img <img
style="width: 15px; height: 17px" style="width: 15px; height: 17px"
src="../../assets/image/time.png" src="../../assets/image/time.png"
/> />
<div style="margin-left: 8px"> <div style="margin-left: 8px">
{{ data?.activityStartTime + "-" + data?.activityEndTime }} {{ data?.activityStartTime + "至" + data?.activityEndTime }}
</div> </div>
</div> </div>
<div class="time" style="margin-top: 23px"> <div class="time" style="margin-top: 23px">
<img <img
style="width: 16px; height: 18px" style="width: 16px; height: 18px"
src="../../assets/image/position.png" src="../../assets/image/position.png"
/> />
<div style="margin-left: 8px">{{ data?.activityAddress }}</div> <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
</div> </div>
</div> </div>
<botton <botton
class="btn" class="btn"
:style="{background:`${data.signFlag?'#999':'rgb(57, 146, 249)'}`}" :style="{
@click="signClick" background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
>{{ data.signFlag ? '已签到' : '签到' }} }"
@click="signClick"
>{{ data.signFlag ? "已签到" : "签到" }}
</botton> </botton>
</div> </div>
<!-- 基本信息 --> <!-- 基本信息 -->
@@ -64,8 +67,8 @@
<div style="margin-left: 48px; margin-right: 48px"> <div style="margin-left: 48px; margin-right: 48px">
<div class="title"> <div class="title">
<img <img
style="width: 20px; height: 20px" style="width: 20px; height: 20px"
src="../../assets/image/book.png" src="../../assets/image/book.png"
/> />
<div class="text">活动详情</div> <div class="text">活动详情</div>
<div class="box"></div> <div class="box"></div>
@@ -76,8 +79,8 @@
<div class="content"> <div class="content">
{{ {{
data?.activityDuration data?.activityDuration
? data?.activityDuration + "分钟" ? data?.activityDuration + "分钟"
: "-" : "-"
}} }}
</div> </div>
</div> </div>
@@ -92,15 +95,15 @@
<div class="content"> <div class="content">
{{ {{
data?.beforeSignIn data?.beforeSignIn
? "开始前" + data?.beforeSignIn + "分钟开始签到" ? "开始前" + data?.beforeSignIn + "分钟开始签到"
: "-" : "-"
}} }}
</div> </div>
<div class="content"> <div class="content">
{{ {{
data?.afterSignIn data?.afterSignIn
? "开始后" + data?.afterSignIn + "分钟结束签到" ? "开始后" + data?.afterSignIn + "分钟结束签到"
: "-" : "-"
}} }}
</div> </div>
</div> </div>
@@ -123,8 +126,8 @@
<div class="teacher"> <div class="teacher">
<div class="title"> <div class="title">
<img <img
style="width: 24px; height: 20px" style="width: 24px; height: 20px"
src="../../assets/image/call.png" src="../../assets/image/call.png"
/> />
<div class="text">活动公告</div> <div class="text">活动公告</div>
<div class="box"></div> <div class="box"></div>
@@ -140,27 +143,27 @@
</template> </template>
<script setup> <script setup>
import {TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY} from "@/api/api"; import { TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
import {request, useRequest} from "@/api/request"; import { request, useRequest } from "@/api/request";
import {useRoute} from "vue-router/dist/vue-router"; import { useRoute } from "vue-router/dist/vue-router";
import {ElMessage} from "element-plus"; import { ElMessage } from "element-plus";
const { const {
query: {courseId: activityId, id: taskId, type, pName, sName}, query: { courseId: activityId, id: taskId, type, pName, sName },
} = useRoute(); } = useRoute();
const {data} = useRequest(ACTIVITY, {activityId}); const { data } = useRequest(ACTIVITY, { activityId });
const signClick = (tab, event) => { const signClick = (tab, event) => {
if (data.value.signFlag) { if (data.value.signFlag) {
return; return;
} }
data.value.signFlag = true data.value.signFlag = true;
ElMessage.info("签到成功"); ElMessage.info("签到成功");
request(TASK_ACTIVITY_SIGN, { request(TASK_ACTIVITY_SIGN, {
courseId: activityId, courseId: activityId,
taskId, type taskId,
}) type,
});
}; };
</script> </script>
@@ -174,14 +177,14 @@ const signClick = (tab, event) => {
line-height: 24px; line-height: 24px;
position: relative; position: relative;
} }
.return{ .return {
position: absolute; position: absolute;
right: 10%; right: 10%;
.text{ .text {
text-align: center; text-align: center;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
} }
.preNext { .preNext {
@@ -442,9 +445,9 @@ const signClick = (tab, event) => {
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
border-radius: 8px; border-radius: 8px;
background: linear-gradient( background: linear-gradient(
180deg, 180deg,
rgba(36, 120, 255, 0.15) 0%, rgba(36, 120, 255, 0.15) 0%,
rgba(255, 255, 255) 50% rgba(255, 255, 255) 50%
); );
.title { .title {

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

@@ -382,7 +382,7 @@ const types = ref({
}, },
}); });
function toFinish(d) { function toFinish(d,sName) {
if (!types.value.path[d.type]) { if (!types.value.path[d.type]) {
ElMessage.error("暂时未开放"); ElMessage.error("暂时未开放");
return; return;
@@ -392,7 +392,7 @@ function toFinish(d) {
types.value.path[d.type] && types.value.path[d.type].startsWith("http") && window.open(types.value.path[d.type] + d.targetId) types.value.path[d.type] && types.value.path[d.type].startsWith("http") && window.open(types.value.path[d.type] + d.targetId)
types.value.path[d.type] && types.value.path[d.type].startsWith("/") && router.push({ types.value.path[d.type] && types.value.path[d.type].startsWith("/") && router.push({
path: types.value.path[d.type], path: types.value.path[d.type],
query: {id: d.routerTaskId, type: 1, courseId: d.courseId, pName: data.value.name, sName}, query: {id: d.routerTaskId, type: 2, courseId: d.courseId, pName: data.value.name, sName},
}) })
} else if (typeof types.value.path[d.type] === 'function') { } else if (typeof types.value.path[d.type] === 'function') {
types.value.path[d.type](d) types.value.path[d.type](d)

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

@@ -35,8 +35,8 @@
)" )"
:key="index" :key="index"
> >
<div> <div style="width: 70%">
<div class="coursename">{{ value.name }}</div> <div class="coursename" :title="value.name">{{ value.name }}</div>
<div class="coursetag"> <div class="coursetag">
<div <div
class="tag1" class="tag1"
@@ -339,7 +339,9 @@ const {
query: { routerId, routerName }, query: { routerId, routerName },
} = useRoute(); } = useRoute();
const router = useRouter(); const router = useRouter();
const returnclick = () => {
router.back();
};
const { data } = useRequest(ROUTER_PROCESS, { routerId }); const { data } = useRequest(ROUTER_PROCESS, { routerId });
const userInfo = computed(() => store.state.userInfo); const userInfo = computed(() => store.state.userInfo);
@@ -431,6 +433,7 @@ function toFinish(d, sName) {
}); });
} else if (typeof types.value.path[d.type] === "function") { } else if (typeof types.value.path[d.type] === "function") {
types.value.path[d.type](d); types.value.path[d.type](d);
// console.log("types.value.path[d.type](d)", d);
} }
} }
@@ -513,6 +516,9 @@ function whiteTypes(type) {
font-weight: 500; font-weight: 500;
color: #333330; color: #333330;
line-height: 24px; line-height: 24px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.coursetag { .coursetag {