Merge branch 'zcwy-dev' into 'dev0731'

Zcwy dev

See merge request !38
This commit is contained in:
joshen
2023-11-01 15:23:33 +08:00

View File

@@ -17,7 +17,8 @@
<div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">作业详情</div>
<div class="preNext">
<!-- 注释掉上一个下一个 -->
<!-- <div class="preNext">
<span @click="prevPage" v-if="hasPrev">
<button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span>
@@ -26,7 +27,7 @@
<span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button>
</span>
</div>
</div> -->
<div class="return">
<div style="display: flex" @click="returnclick">
<el-button style="color: #0073fb">
@@ -107,73 +108,75 @@
</div>
</div>
</div>
<div
class="uploadDetail"
:style="{
display:
showFileList && fileList && fileList.length > 0
? 'block'
: 'none',
}"
@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="rarDetail">
<span class="detail1" style="margin-right: 130px">
{{ file.name }}
</span>
<span class="detail2" style="margin-right: 10px"
>{{ file.percentage }}%</span
>
<span class="detail1">{{
{
ready: "正在上传",
abort: "暂停",
uploading: "正在上传",
fail: "上传失败",
success: "上传成功",
}[file.status]
}}</span>
<div class="progress">
<div
class="progressinner"
:style="{ width: `${(291 * file.percentage) / 100}px` }"
></div>
<div style="display: flex;justify-content: flex-end;">
<div
class="uploadDetail"
:style="{
display:
showFileList && fileList && fileList.length > 0
? 'block'
: 'none',
}"
@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="rarDetail">
<span class="detail1" style="margin-right: 130px">
{{ file.name }}
</span>
<span class="detail2" style="margin-right: 10px"
>{{ file.percentage }}%</span
>
<span class="detail1">{{
{
ready: "正在上传",
abort: "暂停",
uploading: "正在上传",
fail: "上传失败",
success: "上传成功",
}[file.status]
}}</span>
<div class="progress">
<div
class="progressinner"
:style="{ width: `${(291 * file.percentage) / 100}px` }"
></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>
<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>
@@ -703,7 +706,7 @@ function reUpload(i) {
}
.uploadDetail {
position: absolute;
// position: absolute;
//top: 235px;
right: 3px;
z-index: 100;