From 584587a9d9932762aad2d27027be348c810926d0 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 06 一月 2022 10:09:34 +0800
Subject: [PATCH] 冲突解决
---
src/pages/library/components/personList.vue | 78 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index b47e9ca..bd0c414 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -108,6 +108,7 @@
<el-table
id="multipleTable"
ref="multipleTable"
+ class="tableBox"
:data="BaseManageData.personList"
tooltip-effect="dark"
style="width: 100%; overflow: auto"
@@ -117,6 +118,7 @@
@row-click="pickRow"
:default-sort="{ prop: 'createTime', order: 'descending' }"
@selection-change="handleSelectionChange"
+ border
:header-cell-style="{
background: '#fff',
color: '#222222',
@@ -582,7 +584,6 @@
size="small"
v-model="form.fromServerId"
disabled
- placeholder="璇疯緭鍏�"
></el-input>
</el-form-item>
</el-col>
@@ -597,7 +598,6 @@
size="small"
v-model="form.createTime"
disabled
- placeholder="璇疯緭鍏�"
></el-input>
</el-form-item>
</el-col>
@@ -1040,7 +1040,7 @@
this.$notify({
type: "warning",
message: "璇烽�夋嫨瑕佸垹闄ょ殑浜哄憳",
- duration:1000000,
+ duration: 1000000,
});
return;
}
@@ -1580,25 +1580,25 @@
}
.el-dialog__body {
padding-top: 0;
- .el-table::before {
- visibility: hidden;
- }
- .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- background-color: var(--colorCard);
- border-color: var(--colorCard);
- }
- .el-checkbox__input.is-checked .el-checkbox__inner {
- background-color: var(--colorCard);
- border-color: var(--colorCard);
- }
- .el-table th.el-table__cell > .cell {
- background: #f7f8fa;
- height: 38px;
- line-height: 38px;
- }
- .el-table__body tr.hover-row > td.el-table__cell {
- background-color: #ffffff !important;
- }
+ .el-table::before {
+ visibility: hidden;
+ }
+ .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ background-color: var(--colorCard);
+ border-color: var(--colorCard);
+ }
+ .el-checkbox__input.is-checked .el-checkbox__inner {
+ background-color: var(--colorCard);
+ border-color: var(--colorCard);
+ }
+ .el-table th.el-table__cell > .cell {
+ background: #f7f8fa;
+ height: 38px;
+ line-height: 38px;
+ }
+ .el-table__body tr.hover-row > td.el-table__cell {
+ background-color: #ffffff !important;
+ }
}
.el-dialog__header {
box-shadow: 0px 2px 4px rgb(0 0 0 / 8%);
@@ -1745,12 +1745,12 @@
border-color: var(--colorCard);
background: var(--colorCard);
}
-.el-form-item__label {
- line-height: 32px;
-}
-.el-form-item__content {
- line-height: 32px;
-}
+ .el-form-item__label {
+ line-height: 32px;
+ }
+ .el-form-item__content {
+ line-height: 32px;
+ }
.el-input--small {
font-size: 14px;
.el-input__inner {
@@ -1764,7 +1764,7 @@
}
.el-form-item__error {
color: #fe6d68;
- padding-top: 0px;
+ padding-top: 2px;
left: 15px;
}
.el-form-item.is-required:not(.is-no-asterisk)
@@ -1812,6 +1812,22 @@
padding: 10px;
margin-top: 8px;
box-shadow: 0px 0px 6px 1px rgb(143 159 191 / 15%);
+ .tableBox {
+ border: none;
+ &::before,
+ &::after {
+ display: none;
+ }
+ .el-table--border .el-table__cell,
+ .el-table__body-wrapper
+ .el-table--border.is-scrolling-left
+ ~ .el-table__fixed {
+ border-right: none;
+ }
+ td {
+ border: none;
+ }
+ }
.cell-classname {
background-color: #ffffff;
}
@@ -1823,6 +1839,10 @@
margin: 15px 10px 20px 10px;
justify-content: space-between;
align-items: center;
+ .desc {
+ min-width: fit-content;
+ margin-right: 20px;
+ }
.right-group {
display: flex;
.el-input--small {
--
Gitblit v1.8.0