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

Merge branch 'zcwy-dev' into 'master'

Browse Source 
修改测试作业上传框定位问题

See merge request !39
This commit is contained in:
joshen
2023-11-02 09:04:59 +08:00
parent 67e065366a 1772ac929d
commit 6b802a80ec
1 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,8 @@
<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">
<span @click="prevPage" v-if="hasPrev"> <span @click="prevPage" v-if="hasPrev">
<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>
@@ -26,7 +27,7 @@
<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>
</span> </span>
</div> </div> -->
<div class="return"> <div class="return">
<div style="display: flex" @click="returnclick"> <div style="display: flex" @click="returnclick">
<el-button style="color: #0073fb"> <el-button style="color: #0073fb">
@@ -107,73 +108,75 @@
</div> </div>
</div> </div>
</div> </div>
<div <div style="display: flex;justify-content: flex-end;">
class="uploadDetail" <div
:style="{ class="uploadDetail"
display: :style="{
showFileList && fileList && fileList.length > 0 display:
? 'block' showFileList && fileList && fileList.length > 0
: 'none', ? 'block'
}" : 'none',
@mousemove="showFileList = 1" }"
@mouseout="showFileList = 0" @mousemove="showFileList = 1"
style="padding-top: 60px" @mouseout="showFileList = 0"
> style="padding-top: 60px"
<div class="triangle"></div> >
<div class="square clearfix"> <div class="triangle"></div>
<div <div class="square clearfix">
class="squarecontent1" <div
v-for="(file, i) in fileList" class="squarecontent1"
:key="i" v-for="(file, i) in fileList"
> :key="i"
<FileTypeImg >
v-model="file.name" <FileTypeImg
:style="{ margin: '12px 15px 0 27px' }" v-model="file.name"
></FileTypeImg> :style="{ margin: '12px 15px 0 27px' }"
<div class="rarDetail"> ></FileTypeImg>
<span class="detail1" style="margin-right: 130px"> <div class="rarDetail">
{{ file.name }} <span class="detail1" style="margin-right: 130px">
</span> {{ file.name }}
<span class="detail2" style="margin-right: 10px" </span>
>{{ file.percentage }}%</span <span class="detail2" style="margin-right: 10px"
> >{{ file.percentage }}%</span
<span class="detail1">{{ >
{ <span class="detail1">{{
ready: "正在上传", {
abort: "暂停", ready: "正在上传",
uploading: "正在上传", abort: "暂停",
fail: "上传失败", uploading: "正在上传",
success: "上传成功", fail: "上传失败",
}[file.status] success: "上传成功",
}}</span> }[file.status]
<div class="progress"> }}</span>
<div <div class="progress">
class="progressinner" <div
:style="{ width: `${(291 * file.percentage) / 100}px` }" class="progressinner"
></div> :style="{ width: `${(291 * file.percentage) / 100}px` }"
></div>
</div>
</div> </div>
<button class="btn btndetail" @click="reUpload(i)">
{{
{
ready: "暂停",
uploading: "暂停",
abort: "开始",
fail: "重传",
}[file.status]
}}
</button>
<button class="btn" @click="remove">
{{
{
ready: "取消",
abort: "取消",
uploading: "取消",
fail: "取消",
success: "删除",
}[file.status]
}}
</button>
</div> </div>
<button class="btn btndetail" @click="reUpload(i)">
{{
{
ready: "暂停",
uploading: "暂停",
abort: "开始",
fail: "重传",
}[file.status]
}}
</button>
<button class="btn" @click="remove">
{{
{
ready: "取消",
abort: "取消",
uploading: "取消",
fail: "取消",
success: "删除",
}[file.status]
}}
</button>
</div> </div>
</div> </div>
</div> </div>
@@ -703,7 +706,7 @@ function reUpload(i) {
} }
.uploadDetail { .uploadDetail {
position: absolute; // position: absolute;
//top: 235px; //top: 235px;
right: 3px; right: 3px;
z-index: 100; z-index: 100;