From 0b0f1db860f93f5203ac9c8e4402d4ebec4027c8 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期日, 07 三月 2021 21:39:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/archivesChange.vue | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 9798d61..00f3b92 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -26,7 +26,7 @@
</el-upload>
<!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
<div class="title-da">
- {{ empBaseInfoForm.empNumb }}
+ 编号：{{ empBaseInfoForm.empNumb }}
</div>
</div>
<ul class="jbxx-ul" style="height: 68vh;overflow: auto">
@@ -1093,7 +1093,7 @@
</el-col>
</el-row>
<el-container style="background-color: #fff;">
- <el-aside width="210px" style="background-color: #fff;text-align: center;">
+ <el-aside width="210px" style="background-color: #fff;text-align: center;padding-top: 0">
<h4>{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
<el-timeline>
<el-timeline-item
@@ -5519,11 +5519,10 @@
}
.title-da {
- margin-left: -102px;
- text-align: center;
- padding: 10px;
- padding-bottom: 7px;
- margin-bottom: 19px;
+ padding-top: 8px;
+ font-weight: 700;
+ color: #333;
+ height: 40px;
}
}
@@ -5539,10 +5538,9 @@
height: 30px;
line-height: 30px;
padding-left: 15px;
- border-left: 4px solid #a00515;
+ //border-left: 4px solid #a00515;
margin: 40px 0 20px;
color: #000;
- font-weight: 700;
position: relative;
}
@@ -5550,8 +5548,20 @@
margin: 20px 0;
}
- .jbxxTitle::after {
+ .jbxxTitle::before {
+ content: '';
+ position: absolute;
+ left: -10px;
+ top: 50%;
+ transform: translateY(-50%);
+ background-color: #a00515;
+ border-radius: 50%;
+ display: inline-block;
+ height: 15px;
+ width: 15px;
+ }
+ .jbxxTitle::after {
content: '';
position: absolute;
left: 100px;
@@ -5832,14 +5842,40 @@
</style>
<style lang="scss">
- .da-dialog {
- .el-dialog__title {
- font-weight: 700;
+.da-dialog {
+ button.el-dialog__headerbtn {
+ height: 30px;
+ width: 30px;
+ background-color: #333;
+ opacity: 0.4;
+ line-height: 30px;
+ border-radius: 50%;
+ i {
+ color: #fff !important;
}
- .el-dialog__body {
- padding: 10px 20px;
+ &:hover {
+ opacity: 0.5;
}
}
+ .el-pagination {
+ width: 98%;
+ text-align: right;
+ }
+ .el-aside {
+ height: 750px;
+ overflow: hidden;
+ }
+ li.el-timeline-item {
+ padding-bottom: 1px;
+ height: 35px;
+ }
+ .el-dialog__title {
+ font-weight: 700;
+ }
+ .el-dialog__body {
+ padding: 10px 20px;
+ }
+}
.el-dialog.is-fullscreen {
overflow: hidden;
}
--
Gitblit v1.8.0