From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/systemSetting/device/bayonet/index.vue | 78 ++++++++++++++++----------------------
1 files changed, 33 insertions(+), 45 deletions(-)
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index 05b495f..8dc43d3 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -4,19 +4,7 @@
<div class="header-content">
<div class="search">
<span style="padding-right: 20px">绛涢�夋潯浠�:</span>
- <el-select
- v-model="context"
- placeholder="璇烽�夋嫨"
- @change="getBayonetListData"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <el-input v-model="context" placeholder="璇疯緭鍏�" @change="getBayonetListData"></el-input>
</div>
</div>
</header>
@@ -32,7 +20,7 @@
<el-button @click="handleExport">瀵煎嚭鍗″彛</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
- <MyTable :tableOption="tableOption" :tableData="list" :pageShow="false">
+ <MyTable :tableOption="tableOption" :get-table-list="getBayonetListData" :tableData="list" :pageShow="false">
<template #operation="info">
<el-link
:underline="false"
@@ -211,10 +199,10 @@
.userList {
text-align: left;
margin: 10px 20px;
- color: #4b9bb7;
+ // color: #4b9bb7;
header {
- background-color: #09152f;
+ background-color: white;
.header-content {
padding: 0 40px;
@@ -233,19 +221,19 @@
.el-input {
flex: 2;
- color: #1d3f57;
+ // color: #1d3f57;
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // &::v-deep .el-input__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
}
}
}
}
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
@@ -267,7 +255,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;
@@ -281,18 +269,18 @@
width: 120px;
}
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
- }
+ // &::v-deep .el-input__inner {
+ // border: none;
+ // background-color: #09152f;
+ // }
- &:hover {
- border: 1px solid #4b9bb7;
- }
+ // &:hover {
+ // border: 1px solid #4b9bb7;
+ // }
- &:hover .el-checkbox {
- color: #4b9bb7;
- }
+ // &:hover .el-checkbox {
+ // color: #4b9bb7;
+ // }
}
}
@@ -303,24 +291,24 @@
justify-content: center;
.el-pagination {
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
+ // &::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 .active {
+ // background-color: #409eff;
+ // color: #fff;
+ // }
}
}
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
.cell {
display: flex;
--
Gitblit v1.8.0