From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue b/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
index 5729073..ec8b334 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
@@ -7,6 +7,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
@@ -29,7 +30,7 @@
</el-table>
<el-pagination :current-page="1" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
:total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper"
- @size-change="handleSizeChange1" @current-change="handleCurrentChange1">
+ @size-change="handleSizeChange1" @current-change="handleCurrentChange1" background>
</el-pagination>
</div>
</div>
@@ -118,7 +119,6 @@
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '浠櫒璁惧鎶ュ簾鐢宠琛�.doc')
- this.$message.success('瀵煎嚭鎴愬姛')
})
},
// 鍒犻櫎
--
Gitblit v1.9.3