From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 6428a10..38a545c 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -14,7 +14,7 @@
<div class="table">
<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">
+ tooltip-effect="dark" 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>
@@ -35,7 +35,7 @@
<el-table-column prop="anotherName" align="center" label="鍒悕" min-width="100"></el-table-column>
<el-table-column prop="matchingName" align="center" label="鍖归厤鍚嶇О" min-width="100"></el-table-column>
<el-table-column prop="formula" align="center" label="鍏紡"></el-table-column>
- <el-table-column prop="section" fixed="right" label="鎿嶄綔" width="120">
+ <el-table-column fixed="right" label="鎿嶄綔" width="120" align="center">
<template slot-scope="scope">
<el-button type="text" @click="dataConfig(scope.row)">鏁伴噰閰嶇疆</el-button>
</template>
@@ -721,9 +721,7 @@
}
.table {
- margin-top: 10px;
background-color: #fff;
- width: calc(100vw - 1em);
height: calc(100vh - 18em);
}
--
Gitblit v1.9.3