Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2022-12-13 19:22:44 +08:00
13 changed files with 307 additions and 310 deletions

View File

@@ -2,25 +2,25 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10 * @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-13 18:20:41 * @LastEditTime: 2022-12-13 18:56:24
* @FilePath: /fe-stu/src/App.vue * @FilePath: /fe-stu/src/App.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
<template> <template>
<div id="container"> <div id="container">
<!-- <div id="nav">--> <div id="nav">
<!-- <router-link--> <router-link
<!-- v-for="item in routes"--> v-for="item in routes"
<!-- :key="item.path"--> :key="item.path"
<!-- :to="item.path"--> :to="item.path"
<!-- :class="{--> :class="{
<!-- link: true,--> link: true,
<!-- active: name === item.name,--> active: name === item.name,
<!-- }"--> }"
<!-- >--> >
<!-- {{ item.name }}--> {{ item.name }}
<!-- </router-link>--> </router-link>
<!-- </div>--> </div>
<main> <main>
<router-view /> <router-view />
</main> </main>

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="moreactive"> <div class="moreactive" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div class="crumb"> <div class="crumb">
<div>混合制项目</div> <div>混合制项目</div>

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="surveydetail"> <div class="surveydetail" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div <div
style="display: flex; align-items: center; justify-content: space-between" style="display: flex; align-items: center; justify-content: space-between"

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="surveydetailpage"> <div class="surveydetailpage" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div <div
style="display: flex; align-items: center; justify-content: space-between" style="display: flex; align-items: center; justify-content: space-between"
@@ -39,7 +39,7 @@
<div class="title"> <div class="title">
{{ disDetail.projectName }} {{ disDetail.projectName }}
</div> </div>
<!-- <button class="btn">回复</button>--> <!-- <button class="btn">回复</button>-->
</div> </div>
<div class="line clearfix"> <div class="line clearfix">

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="surveydetail"> <div class="surveydetail" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div <div
style="display: flex; align-items: center; justify-content: space-between" style="display: flex; align-items: center; justify-content: space-between"

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="faceteach"> <div class="faceteach" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div class="crumb"> <div class="crumb">
<div>课程列表</div> <div>课程列表</div>
@@ -14,8 +14,8 @@
<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.offcourseDto?.publishTime }}
@@ -23,13 +23,15 @@
</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>
<div class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag">评估</div> <div class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag">
评估
</div>
</div> </div>
<!-- 基本信息 --> <!-- 基本信息 -->
@@ -40,8 +42,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>
@@ -55,16 +57,16 @@
<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 data.planDto?.attach.split(',')" v-for="(el, index) in data.planDto?.attach.split(',')"
:key="index" :key="index"
v-if="data.planDto" v-if="data.planDto"
class="enclosure" class="enclosure"
:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }" :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"
> >
<div class="enclosureL"> <div class="enclosureL">
<FileTypeImg <FileTypeImg
v-model="data.planDto.attach.split(',')[index]" v-model="data.planDto.attach.split(',')[index]"
:style="{ :style="{
width: '22px', width: '22px',
height: '26px', height: '26px',
marginLeft: '10px', marginLeft: '10px',
@@ -74,8 +76,8 @@
</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)">下载</div> <div style="margin-left: 5px" @click="download(el)">下载</div>
</div> </div>
@@ -90,11 +92,7 @@
<div class="tag3" style="margin-left: 11px">作业</div> <div class="tag3" style="margin-left: 11px">作业</div>
</div> </div>
</div> </div>
<div <div class="submit" @click="toWork" v-if="data.workDto?.workId">
class="submit"
@click="toWork"
v-if="data.workDto?.workId"
>
提交 提交
</div> </div>
</div> </div>
@@ -107,8 +105,8 @@
</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>
@@ -126,15 +124,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 }}
@@ -150,27 +148,29 @@
</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 { const {
query: {courseId, type}, query: { courseId, type },
} = useRoute(); } = useRoute();
const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
const {avatar: userAvatar} = useUserInfo(computed(() => data.value?.planDto?.teacherId)) const { avatar: userAvatar } = useUserInfo(
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);
}; };
@@ -179,18 +179,25 @@ const download = (url) => {
}; };
function toSurvery() { function toSurvery() {
router.push({path: "/surveydetail", query: {courseId: data.value.planDto.evaluateId}}) router.push({
path: "/surveydetail",
query: { courseId: data.value.planDto.evaluateId },
});
} }
function toWork() { function toWork() {
router.push({ router.push({
path: "/homeworkpage", path: "/homeworkpage",
query: {courseId: data.value.workDto.workId, id: data.value.offcourseDto.categoryId, type} query: {
}) courseId: data.value.workDto.workId,
id: data.value.offcourseDto.categoryId,
type,
},
});
} }
function toExamItem(obj) { function toExamItem(obj) {
router.push({path: "/starttest", query: {id: obj.courseId}}); router.push({ path: "/starttest", query: { id: obj.courseId } });
} }
</script> </script>

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="homework"> <div class="homework" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div class="crumb"> <div class="crumb">
<div>混合制项目</div> <div>混合制项目</div>
@@ -269,10 +269,10 @@ const { textarea1 } = toRefs(state);
const router = useRouter(); const router = useRouter();
const { const {
query: { courseId: workId, type,id: taskId }, query: { courseId: workId, type, id: taskId },
} = useRoute(); } = useRoute();
const { data } = useRequest(TASK_WORK_DETAIL, { workId,taskId }); const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, { workId }); const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, { workId });
const handleClick = () => { const handleClick = () => {

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="moreactive"> <div class="moreactive" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div class="crumb"> <div class="crumb">
<div>混合制项目</div> <div>混合制项目</div>
@@ -23,15 +23,15 @@
<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">{{ data?.liveStartTime }}</div> <div style="margin-left: 8px">{{ data?.liveStartTime }}</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"
/> />
<!-- todo #直播详情 没有位置字段--> <!-- todo #直播详情 没有位置字段-->
<div style="margin-left: 8px">大族广场</div> <div style="margin-left: 8px">大族广场</div>
@@ -39,24 +39,21 @@
</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="background: rgb(57, 146, 249)" style="background: rgb(57, 146, 249)"
@click="signClick" @click="signClick"
v-if="!data.signFlag" v-if="!data.signFlag"
>签到 >签到
</botton </botton>
>
<botton class="btn" @click="commitClick" v-if="!data.evalFlag" <botton class="btn" @click="commitClick" v-if="!data.evalFlag"
>评估 >评估
</botton </botton>
>
</div> </div>
</div> </div>
<!-- 基本信息 --> <!-- 基本信息 -->
@@ -68,8 +65,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>
@@ -77,21 +74,21 @@
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<!-- todo #直播 没有课前预习字段--> <!-- todo #直播 没有课前预习字段-->
<div class="content"> <div class="content">
通过对各级人员的软件平台培训使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平最大限度发挥软件产品在企业中的作用;<br/> 通过对各级人员的软件平台培训使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平最大限度发挥软件产品在企业中的作用;<br />
培训目标 培训目标
<br/>1.使企业不同部门人员掌握便捷有效的系统平台操作方法;<br/> <br />1.使企业不同部门人员掌握便捷有效的系统平台操作方法;<br />
2.通过系统平台的培训提高员工对企业的管理理念认识与提升<br/> 2.通过系统平台的培训提高员工对企业的管理理念认识与提升<br />
3.通过系统平台培训加强沟通统一部署协同工作提高效率 3.通过系统平台培训加强沟通统一部署协同工作提高效率
<br/> <br />
培训对象<br/> 培训对象<br />
集团领导各相关部门领导总经理车间主管车间操作员等;<br/> 集团领导各相关部门领导总经理车间主管车间操作员等;<br />
</div> </div>
</div> </div>
<div class="title"> <div class="title">
<img <img
style="width: 20px; height: 20px" style="width: 20px; height: 20px"
src="../../assets/image/write.png" src="../../assets/image/write.png"
/> />
<!-- todo #直播 课后作业--> <!-- todo #直播 课后作业-->
<div class="text">课后作业</div> <div class="text">课后作业</div>
@@ -100,9 +97,9 @@
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<div class="content"> <div class="content">
<span style="font-weight: 600" <span style="font-weight: 600"
>网易有道词典现有功能结构拆解+问题分析</span >网易有道词典现有功能结构拆解+问题分析</span
><br/> ><br />
查找资料介绍一种国外日本美国欧洲道路公路铁路城市道路地铁设计规范的演变过程可以一种或几种主要技术指标为例并说明其原因<br/> 查找资料介绍一种国外日本美国欧洲道路公路铁路城市道路地铁设计规范的演变过程可以一种或几种主要技术指标为例并说明其原因<br />
</div> </div>
</div> </div>
</div> </div>
@@ -112,8 +109,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>
@@ -123,18 +120,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 }}
@@ -151,26 +148,24 @@
</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 { import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
TASK_BROADCAST_DETAIL, import { useRoute } from "vue-router/dist/vue-router";
TASK_BROADCAST_SIGN, import { useRouter } from "vue-router";
} from "@/api/api"; import { useUserInfo } from "@/api/utils";
import {useRoute} from "vue-router/dist/vue-router";
import {useRouter} from "vue-router";
import {useUserInfo} from "@/api/utils";
const { const {
query: {courseId: liveId}, query: { courseId: liveId },
} = useRoute(); } = useRoute();
const router = useRouter() const router = useRouter();
const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId}); const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });
const {avatar: userAvatar} = useUserInfo(computed(() => data.value.userInfoBo?.userId))
const { avatar: userAvatar } = useUserInfo(
computed(() => data.value.userInfoBo?.userId)
);
const state = reactive({ const state = reactive({
activeName: "first", activeName: "first",
@@ -179,24 +174,26 @@ 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 = () => {
data.value.signFlag = 1 data.value.signFlag = 1;
request(TASK_BROADCAST_SIGN, {courseId: liveId}) request(TASK_BROADCAST_SIGN, { courseId: liveId });
}; };
const commitClick = () => { const commitClick = () => {
router.push({path: '/surveydetail', query: {courseId: data.value.assessmentId}}) router.push({
path: "/surveydetail",
query: { courseId: data.value.assessmentId },
});
}; };
function showClick() { function showClick() {
window.open(data.value.liveLink) window.open(data.value.liveLink);
} }
</script> </script>
<!-- Add "scoped" attribute to limit CSS to this component only --> <!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -483,9 +480,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 {

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="moreactive"> <div class="moreactive" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div class="crumb"> <div class="crumb">
<div>混合制项目</div> <div>混合制项目</div>
@@ -128,8 +128,10 @@
<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";
const {query: {courseId: activityId}} = useRoute() const {
query: { courseId: activityId },
} = useRoute();
const { data } = useRequest(ACTIVITY, { activityId }); const { data } = useRequest(ACTIVITY, { activityId });
console.log("data", data); console.log("data", data);

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="pathdetails"> <div class="pathdetails" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div class="crumb"> <div class="crumb">
<div>产品经理学习路径图</div> <div>产品经理学习路径图</div>
@@ -14,35 +14,33 @@
<div v-for="(i, k) in data.stageProcessList" :key="k"> <div v-for="(i, k) in data.stageProcessList" :key="k">
<div class="title"> <div class="title">
<div class="titleL">{{ i.stageName }}</div> <div class="titleL">{{ i.stageName }}</div>
<div <div class="titleR" :style="{ display: 'flex' }">
class="titleR" <img src="../../assets/image/pathdetails/circle.png" />
:style="{ display: 'flex' }"
>
<img src="../../assets/image/pathdetails/circle.png"/>
<div class="titleRT">进行中</div> <div class="titleRT">进行中</div>
</div> </div>
<div <div
class="titleR" class="titleR"
:style="{ display: i.status === 2 ? 'flex' : 'none' }" :style="{ display: i.status === 2 ? 'flex' : 'none' }"
> >
<img src="../../assets/image/pathdetails/circle2.png"/> <img src="../../assets/image/pathdetails/circle2.png" />
<div class="titleRT" style="color: rgba(102, 102, 102, 1)"> <div class="titleRT" style="color: rgba(102, 102, 102, 1)">
未开始 未开始
</div> </div>
</div> </div>
</div> </div>
<div <div
class="course" class="course"
v-for="(value, index) in i.taskProcessList" v-for="(value, index) in i.taskProcessList"
:key="index" :key="index"
> >
<div> <div>
<div class="coursename">{{ value.name }}</div> <div class="coursename">{{ value.name }}</div>
<div class="coursetag"> <div class="coursetag">
<div class="tag1" style="margin-right: 11px; margin-top: 16px">必修</div> <div class="tag1" style="margin-right: 11px; margin-top: 16px">
<div class="tag3" style="margin-right: 11px; margin-top: 16px">{{ 必修
types.typeName[value.type] || '' </div>
}} <div class="tag3" style="margin-right: 11px; margin-top: 16px">
{{ types.typeName[value.type] || "" }}
</div> </div>
<!-- <div--> <!-- <div-->
@@ -55,45 +53,44 @@
<!-- </div>--> <!-- </div>-->
</div> </div>
<div <div
class="progressBox" class="progressBox"
:style="{ display: value.status === 1 ? 'block' : 'none' }" :style="{ display: value.status === 1 ? 'block' : 'none' }"
> >
<div>当前进度</div> <div>当前进度</div>
<div class="progress"> <div class="progress">
<div style="width: 291px"> <div style="width: 291px">
<el-progress <el-progress
:percentage="value.currentRatio" :percentage="value.currentRatio"
:show-text="false" :show-text="false"
:stroke-width="8" :stroke-width="8"
: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)',
2:'rgba(39, 122, 255, 1)', 2: 'rgba(39, 122, 255, 1)',
3:'rgba(59, 94, 251, 1)', 3: 'rgba(59, 94, 251, 1)',
4:'rgba(57, 219, 183, 1)', 4: 'rgba(57, 219, 183, 1)',
5:'rgba(57, 219, 183, 1)' 5: 'rgba(57, 219, 183, 1)',
}[parseInt(value.currentRatio/20)] }[parseInt(value.currentRatio / 20)]
" "
/> />
</div> </div>
<div <div
style=" style="
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #277aff; color: #277aff;
margin-left: 10px; 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)', 2: 'rgba(39, 122, 255, 1)',
2:'rgba(39, 122, 255, 1)', 3: 'rgba(59, 94, 251, 1)',
3:'rgba(59, 94, 251, 1)', 4: 'rgba(57, 219, 183, 1)',
4:'rgba(57, 219, 183, 1)', 5: 'rgba(57, 219, 183, 1)',
5:'rgba(57, 219, 183, 1)' }[parseInt(value.currentRatio / 20)],
}[parseInt(value.currentRatio/20)]
}" }"
> >
{{ value.currentRatio }}% {{ value.currentRatio }}%
@@ -102,9 +99,7 @@
</div> </div>
</div> </div>
<div class="goclass" @click="toFinish(value)"> <div class="goclass" @click="toFinish(value)">
{{ {{ types.toName[value.type] || "" }}
types.toName[value.type] || ''
}}
</div> </div>
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">--> <!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
<!-- <div--> <!-- <div-->
@@ -133,29 +128,29 @@
<div class="notice"> <div class="notice">
请各位选课的同学提前阅读本课程的 请各位选课的同学提前阅读本课程的
教学大纲与计划课程考核要求学习要求 教学大纲与计划课程考核要求学习要求
并按给定的中学化学教学主题分好小组 <br/> 并按给定的中学化学教学主题分好小组 <br />
每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据<br/> 每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据<br />
请大家务必在规定的时间内提交作业否则会被系统自动记录为迟交未交则会影响线上参与的平时成 请大家务必在规定的时间内提交作业否则会被系统自动记录为迟交未交则会影响线上参与的平时成
<br/> <br />
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="共享文档" name="second"> <el-tab-pane label="共享文档" name="second">
<div style="padding: 19px 30px 17px 28px"> <div style="padding: 19px 30px 17px 28px">
<div <div
v-for="(value, index) in sharedoc" v-for="(value, index) in sharedoc"
:key="index" :key="index"
style=" style="
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 15px; margin-bottom: 15px;
" "
> >
<img :src="value.img" style="width: 22px; height: 26px"/> <img :src="value.img" style="width: 22px; height: 26px" />
<div class="sharedocname">{{ value.name }}</div> <div class="sharedocname">{{ value.name }}</div>
<div class="download"> <div class="download">
<img <img
src="../../assets/image/download.png" src="../../assets/image/download.png"
style="width: 16px; height: 15px" style="width: 16px; height: 15px"
/> />
<div style="margin-left: 7px">下载</div> <div style="margin-left: 7px">下载</div>
</div> </div>
@@ -170,23 +165,25 @@
<div class="info"> <div class="info">
<div class="title"> <div class="title">
<img <img
style="width: 21px; height: 20px" style="width: 21px; height: 20px"
src="../../assets/image/pathdetails/info.png" src="../../assets/image/pathdetails/info.png"
/> />
<div class="text" style="margin-left: 7px">个人信息</div> <div class="text" style="margin-left: 7px">个人信息</div>
<div class="box"></div> <div class="box"></div>
</div> </div>
<!-- todo #路径详情 个人信息缺少img和介绍--> <!-- todo #路径详情 个人信息缺少img和介绍-->
<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="data.userInfoBo?.peopleimg"/> <img class="peopleimg" :src="data.userInfoBo?.peopleimg" />
<div style="margin-left: 17px"> <div style="margin-left: 17px">
<div class="teacherName"> <div class="teacherName">
<div style="margin-right: 5px">{{ data.userInfoBo?.userName }}</div> <div style="margin-right: 5px">
{{ data.userInfoBo?.userName }}
</div>
<div v-for="(item, key) in data.userInfoBo?.medal" :key="key"> <div v-for="(item, key) in data.userInfoBo?.medal" :key="key">
<img class="teacherMedal" :src="item"/> <img class="teacherMedal" :src="item" />
</div> </div>
</div> </div>
<div class="introduce">{{ data.userInfoBo?.introduce }}</div> <div class="introduce">{{ data.userInfoBo?.introduce }}</div>
@@ -196,8 +193,8 @@
<div class="info" style="padding-top: 20px"> <div class="info" style="padding-top: 20px">
<div class="title"> <div class="title">
<img <img
style="width: 18px; height: 17px" style="width: 18px; height: 17px"
src="../../assets/image/pathdetails/study.png" src="../../assets/image/pathdetails/study.png"
/> />
<div class="text" style="margin-left: 9px">学习进度</div> <div class="text" style="margin-left: 9px">学习进度</div>
<div class="box"></div> <div class="box"></div>
@@ -212,36 +209,32 @@
<div class="progress"> <div class="progress">
<div style="width: 291px"> <div style="width: 291px">
<el-progress <el-progress
:percentage="data.totalChapterCnt" :percentage="data.totalChapterCnt"
:show-text="false" :show-text="false"
:stroke-width="8" :stroke-width="8"
: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)',
2:'rgba(39, 122, 255, 1)', 2: 'rgba(39, 122, 255, 1)',
3:'rgba(59, 94, 251, 1)', 3: 'rgba(59, 94, 251, 1)',
4:'rgba(57, 219, 183, 1)', 4: 'rgba(57, 219, 183, 1)',
5:'rgba(57, 219, 183, 1)' 5: 'rgba(57, 219, 183, 1)',
}[parseInt(data.totalChapterCnt/20)] }[parseInt(data.totalChapterCnt / 20)]
" "
/> />
</div> </div>
<div <div
style=" style="font-size: 14px; font-weight: 500; margin-left: 10px"
font-size: 14px; :style="{
font-weight: 500;
margin-left: 10px;
"
: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)',
2:'rgba(39, 122, 255, 1)', 2: 'rgba(39, 122, 255, 1)',
3:'rgba(59, 94, 251, 1)', 3: 'rgba(59, 94, 251, 1)',
4:'rgba(57, 219, 183, 1)', 4: 'rgba(57, 219, 183, 1)',
5:'rgba(57, 219, 183, 1)' 5: 'rgba(57, 219, 183, 1)',
}[parseInt(data.totalChapterCnt/20)] }[parseInt(data.totalChapterCnt / 20)],
}" }"
> >
{{ data.totalChapterCnt }}% {{ data.totalChapterCnt }}%
@@ -255,38 +248,37 @@
<div class="progress"> <div class="progress">
<div style="width: 291px"> <div style="width: 291px">
<el-progress <el-progress
:percentage="data.currentChapterCnt" :percentage="data.currentChapterCnt"
:show-text="false" :show-text="false"
:stroke-width="8" :stroke-width="8"
: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)',
2:'rgba(39, 122, 255, 1)', 2: 'rgba(39, 122, 255, 1)',
3:'rgba(59, 94, 251, 1)', 3: 'rgba(59, 94, 251, 1)',
4:'rgba(57, 219, 183, 1)', 4: 'rgba(57, 219, 183, 1)',
5:'rgba(57, 219, 183, 1)' 5: 'rgba(57, 219, 183, 1)',
}[parseInt(data.currentChapterCnt/20)] }[parseInt(data.currentChapterCnt / 20)]
" "
/> />
</div> </div>
<div <div
style=" style="
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #277aff; color: #277aff;
margin-left: 10px; 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)', 2: 'rgba(39, 122, 255, 1)',
2:'rgba(39, 122, 255, 1)', 3: 'rgba(59, 94, 251, 1)',
3:'rgba(59, 94, 251, 1)', 4: 'rgba(57, 219, 183, 1)',
4:'rgba(57, 219, 183, 1)', 5: 'rgba(57, 219, 183, 1)',
5:'rgba(57, 219, 183, 1)' }[parseInt(data.currentChapterCnt / 20)],
}[parseInt(data.currentChapterCnt/20)]
}" }"
> >
{{ data.currentChapterCnt }}% {{ data.currentChapterCnt }}%
@@ -304,24 +296,25 @@
</template> </template>
<script setup> <script setup>
import {reactive, ref} from "vue"; import { reactive, ref } from "vue";
import word from '@/assets/image/file/word.png' import word from "@/assets/image/file/word.png";
import ppt from '@/assets/image/file/ppt.png' import ppt from "@/assets/image/file/ppt.png";
import pdf from '@/assets/image/file/pdf.png' import pdf from "@/assets/image/file/pdf.png";
import zip from '@/assets/image/file/zip.png' import zip from "@/assets/image/file/zip.png";
import md from '@/assets/image/file/md.png' import md from "@/assets/image/file/md.png";
import medal1 from '@/assets/image/medal/medal1.png' import medal1 from "@/assets/image/medal/medal1.png";
import medal2 from '@/assets/image/medal/medal2.png' import medal2 from "@/assets/image/medal/medal2.png";
import medal3 from '@/assets/image/medal/medal3.png' import medal3 from "@/assets/image/medal/medal3.png";
import img from '@/assets/image/uploadimg.png' import img from "@/assets/image/uploadimg.png";
import {useRequest} from "@/api/request"; import { useRequest } from "@/api/request";
import {PROJECT_PROCESS, ROUTER_PROCESS} from "@/api/api"; import { PROJECT_PROCESS, ROUTER_PROCESS } from "@/api/api";
import {useRoute, useRouter} from "vue-router"; import { useRoute, useRouter } from "vue-router";
const {
const {query: {projectId}} = useRoute() query: { projectId },
const router = useRouter() } = useRoute();
const {data} = useRequest(PROJECT_PROCESS, {projectId}) const router = useRouter();
const { data } = useRequest(PROJECT_PROCESS, { projectId });
const state = reactive({ const state = reactive({
course: [ course: [
{ {
@@ -497,75 +490,73 @@ const state = reactive({
name: "王星天(显示事业)", name: "王星天(显示事业)",
introduce: "教师是学生的镜子,学生是老师的影子。", introduce: "教师是学生的镜子,学生是老师的影子。",
peopleimg: img, peopleimg: img,
medal: [ medal: [medal1, medal2, medal3],
medal1,
medal2,
medal3,
],
}, },
], ],
}); });
const activeName = ref('first') const activeName = ref("first");
const totalprogress = ref(30) const totalprogress = ref(30);
const compulsoryprogress = ref(10) const compulsoryprogress = ref(10);
const handleClick = (tab, event) => { const handleClick = (tab, event) => {
console.log(tab, event); console.log(tab, event);
}; };
const path = {1: 'path'} const path = { 1: "path" };
const types = ref({ const types = ref({
typeName: { typeName: {
1: '在线', 1: "在线",
2: '面授', 2: "面授",
3: '案例', 3: "案例",
4: '作业', 4: "作业",
5: '考试', 5: "考试",
6: '直播', 6: "直播",
7: '外链', 7: "外链",
8: '讨论', 8: "讨论",
9: '活动', 9: "活动",
10: '测评', 10: "测评",
11: '评估', 11: "评估",
12: '投票', 12: "投票",
13: '项目', 13: "项目",
}, },
toName: { toName: {
1: '去上课', 1: "去上课",
2: '去上课', 2: "去上课",
3: '案例', 3: "案例",
4: '去完成', 4: "去完成",
5: '去完成', 5: "去完成",
6: '去签到', 6: "去签到",
7: '外链', 7: "外链",
8: '去讨论', 8: "去讨论",
9: '去完成', 9: "去完成",
10: '去完成', 10: "去完成",
11: '去完成', 11: "去完成",
12: '去投票', 12: "去投票",
13: '去完成', 13: "去完成",
}, },
path: { path: {
1: '去上课', 1: "去上课",
2: '/faceteach', 2: "/faceteach",
3: '案例', 3: "案例",
4: '/homeworkpage', 4: "/homeworkpage",
5: '去完成', 5: "去完成",
6: '/livebroadcast', 6: "/livebroadcast",
7: '外链', 7: "外链",
8: '/discusspage', 8: "/discusspage",
9: '/moreactive', 9: "/moreactive",
10: '/starttest', 10: "/starttest",
11: '/surveydetail', 11: "/surveydetail",
12: '/ballotpage', 12: "/ballotpage",
13: '去完成' 13: "去完成",
} },
}) });
function toFinish(d) { function toFinish(d) {
router.push({path: types.value.path[d.type], query: {id: d.projectTaskId, type: 2, courseId: d.courseId}}) router.push({
path: types.value.path[d.type],
query: { id: d.projectTaskId, type: 2, courseId: d.courseId },
});
} }
</script> </script>
<!-- Add "scoped" attribute to limit CSS to this component only --> <!-- Add "scoped" attribute to limit CSS to this component only -->

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="surveydetail"> <div class="surveydetail" style="padding: 30px">
<!-- 标题 --> <!-- 标题 -->
<div class="title">考试模式</div> <div class="title">考试模式</div>
<!-- 标题 --> <!-- 标题 -->

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="surveydetail"> <div class="surveydetail" style="padding: 30px">
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<div <div
style="display: flex; align-items: center; justify-content: space-between" style="display: flex; align-items: center; justify-content: space-between"

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="surveydetail"> <div class="surveydetail" style="padding: 30px">
<!-- 标题 --> <!-- 标题 -->
<div class="title">考试模式</div> <div class="title">考试模式</div>
<!-- 标题 --> <!-- 标题 -->