From 680c4f9e4e8b079593c8e57c100b92890e70960d Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 14 三月 2021 14:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/yunpan/uploadfj.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/views/yunpan/uploadfj.vue b/src/views/yunpan/uploadfj.vue
index 8ef8667..0396a0a 100644
--- a/src/views/yunpan/uploadfj.vue
+++ b/src/views/yunpan/uploadfj.vue
@@ -43,7 +43,7 @@
<el-row><el-col :span="24">
<i
class="el-icon-bell"
- style=" color: #a32c30; margin-right: 10px;"
+ style="color: #a32c30; margin-right: 10px;"
/>提示：文件不要超过10个，单个文件大小不超过50M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。</el-col>
</el-row>
<el-row style="background-color: rgba(0,0,0,0.2);">
@@ -63,12 +63,13 @@
>下载</el-button>
<el-button
type="primary"
+ class="pri-del-btn"
icon="el-icon-search"
size="mini"
@click="delFile()"
>删除</el-button>
<el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
- <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
+ <el-button slot="reference" type="danger">转存</el-button>
</el-popconfirm>
<el-button type="warning" @click="openUpdateFileName()">重命名</el-button>
</el-col>
@@ -131,7 +132,7 @@
@click="clickImg(node)"
/>
<el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
- <div style="padding-top: 14px;">
+ <div style="padding-top: 14px;text-align: center">
<el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
</div>
</el-tooltip>
@@ -219,7 +220,7 @@
this.initlabel()
setTimeout(() => {
this.clickTimeline(this.tableindex)
- }, 1000)
+ }, 1500)
},
methods: {
clickImg(node) {
@@ -617,8 +618,8 @@
}
}
.add-folder-but {
- background: #fff !important;
- color: #a32c30 !important;
+ background: #a32c30 !important;
+ color: #fff !important;
margin-bottom: 20px;
}
padding: 0 15px 0 15px;
@@ -626,8 +627,8 @@
line-height: 60px;
}
.uploading-image {
- width: 60%;
- height: 60%;
+ width: 45%;
+ height: 45%;
display: block;
margin: 0 auto;
}
@@ -667,10 +668,12 @@
border-color: #a32c30;
}
.myRedCheckBox .el-checkbox__label {
- width: 90%;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
+}
+.myRedCheckBox .el-checkbox__input {
+ vertical-align: text-top;
}
.avatar-uploader .el-upload {
@@ -728,4 +731,8 @@
.el-input-number {
width: 100%;
}
+.pri-del-btn {
+ background-color: rgb(64, 158, 255);
+ border-color: rgb(64, 158, 255);
+}
</style>
--
Gitblit v1.8.0