From c4cfd5c566d137fb60781b8b2e0057d11cf4b051 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 17:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/record.vue | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/record.vue b/src/views/CNAS/resourceDemand/device/component/record.vue
index 6558776..a11eb29 100644
--- a/src/views/CNAS/resourceDemand/device/component/record.vue
+++ b/src/views/CNAS/resourceDemand/device/component/record.vue
@@ -20,7 +20,8 @@
</div>
</div>
<div class="tables" style="margin-top: 10px;">
- <el-table ref="Recordtable" :data="formParamList" height="calc(100vh - 20em)">
+ <el-table ref="Recordtable" :data="formParamList" height="calc(100vh - 20em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<!-- 琛ㄦ牸鍒� -->
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
@@ -350,14 +351,7 @@
},
getUserList() {
selectUserCondition().then(res => {
- let data = [];
- res.data.forEach((a) => {
- data.push({
- label: a.name,
- value: a.id,
- });
- });
- this.userList = data
+ this.userList = res.data
})
},
},
--
Gitblit v1.9.3