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/carList.vue | 96 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 86 insertions(+), 10 deletions(-)
diff --git a/src/pages/library/components/carList.vue b/src/pages/library/components/carList.vue
index bf58b6c..2696cc7 100644
--- a/src/pages/library/components/carList.vue
+++ b/src/pages/library/components/carList.vue
@@ -12,7 +12,8 @@
>{{ this.baseObject.bwType === "1" ? "榛戝悕鍗�" : "鐧藉悕鍗�" }}</span
>
<span class="ok-time"
- >鏈夋晥鏃堕棿锛歿{ this.baseObject.startTime }} -- {{
+ >鏈夋晥鏃堕棿锛歿{ this.baseObject.startTime }} --
+ {{
this.baseObject.endTime ? this.baseObject.endTime : "姘镐箙鏈夋晥"
}}</span
>
@@ -112,11 +113,13 @@
<el-table
id="multipleTable"
+ class="tableBox"
ref="multipleTable"
:data="BaseManageData.personList"
tooltip-effect="dark"
style="width: 100%; overflow: auto"
:fit="true"
+ border
:default-sort="{ prop: 'createTime', order: 'descending' }"
@selection-change="handleSelectionChange"
:header-cell-style="{
@@ -234,19 +237,24 @@
popper-class="atooltip"
>
<span
- class="iconfont iconbianji iconStyle1"
- style="font-size: 15px"
+ class="iconfont iconbianjixinxi-09"
+ style=" font-size: 24px;cursor: pointer"
@click="handleClick(scope.row)"
></span>
</el-tooltip>
</fTemplate>
- <el-tooltip
- content="鏌ユ壘姝や汉"
+ <el-popover
+ placement="top"
+ trigger="click"
+ popper-class="popper-caozuo1"
+ >
+ <el-tooltip
+ content="鏌ユ壘姝よ溅"
placement="top"
popper-class="atooltip"
>
<span
- class="iconfont iconsousuoren iconStyle1"
+ class="iconfont iconchazhaociren-09"
@click="tosearch(scope.row)"
></span>
</el-tooltip>
@@ -257,7 +265,7 @@
popper-class="atooltip"
>
<span
- class="iconfont iconfuzhi iconStyle1"
+ class="iconfont iconfuzhi-09"
title="澶嶅埗"
@click="copyClick(scope.row)"
></span>
@@ -270,8 +278,7 @@
popper-class="atooltip"
>
<span
- class="iconfont iconyidongzhi iconStyle1"
- style="font-size: 15px"
+ class="iconfont iconyidong-09"
title="绉诲姩"
@click="moveClick(scope.row)"
></span>
@@ -284,13 +291,20 @@
popper-class="atooltip"
>
<span
- class="iconfont iconshanchu iconStyle1"
+ class="iconfont iconshanchu-09"
style="color: #e74c3c"
@click="deleteThis(scope.row.id)"
title="鍒犻櫎"
></span>
</el-tooltip>
</fTemplate>
+ <span
+ slot="reference"
+ class="iconfont icongengduocaozuo-09"
+ style="font-size: 24px; cursor: pointer"
+ ></span>
+ </el-popover>
+
</template>
</el-table-column>
</el-table>
@@ -1625,6 +1639,36 @@
border-bottom: none;
height: calc(100% - 100px);
overflow: auto;
+ .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;
+ }
+ }
+ .head-search {
+ .desc {
+ min-width: fit-content;
+ margin-right: 20px;
+ }
+ .right-group {
+ .iconshangchuanchepai-09:hover,
+ .icontianjiacheliang-09:hover {
+ border: 1px solid var(--colorCard);
+ background: var(--colorCard);
+ color: #fff;
+ }
+ }
+ }
}
.el-dialog__header {
padding: 20px 0 10px;
@@ -1690,4 +1734,36 @@
min-height: 100px;
border: 1px solid #eee;
}
+.el-popover.el-popper.popper-caozuo1 {
+ box-shadow: 0px 0px 10px rgb(0 0 0 / 12%);
+ border-radius: 8px;
+ padding: 0;
+ padding-right: 1px;
+ & > span {
+ width: 32px;
+ height: 32px;
+ cursor: pointer;
+ display: inline-block;
+ text-align: center;
+ line-height: 32px;
+ border-radius: 8px;
+ font-size: 24px;
+ .iconfont {
+ font-size: 24px;
+ }
+ .iconshanchu-09 {
+ color: #fe6d68;
+ }
+ }
+ & > span:hover {
+ background: var(--colorCard);
+ color: #fff;
+ }
+ & > .del-wrap:hover {
+ background: #fe6d68;
+ .iconshanchu-09 {
+ color: #fff;
+ }
+ }
+}
</style>
--
Gitblit v1.8.0