From e9c7fa1915cd2afbadaef1884324fa7cd5aaaf25 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 29 七月 2025 10:12:06 +0800
Subject: [PATCH] Merge branch 'dev_y_ztns' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev_y_ztns
---
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
index ba593ac..79dbc40 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
@@ -6,7 +6,8 @@
<el-button size="small" type="primary" @click="openAddDia">鏂� 澧�</el-button>
</div>
</div>
- <el-table :data="tableData" height="calc(100vh - 18em)" style="width: 100%">
+ <el-table :data="tableData" height="calc(100vh - 18em)" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -31,8 +32,8 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]" :total="search.total"
- layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
- @current-change="handleCurrentChange">
+ background layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange">
</el-pagination>
<el-dialog :visible.sync="dialogVisible" title="鏂板" width="50%" @open="openDialog">
<div style="height: 50vh; overflow-y: auto">
@@ -108,7 +109,8 @@
<el-button size="small" type="primary" @click="feMeasuredQuantityListAdd">鏂板</el-button>
</div>
<div>
- <el-table :data="form.feMeasuredQuantityList" height="40vh" style="width: 100%; margin: auto">
+ <el-table :data="form.feMeasuredQuantityList" height="40vh" style="width: 100%; margin: auto"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="80"></el-table-column>
<el-table-column align="center" label="娴嬪畾閲忓悕绉�" min-width="180" prop="measuredQuantityLabel">
<template #default="{ row }">
@@ -279,7 +281,6 @@
feMeasuredQuantityListDelete(row, index) {
if (row.measuredQuantityId) {
deleteFeMeasuredQuantity({ measuredQuantityId: row.measuredQuantityId }).then(res => {
- if (res.code === 201) return
this.form.feMeasuredQuantityList.splice(index, 1)
this.$message.success('鍒犻櫎鎴愬姛锛�')
})
--
Gitblit v1.9.3