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/acquisitionConfig.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index dd15d62..6428a10 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -4,19 +4,17 @@
<el-row class="title">
<el-col :span="6" style="padding-left: 20px;text-align: left;">鏁伴噰閰嶇疆</el-col>
<el-col :span="18" style="text-align: right;">
- <el-button size="medium" type="primary" @click="fileConfiguration">鏂囦欢閰嶇疆</el-button>
- <el-button size="medium" @click="$parent.closeDataVue()">
+ <el-button size="small" type="primary" @click="fileConfiguration">鏂囦欢閰嶇疆</el-button>
+ <el-button size="small" @click="$parent.closeDataVue()">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
</el-col>
</el-row>
</div>
<div class="table">
- <el-table :data="tableList.slice(
- (page.current - 1) * page.size,
- page.current * page.size
- )
- " border tooltip-effect="dark" style="width: 74%;" height="100%" :span-method="spanMethod">
+ <el-table :data="tableList.slice((page.current - 1) * page.size,page.current * page.size)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ tooltip-effect="dark" style="width: 74%;" height="100%" :span-method="spanMethod">
<el-table-column type="index" label="搴忓彿" align="center" width="65"></el-table-column>
<el-table-column prop="deviceName" align="center" min-width="100" label="璁惧鍚嶇О"></el-table-column>
<el-table-column prop="fileType" align="center" label="鏂囦欢鍚庣紑"></el-table-column>
@@ -53,7 +51,8 @@
<el-dialog title="鏁伴噰閰嶇疆" :visible.sync="dialogVisible3" width="920px" :before-close="closeForm">
<el-form :model="configForm" label-position="top" size="small" ref="configForm" label-width="100px"
class="demo-ruleForm">
- <el-table :data="domains" style="width: 100%" height="300">
+ <el-table :data="domains" style="width: 100%" height="300"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="80">
<template v-slot="scope">
{{ getIndexWithAlphabet(scope.$index) }}
--
Gitblit v1.9.3