From 426d3d33f23bd04e7cafda728cdcc82f11d5baa3 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 二月 2023 17:09:07 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/systemSetting/device/grid/components/main/index.vue | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/views/systemSetting/device/grid/components/main/index.vue b/src/views/systemSetting/device/grid/components/main/index.vue
index c8639ee..bcf583b 100644
--- a/src/views/systemSetting/device/grid/components/main/index.vue
+++ b/src/views/systemSetting/device/grid/components/main/index.vue
@@ -25,10 +25,14 @@
</header>
<!-- 鏁版嵁灞曠ず -->
<el-table
- border
- stripe
+ border
+ stripe
ref="multipleTable"
- :header-cell-style="{'background':'#F5F5F5', 'font-weight': '650', 'line-height': '45px' }"
+ :header-cell-style="{
+ background: '#F5F5F5',
+ 'font-weight': '650',
+ 'line-height': '45px',
+ }"
:data="tableData"
style="width: 100%"
:row-class-name="tableRowClassName"
@@ -175,22 +179,16 @@
// 鑾峰彇鍒楄〃
getList() {
const that = this;
- const { currentPage, pageSize, context } = this;
+ const { currentPage, pageSize, context } = this;
this.getOrgGridList({
currentPage,
pageSize,
name: context,
- })
- .then((res) => {
- if (res.code === 200) {
- res.data.records.forEach((item) => {
- item.status === 1 ? (item.status = true) : (item.status = false);
- });
- that.totalNum = res.data.total;
- that.tableData = res.data.records;
- this.renderFlag = true;
- }
- });
+ }).then((res) => {
+ that.totalNum = res.total;
+ that.tableData = res.records;
+ this.renderFlag = true;
+ });
},
handleAdd() {
this.handheldGrid = {
@@ -266,10 +264,10 @@
}
header {
- background-color: white;
+ // background-color: white;
display: flex;
.headerContent {
- padding: 10px;
+ padding: 10px 0;
display: flex;
justify-content: space-between;
align-items: center;
@@ -325,7 +323,7 @@
.operation {
display: flex;
-
+ color: var(--operation-color);
.line {
padding: 0 5px;
}
--
Gitblit v1.8.0