From 8181e7bf22a3edb624a16970619ced2771cbb585 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 10 三月 2021 23:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/yunpan/uploadfj.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/views/yunpan/uploadfj.vue b/src/views/yunpan/uploadfj.vue
index d1fbe1b..149ffd0 100644
--- a/src/views/yunpan/uploadfj.vue
+++ b/src/views/yunpan/uploadfj.vue
@@ -1,5 +1,5 @@
<template>
- <div class="zs-main">
+ <div class="zs-main fj-upload">
<el-row class="search-title">
<el-col :span="18" class="title">
<div class="zs-title">上传附件</div>
@@ -12,15 +12,15 @@
clearable
placeholder="请输入文件名"
show-word-limit
- style="width:200px"
+ style="width:280px;margin-right: 10px"
/>
<el-button type="primary" @click="findFileByFileName()">查询</el-button>
</el-col>
</el-row>
<el-container style="background-color: #fff;">
- <el-aside width="210px" style="background-color: #fff;text-align: center;">
- <h4>{{ rowitem.empName }}：{{ rowitem.deptName }}</h4>
- <el-timeline>
+ <el-aside width="210px" style="background-color: #fff;padding: 0 24px;text-align: center;height: 88vh;overflow: auto">
+ <span style="font-size: 18px;font-weight: 700;">{{ rowitem.empName }}：{{ rowitem.deptName }}</span>
+ <el-timeline style="margin-top: 10px">
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
@@ -611,12 +611,15 @@
line-height: 60px;
}
.uploading-image {
- width: 100%;
- height: 100%;
+ width: 60%;
+ height: 60%;
display: block;
+ margin: 0 auto;
}
}
-
+.fj-upload .el-timeline-item {
+ padding-bottom: 1px;
+}
.el-timeline-item__timestamp {
font-size: 15px;
color: #000;
@@ -648,6 +651,12 @@
.myRedCheckBox .el-checkbox__inner:hover {
border-color: #a32c30;
}
+.myRedCheckBox .el-checkbox__label {
+ width: 90%;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+}
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
--
Gitblit v1.8.0