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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-21 16:18:58 +08:00
parent 40cf3a8bff d1fb89ac14
commit 3da28419ae
4 changed files with 1234 additions and 1373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/img/UploadImg.vue
View File

@@ -1,14 +1,6 @@
<template>
<el-upload
:file-list="files"
:action="FILE_UPLOAD"
method="POST"
:show-file-list="false"
:on-change="handleChange"
:limit="max"
ref="imageRef"
:on-exceed="exceed"
>
<el-upload :file-list="files" :action="FILE_UPLOAD" method="POST" :show-file-list="false" :on-change="handleChange"
:limit="max" ref="imageRef" :on-exceed="exceed">
<template #trigger>
<div>
<slot></slot>
@@ -58,6 +50,8 @@ function handleChange(e) {
function remove(i) {
files.value.splice(i, 1)
console.log(imageRef)
imageRef.value.clearFiles();
}
function reUpload(i) {

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

@@ -17,12 +17,8 @@
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2"
style="margin-right: 22px"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
<img class="img2" style="margin-right: 22px;cursor: pointer;" src="../../assets/image/return.png" />
<div style="cursor: pointer;" class="text">返回</div>
</div>
</div>
</div>
@@ -34,19 +30,14 @@
<div class="detailinfo">
<div class="detail">
<div class="detailT">
<div
style="
<div style="
margin-left: 45px;
margin-right: 42px;
position: relative;
width: 100%;
"
>
">
<div class="title">
<img
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>
<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
<div class="text">作业名称</div>
<div class="box"></div>
</div>
@@ -58,38 +49,22 @@
</div>
</div>
<UploadImg v-model:value="fileList" ref="uploadRef">
<button
class="shangchuan"
style="cursor: pointer"
>
<button class="shangchuan" style="cursor: pointer">
上传
</button>
</UploadImg>
<div
class="uploadDetail"
<div class="uploadDetail"
:style="{ display: showFileList && fileList && fileList.length > 0 ? 'block' : 'none' }"
@mousemove="showFileList = 1"
@mouseout="showFileList = 0"
style="padding-top: 60px"
>
@mousemove="showFileList = 1" @mouseout="showFileList = 0" style="padding-top: 60px">
<div class="triangle"></div>
<div class="square clearfix">
<div
class="squarecontent1"
v-for="(file, i) in fileList"
:key="i"
>
<FileTypeImg
v-model="file.name"
:style="{ margin: '12px 15px 0 27px' }"
></FileTypeImg>
<div class="squarecontent1" v-for="(file, i) in fileList" :key="i">
<FileTypeImg v-model="file.name" :style="{ margin: '12px 15px 0 27px' }"></FileTypeImg>
<div class="rarDetail">
<span class="detail1" style="margin-right: 130px">
{{ file.name }}
</span>
<span class="detail2" style="margin-right: 10px"
>{{ file.percentage }}%</span
>
<span class="detail2" style="margin-right: 10px">{{ file.percentage }}%</span>
<span class="detail1">{{
{
ready: "正在上传",
@@ -100,10 +75,7 @@
}[file.status]
}}</span>
<div class="progress">
<div
class="progressinner"
:style="{ width: `${(291 * file.percentage) / 100}px` }"
></div>
<div class="progressinner" :style="{ width: `${(291 * file.percentage) / 100}px` }"></div>
</div>
</div>
<button class="btn btndetail" @click="reUpload(i)">
@@ -132,24 +104,18 @@
</div>
<div class="title">
<img
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>
<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
<div class="text">作业内容</div>
<div class="box"></div>
</div>
<div class="join">
<el-input
v-model="sbValue.content"
:autosize="{ minRows: 12.5, maxRows: 12.5 }"
resize="none"
type="textarea"
/>
<el-input v-model="sbValue.content" :autosize="{ minRows: 12.5, maxRows: 12.5 }" resize="none"
type="textarea" />
</div>
<div style="display: flex; justify-content: center">
<button class="tijiao" @click="handleClick">{{submitList && submitList.length>0?"再次":""}}提交</button>
<button class="tijiao" @click="handleClick">{{ submitList && submitList.length > 0 ? "再次" : ""
}}提交</button>
</div>
@@ -158,11 +124,8 @@
<div class=""></div>
<div class="title" style="margin-top: 0px">
<img
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>
<div class="text">历史纪录</div>
<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
<div class="text">历史记录</div>
<div class="box"></div>
</div>
@@ -172,17 +135,12 @@
<div class="content2">作业内容</div>
<div class="content3">附件</div>
</div>
<div
v-for="(value, index) in submitList"
:key="index"
class="historytitle2"
:style="{
<div v-for="(value, index) in submitList" :key="index" class="historytitle2" :style="{
'border-bottom':
index === submitList.length - 1
? '1px solid rgba(215, 229, 253, 0)'
: '1px solid rgba(215, 229, 253, 1)',
}"
>
}">
<div class="content1">{{ value.createTime }}</div>
<div class="content2">
<div>
@@ -194,7 +152,10 @@
<div>
<span style="margin-left: 10px">
<el-link target="_blank" type="primary" :href="value.workUploadAddress?.split(',')[0] || ''">{{value.workUploadAddress?.split(',')[0].split('/').at(-1)|| ''}}</el-link>
<el-link target="_blank" type="primary" :href="value.workUploadAddress?.split(',')[0] || ''">{{
value.workUploadAddress?.split(',')[0].split('/').at(-1) ||
''
}}</el-link>
</span>
</div>
</div>
@@ -205,10 +166,7 @@
</div>
<div class="right">
<div class="righttitle">
<img
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>
<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
<div class="text">截止时间</div>
<div class="box"></div>
</div>
@@ -227,30 +185,21 @@
parseInt(
dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60
)
}}</span
>&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
}}</span>&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60
}}</span
>&nbsp;&nbsp;分钟
}}</span>&nbsp;&nbsp;分钟
</div>
</div>
</div>
<div class="righttitle">
<img
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>
<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
<div class="text">作业说明</div>
<div class="box"></div>
</div>
<div class="explain clearfix">
<!-- todo #作业任务详情 作业说明是作业要求字段么？-->
<div
class="explain1"
style="margin-top: 26px"
v-html="data?.workRequirement"
></div>
<div class="explain1" style="margin-top: 26px" v-html="data?.workRequirement"></div>
</div>
</div>
</div>
@@ -263,8 +212,12 @@
</span></div>
<template #footer>
<span class="dialog-footer">
<el-button class="cancel" style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;" @click="centerDialogVisible = false">取消</el-button>
<el-button class="back" style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;" type="primary" @click="returnclick">
<el-button class="cancel"
style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"
@click="centerDialogVisible = false">取消</el-button>
<el-button class="back"
style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;"
type="primary" @click="returnclick">
返回
</el-button>
</span>
@@ -319,10 +272,13 @@ const showFileList = computed(()=>{
})
const handleClick = () => {
console.log(fileList.value, uploadRef.value)
if (!sbValue.value.content) {
if (fileList.value.length == 0) {
return ElMessage.warning("请输入作业内容");
}
}
request(TASK_WORK_COMMIT, {
projectOrRouterLogo: type,
workUploadContent: sbValue.value.content,
@@ -337,6 +293,7 @@ const handleClick = () => {
});
sbValue.value.content = "";
fileList.value = [];
remove(0);
};
function remove(i) {
@@ -358,9 +315,11 @@ function reUpload(i) {
line-height: 24px;
position: relative;
}
.return {
position: absolute;
right: 10%;
.text {
text-align: center;
display: flex;
@@ -368,6 +327,7 @@ function reUpload(i) {
align-items: center;
}
}
.preNext {
position: absolute;
right: 0px;
@@ -703,11 +663,13 @@ function reUpload(i) {
.content2 {
margin-top: 14px;
margin-left: 20px;
width:460px;;
width: 460px;
;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.content3 {
margin-top: 14px;
margin-left: 20px;
@@ -771,27 +733,21 @@ function reUpload(i) {
margin-top: 43px;
.allbox1 {
background: linear-gradient(
0deg,
background: linear-gradient(0deg,
rgba(160, 193, 230, 0) 0%,
rgba(161, 195, 231, 0.2) 100%
);
rgba(161, 195, 231, 0.2) 100%);
}
.allbox2 {
background: linear-gradient(
0deg,
background: linear-gradient(0deg,
rgba(177, 219, 229, 0) 0%,
rgba(172, 216, 227, 0.2) 100%
);
rgba(172, 216, 227, 0.2) 100%);
}
.allbox3 {
background: linear-gradient(
0deg,
background: linear-gradient(0deg,
rgba(195, 209, 234, 0) 0%,
rgba(191, 206, 231, 0.2) 100%
);
rgba(191, 206, 231, 0.2) 100%);
}
.item {
@@ -917,13 +873,16 @@ function reUpload(i) {
}
}
}
.el-dialog {
color: black;
text-align: center;
font-size: 16px;
.title {
text-align: center;
}
.dialog-footer {
.back {
background: #387DF7;
@@ -932,6 +891,7 @@ function reUpload(i) {
padding: 8px 32px;
border-radius: 4px;
}
.cancel {
background: #387DF7;
border: 0px;
@@ -943,6 +903,4 @@ function reUpload(i) {
}
}
}
</style>

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

@@ -12,8 +12,8 @@
<div class="detailinfo">
<div class="detailL">
<div v-for="(i, k) in data.stageProcessList" :key="k">
<div v-if="i.stageId !== '0'">
<div class="title">
<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
<div v-else class="title">
<div class="titleL">{{ i.stageName }}</div>
<div class="titleR" :style="{ display: 'flex' }">
<img src="../../assets/image/pathdetails/circle.png" />
@@ -29,7 +29,9 @@
</div>
</div>
</div>
<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
<div
v-else
class="course"
v-for="(value, index) in i.taskProcessList.filter(
(e) => !whiteTypes(e.type)
@@ -39,19 +41,12 @@
<div style="width: 70%">
<div class="coursename">{{ value.name }}</div>
<div class="coursetag">
<div
class="tag1"
style="margin-right: 11px; margin-top: 16px"
>
<div class="tag1" style="margin-right: 11px; margin-top: 16px">
必修
</div>
<div
class="tag3"
style="margin-right: 11px; margin-top: 16px"
>
<div class="tag3" style="margin-right: 11px; margin-top: 16px">
{{ types.typeName[value.type] || "" }}
</div>
<!-- <div-->
<!-- v-for="(item, key) in value.flag"-->
<!-- :key="key"-->
@@ -129,7 +124,6 @@
<!-- </div>-->
</div>
</div>
</div>
<!-- <div class="tag1">必修</div>
<div class="tag2">选修</div>
<div class="tag3">测评</div>
@@ -216,7 +210,6 @@
<div class="ratetext">上次学到：启航班-领导寄语</div>
<div class="ratebtn">继续学习</div>
</div>-->
<div style="margin-top: 16px">
<div class="progressBox">
<div>总进度</div>
@@ -308,7 +301,6 @@
<!-- 详细信息 -->
</div>
</template>
<script setup>
import { computed, reactive, ref } from "vue";
import word from "@/assets/image/file/word.png";
@@ -330,7 +322,6 @@ import {
import { useRoute, useRouter } from "vue-router";
import store from "@/store";
import { ElMessage } from "element-plus";
const {
query: { courseId, projectId },
} = useRoute();
@@ -343,14 +334,11 @@ const { data } = useRequest(PROJECT_PROCESS, {
});
console.log("datadata", data);
const userInfo = computed(() => store.state.userInfo);
const activeName = ref("first");
const handleClick = (tab, event) => {
console.log(tab, event);
};
const path = { 1: "path" };
const types = ref({
typeName: {
1: "在线",
@@ -406,7 +394,6 @@ const types = ref({
13: "/projectdetails",
},
});
function toFinish(d, sName, chapterId) {
console.log("dddddd", d);
if (!types.value.path[d.type]) {
@@ -446,7 +433,6 @@ function whiteTypes(type) {
return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-");
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss">
.pathdetails {
@@ -456,19 +442,16 @@ function whiteTypes(type) {
font-size: 14px;
line-height: 24px;
}
.pdname {
font-size: 20px;
font-weight: 800;
color: #ffffff;
margin-top: 17px;
}
.detailinfo {
width: 100%;
margin-top: 24px;
display: flex;
.detailL {
flex: 1;
margin-right: 20px;
@@ -477,7 +460,6 @@ function whiteTypes(type) {
padding-left: 45px;
padding-right: 45px;
padding-top: 23px;
.title {
height: 50px;
display: flex;
@@ -486,19 +468,16 @@ function whiteTypes(type) {
background-color: rgba(249, 249, 249, 1);
margin-top: 27px;
margin-bottom: 19px;
.titleL {
font-size: 16px;
font-weight: 800;
color: #333333;
margin-left: 27px;
}
.titleR {
display: flex;
align-items: center;
}
.titleR .titleRT {
font-size: 16px;
font-weight: 800;
@@ -507,7 +486,6 @@ function whiteTypes(type) {
margin-left: 2px;
}
}
.course {
display: flex;
align-items: center;
@@ -515,7 +493,6 @@ function whiteTypes(type) {
flex-wrap: wrap;
margin-bottom: 32px;
margin-left: 26px;
.coursename {
font-size: 14px;
font-weight: 500;
@@ -525,28 +502,23 @@ function whiteTypes(type) {
text-overflow: ellipsis;
white-space: nowrap;
}
.coursetag {
display: flex;
flex-wrap: wrap;
}
.progressBox {
font-size: 14px;
font-weight: 500;
color: #677d86;
margin-top: 24px;
.progress {
display: flex;
align-items: center;
}
.progress .el-progress-bar__outer {
background-color: rgba(232, 241, 254, 1);
}
}
.goclass {
width: 126px;
height: 46px;
@@ -564,26 +536,21 @@ function whiteTypes(type) {
}
}
}
.detailR {
width: 434px;
.detailRT {
min-height: 298px;
background: #ffffff;
border-radius: 8px;
.el-tabs__item {
height: 56px;
padding: 10px 33px 0px 27px;
font-size: 14px;
font-weight: 500;
}
.el-tabs__nav-wrap::after {
background-color: rgba(56, 125, 247, 0.2);
}
.notice {
padding: 15px 43px 30px 47px;
font-size: 14px;
@@ -591,7 +558,6 @@ function whiteTypes(type) {
color: #333330;
line-height: 24px;
}
.sharedocname {
width: 259px;
font-size: 14px;
@@ -600,7 +566,6 @@ function whiteTypes(type) {
margin-left: 20px;
line-height: 24px;
}
.download {
display: flex;
align-items: center;
@@ -611,13 +576,11 @@ function whiteTypes(type) {
color: #2478ff;
}
}
.detailRB {
min-height: 459px;
background: #ffffff;
border-radius: 8px;
margin-top: 17px;
.info .title {
display: flex;
align-items: center;
@@ -625,14 +588,12 @@ function whiteTypes(type) {
position: relative;
margin-left: 48px;
}
.info .title .text {
margin-left: 8px;
font-size: 16px;
color: rgba(51, 51, 51, 1);
font-weight: 800;
}
.info .title .box {
width: 75px;
height: 10px;
@@ -641,7 +602,6 @@ function whiteTypes(type) {
left: 23px;
top: 53px;
}
.info .teacheritem {
margin-left: 48px;
margin-right: 48px;
@@ -649,13 +609,11 @@ function whiteTypes(type) {
display: flex;
// align-items: center;
}
.info .teacheritem .peopleimg {
width: 60px;
height: 60px;
border-radius: 30px;
}
.info .teacheritem .teacherName {
font-size: 14px;
font-weight: bold;
@@ -664,7 +622,6 @@ function whiteTypes(type) {
align-items: center;
width: 260px;
}
.info .teacheritem .teacherName .teacherMedal {
width: 17px;
height: 19px;
@@ -672,7 +629,6 @@ function whiteTypes(type) {
display: flex;
align-items: center;
}
.info .teacheritem .introduce {
width: 260px;
font-size: 14px;
@@ -681,7 +637,6 @@ function whiteTypes(type) {
margin-top: 14px;
line-height: 24px;
}
.info .rate {
display: flex;
align-items: center;
@@ -690,7 +645,6 @@ function whiteTypes(type) {
margin-left: 48px;
margin-right: 26px;
}
.info .rate .ratetext {
width: 259px;
font-size: 14px;
@@ -698,7 +652,6 @@ function whiteTypes(type) {
color: #677d86;
line-height: 24px;
}
.info .rate .ratebtn {
width: 86px;
height: 36px;
@@ -713,19 +666,16 @@ function whiteTypes(type) {
align-items: center;
justify-content: center;
}
.info .progressBox {
font-size: 14px;
font-weight: 500;
color: #677d86;
margin-top: 16px;
margin-left: 44px;
.progress {
display: flex;
align-items: center;
}
.progress .el-progress-bar__outer {
background-color: rgba(232, 241, 254, 1);
}

75
src/views/roadmap/LearnPath.vue
View File

@@ -5,17 +5,11 @@
<div class="titleL">
<div @click="returnfun" class="text">学习路径图</div>
<div class="info" style="margin-right: 14px" v-if="userInfo.jobName">
<img
style="width: 20px; height: 18px; margin-right: 10px"
src="../../assets/image/pm.png"
/>
<img style="width: 20px; height: 18px; margin-right: 10px" src="../../assets/image/pm.png" />
<div style="margin-top: 1px">{{ userInfo.jobName }}</div>
</div>
<div class="info" v-if="userInfo.bandDesc">
<img
style="width: 18px; height: 17px; margin-right: 11px"
src="../../assets/image/band.png"
/>
<img style="width: 18px; height: 17px; margin-right: 11px" src="../../assets/image/band.png" />
<div style="margin-top: 2px">{{ userInfo.bandDesc }}</div>
</div>
</div>
@@ -57,11 +51,7 @@
<!-- </template>-->
<!-- </el-popover>-->
</div>
<div
:style="{ display: showmapdetail ? 'flex' : 'none' }"
class="titleR"
@click="returnfun"
>
<div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="titleR" @click="returnfun">
返回列表
</div>
</div>
@@ -69,51 +59,21 @@
<div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
<div style="min-width: 770px; width: 100%">
<el-table :data="data" style="width: 100%" @row-click="gofun">
<el-table-column
prop="img"
label="缩略图"
#default="scope"
align="center"
width="255"
>
<img
:src="scope.row.picUrl"
style="width: 230px; height: 155px"
/>
<el-table-column prop="img" label="缩略图" #default="scope" align="center" width="255">
<img :src="scope.row.picUrl" style="width: 230px; height: 155px" />
</el-table-column>
<el-table-column align="center" prop="name" label="路径名称" />
<el-table-column
align="center"
prop="introduce"
label="路径介绍"
#default="scope"
>
<el-popover
placement="top-start"
title="路径介绍"
trigger="hover"
:content="scope.row.remark"
>
<el-table-column align="center" prop="introduce" label="路径介绍" #default="scope">
<el-popover placement="top-start" title="路径介绍" trigger="hover" :content="scope.row.remark">
<template #reference>
<div>{{ scope.row.remark }}</div>
</template>
</el-popover>
</el-table-column>
<el-table-column
align="center"
prop="organizationName"
label="归属组织"
/>
<el-table-column
#default="scope"
align="center"
:width="150"
prop="state"
label="状态"
>
<img
:src="
<el-table-column align="center" prop="organizationName" label="归属组织" />
<el-table-column #default="scope" align="center" :width="150" prop="state" label="状态">
<img :src="
scope.row.status === 0
? ongoing
: scope.row.status === 1
@@ -121,9 +81,7 @@
: scope.row.status === -1
? nostarted
: null
"
style="width: 99px; height: 99px"
/>
" style="width: 99px; height: 99px" />
</el-table-column>
</el-table>
</div>
@@ -132,10 +90,7 @@
<!-- :src="{ 0: nostarted, 1: completed, 2: ongoing }[scope.row.status]"-->
<!-- 路径列表-->
<!-- 路径详情图 -->
<div
:style="{ display: showmapdetail ? 'flex' : 'none' }"
class="mapdetail"
>
<div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="mapdetail">
<div v-for="(item, i) in detail?.rows" :key="i">
<img :src="useImage(`222_0${i + 2}.png`)" />
</div>
@@ -202,9 +157,12 @@ async function gofun({ routerId, name: routerName }) {
function toUnTask() { }
</script>
<style lang="scss">
.modal {
#app div:nth-child(1) {
background: rgba(0, 0, 0, 0) !important;
}
.modal {}
.modal:after {
content: "";
}
@@ -220,6 +178,7 @@ function toUnTask() {}
width: 100%;
// flex: 1;
margin-top: 43px;
// background-color: pink;
.title {
display: flex;