From fb1d57f4bce31fe4f8147a144f8ef4afbca0a4cd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 二月 2023 13:48:29 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/systemSetting/device/handheldTerminal/index.vue | 94 +++++++++++++----------------------------------
1 files changed, 26 insertions(+), 68 deletions(-)
diff --git a/src/views/systemSetting/device/handheldTerminal/index.vue b/src/views/systemSetting/device/handheldTerminal/index.vue
index 6e2fd98..5830ed6 100644
--- a/src/views/systemSetting/device/handheldTerminal/index.vue
+++ b/src/views/systemSetting/device/handheldTerminal/index.vue
@@ -18,22 +18,26 @@
</el-option>
</el-select>
</div>
+
+ <div class="main-title">
+ <el-button
+ class="el-icon-plus button-addition"
+ type="primary"
+ @click="handleAdd"
+ >娣诲姞</el-button
+ >
+ </div>
</div>
</header>
<main>
<div class="main-content">
- <div class="main-title">
- <el-button class="el-icon-plus" type="primary" @click="handleAdd"
- >娣诲姞</el-button
- >
- </div>
<!-- 鏁版嵁灞曠ず -->
<el-table
+ border
+ stripe
ref="multipleTable"
:header-cell-style="{
- background: '#06122c',
- 'font-size': '12px',
- color: '#4b9bb7',
+ background: '#F5F5F5',
'font-weight': '650',
'line-height': '45px',
}"
@@ -236,15 +240,12 @@
<style lang="scss" scoped>
.list {
text-align: left;
- margin: 10px 20px;
- color: #4b9bb7;
-
+ padding: 10px 20px;
+ // color: #4b9bb7;
+ border: 1px solid #ccc;
header {
- background-color: #09152f;
- border: 1pox solid #fff;
-
.header-content {
- padding: 0 40px;
+ padding: 0;
display: flex;
line-height: 100px;
justify-content: space-between;
@@ -260,27 +261,18 @@
.el-input {
flex: 2;
- color: #1d3f57;
-
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
}
+ }
+
+ .main-title {
+ line-height: 60px;
+ padding: 0px;
}
}
}
main {
- background-color: #09152f;
- margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
-
- .main-title {
- line-height: 60px;
- padding: 10px 20px;
- }
.tools {
display: flex;
@@ -295,7 +287,7 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
+ // border: 1px solid #17324c;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
@@ -308,19 +300,6 @@
.el-select {
width: 120px;
}
-
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
- }
-
- &:hover {
- border: 1px solid #4b9bb7;
- }
-
- &:hover .el-checkbox {
- color: #4b9bb7;
- }
}
}
@@ -329,28 +308,7 @@
display: flex;
line-height: 50px;
justify-content: center;
-
- .el-pagination {
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
-
- &::v-deep .active {
- background-color: #409eff;
- color: #fff;
- }
- }
}
- }
- &::v-deep .warning-row {
- background-color: #06122c;
- }
-
- &::v-deep .success-row {
- background-color: #071f39;
}
.operationBox {
@@ -361,11 +319,11 @@
background-color: #4b9bb7;
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
.operation {
display: flex;
-
+ color: var(--operation-color);
.line {
padding: 0 5px;
}
@@ -377,4 +335,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0